From: Simon Josefsson <simon@josefsson.org>
Date: Thu, 25 Sep 2008 09:16:38 +0000 (+0200)
Subject: Use EXEEXT in self-test scripts.
X-Git-Tag: gnutls_2_5_9~14
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=b59985caa1e760a68eb321d29aa7ff4b6b633ce0;p=thirdparty%2Fgnutls.git

Use EXEEXT in self-test scripts.
---

diff --git a/NEWS b/NEWS
index 769d50bb3d..eb19a87135 100644
--- 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 0d22b3244f..6240a3baa3 100644
--- 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 8c8067bbf4..a7c7005bfb 100755
--- 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 54b05ad768..9cacfdbf8a 100644
--- 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 5a9c6ba2e1..b5a3e083fd 100755
--- 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 7d1dbe4bbd..785efa799c 100644
--- 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 a76164da58..af5b1b080e 100755
--- 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 1876d3d7a1..cdfa994d75 100644
--- 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 b6acc7180e..6ac693f6f7 100755
--- 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 92327eddac..c21afa8d6b 100644
--- 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 5b2b8fc69f..76315649ac 100755
--- 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