Use EXEEXT in self-test scripts.

diff --git a/NEWS b/NEWS
index 769d50bb3d41accc83af935d2e6934d195bd3021..eb19a87135757efb8da2e1af1bc4ab65cc1441e9 100644 (file)
--- a/NEWS
+++ b/NEWS
@@ -13,6 +13,10 @@ Report and patch by Jonathan Manktelow.
 
 ** doc: Texinfo HTML manual uses a stylesheet to improve readability.
 
+** tests: Scripts now use EXEEXT properly.
+Modern libtool doesn't create wrapper script, so the self tests need
+to invoke certtool.exe under MinGW32+Wine.
+
 ** Uses autoconf 2.63, automake 1.10.1, libtool 2.2.6a.
 
 ** API and ABI modifications:

diff --git a/tests/key-id/Makefile.am b/tests/key-id/Makefile.am
index 0d22b3244f60afa1da361bba67b8847f68f5dba9..6240a3baa3bcccf946dc2d520b6dd4d2ccbe33ed 100644 (file)
--- a/tests/key-id/Makefile.am
+++ b/tests/key-id/Makefile.am
@@ -1,5 +1,5 @@
 ## Process this file with automake to produce Makefile.in
-# Copyright (C) 2007 Free Software Foundation
+# Copyright (C) 2007, 2008 Free Software Foundation
 #
 # Author: Simon Josefsson
 #
@@ -25,3 +25,5 @@ EXTRA_DIST = README key-ca.pem key-user.pem \
 dist_check_SCRIPTS = key-id
 
 TESTS = key-id
+
+TESTS_ENVIRONMENT = EXEEXT=$(EXEEXT)

diff --git a/tests/key-id/key-id b/tests/key-id/key-id
index 8c8067bbf44b127e44da0f2a2effbc998262bbf0..a7c7005bfb601fd7c2d8a75009a0fa1f21597ab2 100755 (executable)
--- a/tests/key-id/key-id
+++ b/tests/key-id/key-id
@@ -1,6 +1,6 @@
 #!/bin/sh
 
-# Copyright (C) 2007 Free Software Foundation
+# Copyright (C) 2007, 2008 Free Software Foundation
 #
 # Author: Simon Josefsson
 #
@@ -23,7 +23,7 @@
 set -e
 
 srcdir=${srcdir:-.}
-CERTTOOL=${CERTTOOL:-../../src/certtool}
+CERTTOOL=${CERTTOOL:-../../src/certtool$EXEEXT}
 
 PARAMS="--generate-certificate --load-privkey $srcdir/key-user.pem --load-ca-privkey $srcdir/key-ca.pem --template tmpl"
 

diff --git a/tests/pkcs1-padding/Makefile.am b/tests/pkcs1-padding/Makefile.am
index 54b05ad76849e57790358a562fedf7933735fcbc..9cacfdbf8aa0b4079f3912c26ee4d49d9bb59b59 100644 (file)
--- a/tests/pkcs1-padding/Makefile.am
+++ b/tests/pkcs1-padding/Makefile.am
@@ -1,5 +1,5 @@
 ## Process this file with automake to produce Makefile.in
-# Copyright (C) 2006 Free Software Foundation
+# Copyright (C) 2006, 2008 Free Software Foundation
 #
 # Author: Simon Josefsson
 #
@@ -27,3 +27,5 @@ EXTRA_DIST = pkcs1-pad-ok.pem pkcs1-pad-broken.pem \
 dist_check_SCRIPTS = pkcs1-pad
 
 TESTS = pkcs1-pad
+
+TESTS_ENVIRONMENT = EXEEXT=$(EXEEXT)

diff --git a/tests/pkcs1-padding/pkcs1-pad b/tests/pkcs1-padding/pkcs1-pad
index 5a9c6ba2e1eb9620d8ff6c7c23a316ef0535525e..b5a3e083fdf5c4a722e240d0628e85377df6013f 100755 (executable)
--- a/tests/pkcs1-padding/pkcs1-pad
+++ b/tests/pkcs1-padding/pkcs1-pad
@@ -1,6 +1,6 @@
 #!/bin/sh
 
-# Copyright (C) 2004, 2005, 2006 Free Software Foundation
+# Copyright (C) 2004, 2005, 2006, 2008 Free Software Foundation
 #
 # Author: Simon Josefsson
 #
@@ -21,7 +21,7 @@
 # Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
 
 srcdir=${srcdir:-.}
-CERTTOOL=${CERTTOOL:-../../src/certtool}
+CERTTOOL=${CERTTOOL:-../../src/certtool$EXEEXT}
 
 # Test 1, PKCS#1 pad digestAlgorithm.parameters
 

diff --git a/tests/rsa-md5-collision/Makefile.am b/tests/rsa-md5-collision/Makefile.am
index 7d1dbe4bbd11ac052a5d0bbea7bca0d2eef675d2..785efa799cf192fd6caf42fca29fc2b1b1edd79e 100644 (file)
--- a/tests/rsa-md5-collision/Makefile.am
+++ b/tests/rsa-md5-collision/Makefile.am
@@ -1,5 +1,5 @@
 ## Process this file with automake to produce Makefile.in
