svn commit: r1739418 - in /santuario/xml-security-cpp/trunk: ./ configure.ac xsec/Makefile.am xsec/basicTests.pl

[bl...@apache.org]

Author: blautenb
Date: Sat Apr 16 06:16:58 2016
New Revision: 1739418

URL: http://svn.apache.org/viewvc?rev=1739418&view=rev
Log:
Clean test and build

Modified:
    santuario/xml-security-cpp/trunk/   (props changed)
    santuario/xml-security-cpp/trunk/configure.ac
    santuario/xml-security-cpp/trunk/xsec/Makefile.am
    santuario/xml-security-cpp/trunk/xsec/basicTests.pl

Propchange: santuario/xml-security-cpp/trunk/
------------------------------------------------------------------------------
--- svn:ignore (original)
+++ svn:ignore Sat Apr 16 06:16:58 2016
@@ -1,4 +1,6 @@
 Build
+.deps
+.buildstamp
 autom4te.cache
 build-aux
 aclocal.m4

Modified: santuario/xml-security-cpp/trunk/configure.ac
URL: http://svn.apache.org/viewvc/santuario/xml-security-cpp/trunk/configure.ac?rev=1739418&r1=1739417&r2=1739418&view=diff
==============================================================================
--- santuario/xml-security-cpp/trunk/configure.ac (original)
+++ santuario/xml-security-cpp/trunk/configure.ac Sat Apr 16 06:16:58 2016
@@ -399,6 +399,8 @@ if test x"$use_openssl" != "xno" ; then
             else
                 AC_MSG_WARN([OpenSSL not supported by pkg-config, try --with-openssl=PATH instead])
             fi
+        else
+             SSLLIBS="-lcrypto -lssl"
         fi
     else
         if test x_$use_openssl != x_/usr; then

Modified: santuario/xml-security-cpp/trunk/xsec/Makefile.am
URL: http://svn.apache.org/viewvc/santuario/xml-security-cpp/trunk/xsec/Makefile.am?rev=1739418&r1=1739417&r2=1739418&view=diff
==============================================================================
--- santuario/xml-security-cpp/trunk/xsec/Makefile.am (original)
+++ santuario/xml-security-cpp/trunk/xsec/Makefile.am Sat Apr 16 06:16:58 2016
@@ -14,7 +14,7 @@
 # limitations under the License.
 #
 
-AUTOMAKE_OPTIONS = foreign
+AUTOMAKE_OPTIONS = foreign subdir-objects
 
 AM_CPPFLAGS = -I..
 

Modified: santuario/xml-security-cpp/trunk/xsec/basicTests.pl
URL: http://svn.apache.org/viewvc/santuario/xml-security-cpp/trunk/xsec/basicTests.pl?rev=1739418&r1=1739417&r2=1739418&view=diff
==============================================================================
--- santuario/xml-security-cpp/trunk/xsec/basicTests.pl (original)
+++ santuario/xml-security-cpp/trunk/xsec/basicTests.pl Sat Apr 16 06:16:58 2016
@@ -74,12 +74,12 @@ if ($^O =~ m/Win/) {
   $cipher = "../Build/Win32/VC6/Debug/cipher.exe";
 }
 else {
-  $checksig = "../bin/checksig";
-  $cipher = "../bin/cipher";
+  $checksig = ".libs/checksig";
+  $cipher = ".libs/cipher";
 }
 
 # Directory setup
-my $data_dir = "../../data";
+my $data_dir = "../../xml-security-java/src/test/resources";
 
 # Digital Signature Tests
 
@@ -181,7 +181,7 @@ my @dsig_array=(
 
 # Extra unit tests provided for bug reports
 
-"org/apache/xml/security/testcases/SAML2ArtifactResponse.xml,,n,n",
+"org/apache/xml/security/testcases/SAML2ArtifactResponse.xml,--id ID,n,n",
 
 );