generic-library/libreSSL
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Allow to disable tests easily

Browse Source 
- Introduce the tests_disabled array, add biotest, explicit_bzero and
  pidwraptest.
- Add preceeding comment to explain why every test is skipped
- Rearrange loops generating Makefile.am dependencies to look for tests
  in tests_disabled first and skip them.

Signed-off-by: Corinna Vinschen <github@cygwin.de>
This commit is contained in:
Corinna Vinschen 2015-03-04 11:55:50 +01:00
parent 9cad5993a2
commit e38dc152d6
1 changed files with 33 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

58
update.sh
View File

@ -198,9 +198,6 @@ for i in `find $libcrypto_regress -name '*.c'`; do
$CP "$i" tests $CP "$i" tests
done done
# the BIO tests rely on resolver results that are OS and environment-specific
rm tests/biotest.c
# copy libc tests # copy libc tests
$CP $libc_regress/arc4random-fork/arc4random-fork.c tests/arc4randomforktest.c $CP $libc_regress/arc4random-fork/arc4random-fork.c tests/arc4randomforktest.c
$CP $libc_regress/explicit_bzero/explicit_bzero.c tests $CP $libc_regress/explicit_bzero/explicit_bzero.c tests
@ -229,27 +226,38 @@ tests_posix_only=(
explicit_bzero explicit_bzero
pidwraptest pidwraptest
) )
# the BIO tests rely on resolver results that are OS and environment-specific
# explicit_bzero relies on SA_ONSTACK, not available on all systems
# pidwraptest relies on an OS-specific way to give out pids and is generally
# awkward on systems with slow fork
tests_disabled=(
biotest
explicit_bzero
pidwraptest
)
$CP $libc_src/string/memmem.c tests/ $CP $libc_src/string/memmem.c tests/
(cd tests (cd tests
$CP Makefile.am.tpl Makefile.am $CP Makefile.am.tpl Makefile.am
for i in `ls -1 *.c|sort|grep -v memmem.c`; do for i in `ls -1 *.c|sort|grep -v memmem.c`; do
TEST=`echo $i|sed -e "s/\.c//"` TEST=`echo $i|sed -e "s/\.c//"`
if [[ ${tests_posix_only[*]} =~ "$TEST" ]]; then if ! [[ ${tests_disabled[*]} =~ "$TEST" ]]; then
echo "if !HOST_WIN" >> Makefile.am if [[ ${tests_posix_only[*]} =~ "$TEST" ]]; then
fi echo "if !HOST_WIN" >> Makefile.am
if ! [[ ${test_drivers[*]} =~ "$TEST" ]]; then fi
echo "TESTS += $TEST" >> Makefile.am if ! [[ ${test_drivers[*]} =~ "$TEST" ]]; then
fi echo "TESTS += $TEST" >> Makefile.am
echo "check_PROGRAMS += $TEST" >> Makefile.am fi
echo "${TEST}_SOURCES = $i" >> Makefile.am echo "check_PROGRAMS += $TEST" >> Makefile.am
if [[ ${TEST} = "explicit_bzero" ]]; then echo "${TEST}_SOURCES = $i" >> Makefile.am
echo "if !HAVE_MEMMEM" >> Makefile.am if [[ ${TEST} = "explicit_bzero" ]]; then
echo "explicit_bzero_SOURCES += memmem.c" >> Makefile.am echo "if !HAVE_MEMMEM" >> Makefile.am
echo "endif" >> Makefile.am echo "explicit_bzero_SOURCES += memmem.c" >> Makefile.am
fi echo "endif" >> Makefile.am
if [[ ${tests_posix_only[*]} =~ "$TEST" ]]; then fi
echo "endif" >> Makefile.am if [[ ${tests_posix_only[*]} =~ "$TEST" ]]; then
echo "endif" >> Makefile.am
fi
fi fi
done done
) )
@ -259,16 +267,16 @@ $CP $libcrypto_regress/pqueue/expected.txt tests/pq_expected.txt
chmod 755 tests/testssl chmod 755 tests/testssl
for i in "${test_drivers[@]}"; do for i in "${test_drivers[@]}"; do
if [ -e tests/${i}.sh ]; then if [ -e tests/${i}.sh ]; then
if [[ ${tests_posix_only[*]} =~ "$i" ]]; then
echo "if !HOST_WIN" >> tests/Makefile.am
fi
if ! [[ ${tests_disabled[*]} =~ "$i" ]]; then if ! [[ ${tests_disabled[*]} =~ "$i" ]]; then
if [[ ${tests_posix_only[*]} =~ "$i" ]]; then
echo "if !HOST_WIN" >> tests/Makefile.am
fi
echo "TESTS += ${i}.sh" >> tests/Makefile.am echo "TESTS += ${i}.sh" >> tests/Makefile.am
if [[ ${tests_posix_only[*]} =~ "$i" ]]; then
echo "endif" >> tests/Makefile.am
fi
echo "EXTRA_DIST += ${i}.sh" >> tests/Makefile.am
fi fi
if [[ ${tests_posix_only[*]} =~ "$i" ]]; then
echo "endif" >> tests/Makefile.am
fi
echo "EXTRA_DIST += ${i}.sh" >> tests/Makefile.am
fi fi
done done
echo "EXTRA_DIST += aeadtests.txt" >> tests/Makefile.am echo "EXTRA_DIST += aeadtests.txt" >> tests/Makefile.am