-# Copyright (C) 2006 Free Software Foundation
+# Copyright (C) 2006, 2008 Free Software Foundation
 #
 # Author: Simon Josefsson
 #
@@ -27,3 +27,5 @@ EXTRA_DIST = MD5CollisionCA.cer \
 dist_check_SCRIPTS = rsa-md5-collision
 
 TESTS = rsa-md5-collision
+
+TESTS_ENVIRONMENT = EXEEXT=$(EXEEXT)

diff --git a/tests/rsa-md5-collision/rsa-md5-collision b/tests/rsa-md5-collision/rsa-md5-collision
index a76164da58ffc84af8aafb19e2537e747b5d3b62..af5b1b080e3ddb337ee2b073c054fcb60e880457 100755 (executable)
--- a/tests/rsa-md5-collision/rsa-md5-collision
+++ b/tests/rsa-md5-collision/rsa-md5-collision
@@ -1,6 +1,6 @@
 #!/bin/sh
 
-# Copyright (C) 2006 Free Software Foundation
+# Copyright (C) 2006, 2008 Free Software Foundation
 #
 # Author: Simon Josefsson
 #
@@ -23,7 +23,7 @@
 set -e
 
 srcdir=${srcdir:-.}
-CERTTOOL=${CERTTOOL:-../../src/certtool}
+CERTTOOL=${CERTTOOL:-../../src/certtool$EXEEXT}
 
 $CERTTOOL --inder --certificate-info \
     --infile $srcdir/MD5CollisionCA.cer > ca.pem

diff --git a/tests/sha2/Makefile.am b/tests/sha2/Makefile.am
index 1876d3d7a17db675d465871986d8db2f7da9e29a..cdfa994d750caa22f44fa502482a3944aaf9d486 100644 (file)
--- a/tests/sha2/Makefile.am
+++ b/tests/sha2/Makefile.am
@@ -1,5 +1,5 @@
 ## Process this file with automake to produce Makefile.in
-# Copyright (C) 2007 Free Software Foundation
+# Copyright (C) 2007, 2008 Free Software Foundation
 #
 # Author: Simon Josefsson
 #
@@ -24,3 +24,5 @@ EXTRA_DIST = key-ca.pem key-subca.pem key-subsubca.pem key-user.pem
 dist_check_SCRIPTS = sha2
 
 TESTS = sha2
+
+TESTS_ENVIRONMENT = EXEEXT=$(EXEEXT)

diff --git a/tests/sha2/sha2 b/tests/sha2/sha2
index b6acc7180eb3f8413ef0743106154603b33ab7fd..6ac693f6f763e45614b3b1874e1c65b08b8530d3 100755 (executable)
--- a/tests/sha2/sha2
+++ b/tests/sha2/sha2
@@ -1,6 +1,6 @@
 #!/bin/sh
 
-# Copyright (C) 2006, 2007 Free Software Foundation
+# Copyright (C) 2006, 2007, 2008 Free Software Foundation
 #
 # Author: Simon Josefsson
 #
@@ -23,7 +23,7 @@
 set -e
 
 srcdir=${srcdir:-.}
-CERTTOOL=${CERTTOOL:-../../src/certtool}
+CERTTOOL=${CERTTOOL:-../../src/certtool$EXEEXT}
 
 echo ca > template
 echo cn = "SHA 512 CA" >> template

diff --git a/tests/userid/Makefile.am b/tests/userid/Makefile.am
index 92327eddacfd0ddeabdba2d60b057793aea370be..c21afa8d6b6f02e01f2bb87c45a71b80d76c1f3d 100644 (file)
--- a/tests/userid/Makefile.am
+++ b/tests/userid/Makefile.am
@@ -1,5 +1,5 @@
 ## Process this file with automake to produce Makefile.in
-# Copyright (C) 2006 Free Software Foundation
+# Copyright (C) 2006, 2008 Free Software Foundation
 #
 # Author: Simon Josefsson
 #
@@ -24,3 +24,5 @@ EXTRA_DIST = userid.pem
 dist_check_SCRIPTS = userid
 
 TESTS = userid
+
+TESTS_ENVIRONMENT = EXEEXT=$(EXEEXT)

diff --git a/tests/userid/userid b/tests/userid/userid
index 5b2b8fc69f72cd47ff282459f541424ad23f20e5..76315649ac4cd860b39d1df3ecadd2e909a52e47 100755 (executable)
--- a/tests/userid/userid
+++ b/tests/userid/userid
@@ -1,6 +1,6 @@
 #!/bin/sh
 
-# Copyright (C) 2006 Free Software Foundation
+# Copyright (C) 2006, 2008 Free Software Foundation
 #
 # Author: Simon Josefsson
 #
@@ -23,6 +23,6 @@
 set -e
 
 srcdir=${srcdir:-.}
-CERTTOOL=${CERTTOOL:-../../src/certtool}
+CERTTOOL=${CERTTOOL:-../../src/certtool$EXEEXT}
 
 exec $CERTTOOL --certificate-info --infile $srcdir/userid.pem