diff options
-rw-r--r-- | README | 4 | ||||
-rw-r--r-- | configure.ac | 11 | ||||
-rw-r--r-- | tests/Makefile.am | 21 | ||||
-rwxr-xr-x | tests/hashtest-256g.in | 7 |
4 files changed, 38 insertions, 5 deletions
@@ -80,6 +80,10 @@ Here is a list of configure options which are sometimes useful for installation. + --enable-large-data-tests + With this option a "make check" will take really + long due to extra checks for the hash algorithms. + --enable-m-guard Enable the integrated malloc checking code. Please note that this feature does not work on all CPUs diff --git a/configure.ac b/configure.ac index 9088d020..571e1561 100644 --- a/configure.ac +++ b/configure.ac @@ -524,6 +524,16 @@ if test "$use_m_guard" = yes ; then AC_DEFINE(M_GUARD,1,[Define to use the (obsolete) malloc guarding feature]) fi +# Implementation of the --enable-large-data-tests switch. +AC_MSG_CHECKING([whether to run large data tests]) +AC_ARG_ENABLE(large-data-tests, + AC_HELP_STRING([--enable-large-data-tests], + [Enable the real long ruinning large data tests]), + large_data_tests=$enableval,large_data_tests=no) +AC_MSG_RESULT($large_data_tests) +AC_SUBST(RUN_LARGE_DATA_TESTS, $large_data_tests) + + # Implementation of the --with-capabilities switch. # Check whether we want to use Linux capabilities AC_MSG_CHECKING([whether use of capabilities is requested]) @@ -1914,6 +1924,7 @@ src/libgcrypt-config src/versioninfo.rc tests/Makefile ]) +AC_CONFIG_FILES([tests/hashtest-256g], [chmod +x tests/hashtest-256g]) AC_OUTPUT diff --git a/tests/Makefile.am b/tests/Makefile.am index 3fb9fd62..f5b5b9fb 100644 --- a/tests/Makefile.am +++ b/tests/Makefile.am @@ -18,13 +18,24 @@ ## Process this file with automake to produce Makefile.in -TESTS = version mpitests tsexp t-convert \ +tests_bin = \ + version mpitests tsexp t-convert \ t-mpi-bit t-mpi-point curves \ prime basic keygen pubkey hmac hashtest t-kdf keygrip \ fips186-dsa aeswrap pkcs1v2 random dsa-rfc6979 t-ed25519 -# The last tests to run. -TESTS += benchmark bench-slope +tests_bin_last = benchmark bench-slope + +tests_sh = + +tests_sh_last = hashtest-256g + +TESTS = $(tests_bin) $(tests_sh) $(tests_bin_last) $(tests_sh_last) + +# Force sequential run of some tests. +bench-slope.log: benchmark.log +hashtest-256g.log: bench-slope.log + TESTS_ENVIRONMENT = GCRYPT_IN_REGRESSION_TEST=1 @@ -37,8 +48,8 @@ AM_CFLAGS = $(GPG_ERROR_CFLAGS) LDADD = ../src/libgcrypt.la $(DL_LIBS) ../compat/libcompat.la $(GPG_ERROR_LIBS) EXTRA_PROGRAMS = testapi pkbench -noinst_PROGRAMS = $(TESTS) fipsdrv rsacvt genhashdata +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 + t-ed25519.inp stopwatch.h hashtest-256g.in diff --git a/tests/hashtest-256g.in b/tests/hashtest-256g.in new file mode 100755 index 00000000..02ab3f61 --- /dev/null +++ b/tests/hashtest-256g.in @@ -0,0 +1,7 @@ +#!/bin/sh + +algos="SHA1 SHA256" + +test "@RUN_LARGE_DATA_TESTS@" = yes || exit 77 +echo " now running 256 GiB tests for $algos - this takes looong" +exec ./hashtest --gigs 256 $algos |