[PATCH] Fix 'make check' with parallel test-suite

Jussi Kivilinna jussi.kivilinna at iki.fi
Sun Dec 29 18:27:12 CET 2013


* configure.ac: Change 'hashtest-256g' to 'hashtest-256g.sh'.
* tests/Makefile.am: Add '.sh' to hashtest-256g and '.test' to
benchmark and bench-slope.
* tests/hashtest-256g.in: Rename to...
* tests/hashtest-256g.sh.in: ...this.
--

Patch fixes following problem with parallel test-suite run on Ubuntu 13.10:

fatal: making test-suite.log: failed to create bench-slope.trs
fatal: making test-suite.log: failed to create bench-slope.log
fatal: making test-suite.log: failed to create hashtest-256g.trs
fatal: making test-suite.log: failed to create hashtest-256g.log
make[3]: *** [test-suite.log] Error 1

Signed-off-by: Jussi Kivilinna <jussi.kivilinna at iki.fi>
---
 configure.ac              |    2 +-
 tests/Makefile.am         |    6 +++---
 tests/hashtest-256g.in    |    7 -------
 tests/hashtest-256g.sh.in |    7 +++++++
 4 files changed, 11 insertions(+), 11 deletions(-)
 delete mode 100755 tests/hashtest-256g.in
 create mode 100755 tests/hashtest-256g.sh.in

diff --git a/configure.ac b/configure.ac
index 27de850..5120337 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1932,7 +1932,7 @@ src/libgcrypt-config
 src/versioninfo.rc
 tests/Makefile
 ])
-AC_CONFIG_FILES([tests/hashtest-256g], [chmod +x tests/hashtest-256g])
+AC_CONFIG_FILES([tests/hashtest-256g.sh], [chmod +x tests/hashtest-256g.sh])
 AC_OUTPUT
 
 
diff --git a/tests/Makefile.am b/tests/Makefile.am
index f5b5b9f..86f516d 100644
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -24,11 +24,11 @@ tests_bin = \
 	prime basic keygen pubkey hmac hashtest t-kdf keygrip \
 	fips186-dsa aeswrap pkcs1v2 random dsa-rfc6979 t-ed25519
 
-tests_bin_last = benchmark bench-slope
+tests_bin_last = benchmark.test bench-slope.test
 
 tests_sh =
 
-tests_sh_last = hashtest-256g
+tests_sh_last = hashtest-256g.sh
 
 TESTS = $(tests_bin) $(tests_sh) $(tests_bin_last) $(tests_sh_last)
 
@@ -52,4 +52,4 @@ noinst_PROGRAMS = $(tests_bin) $(tests_bin_last) fipsdrv rsacvt genhashdata
 
 EXTRA_DIST = README rsa-16k.key cavs_tests.sh cavs_driver.pl \
 	     pkcs1v2-oaep.h pkcs1v2-pss.h pkcs1v2-v15c.h pkcs1v2-v15s.h \
-	     t-ed25519.inp stopwatch.h hashtest-256g.in
+	     t-ed25519.inp stopwatch.h hashtest-256g.sh.in
diff --git a/tests/hashtest-256g.in b/tests/hashtest-256g.in
deleted file mode 100755
index e897c54..0000000
--- a/tests/hashtest-256g.in
+++ /dev/null
@@ -1,7 +0,0 @@
-#!/bin/sh
-
-algos="SHA1 SHA256 SHA512"
-
-test "@RUN_LARGE_DATA_TESTS@" = yes || exit 77
-echo "      now running 256 GiB tests for $algos - this takes looong"
-exec ./hashtest --gigs 256 $algos
diff --git a/tests/hashtest-256g.sh.in b/tests/hashtest-256g.sh.in
new file mode 100755
index 0000000..e897c54
--- /dev/null
+++ b/tests/hashtest-256g.sh.in
@@ -0,0 +1,7 @@
+#!/bin/sh
+
+algos="SHA1 SHA256 SHA512"
+
+test "@RUN_LARGE_DATA_TESTS@" = yes || exit 77
+echo "      now running 256 GiB tests for $algos - this takes looong"
+exec ./hashtest --gigs 256 $algos




More information about the Gcrypt-devel mailing list