Fix 3DES -> DES in all.sh (+ time estimates)

This commit is contained in:
Manuel Pégourié-Gonnard 2014-11-20 13:48:53 +01:00
parent 246978d97d
commit 89d69b398c

View file

@ -63,41 +63,41 @@ msg()
} }
# The test ordering tries to optimize for the following criteria: # The test ordering tries to optimize for the following criteria:
# 1. Catch possible problems early, by running first test that run quickly # 1. Catch possible problems early, by running first tests that run quickly
# and/or are more likely to fail than others (eg I use Clang most of the # and/or are more likely to fail than others (eg I use Clang most of the
# time, so start with a GCC build). # time, so start with a GCC build).
# 2. Minimize total running time, by avoiding useless rebuilds # 2. Minimize total running time, by avoiding useless rebuilds
# #
# Indicative running times are given for reference. # Indicative running times are given for reference.
msg "build: cmake, gcc, ASan" # ~ 1 min msg "build: cmake, gcc, ASan" # ~ 1 min 50s
cleanup cleanup
CC=gcc cmake -D CMAKE_BUILD_TYPE:String=Asan . CC=gcc cmake -D CMAKE_BUILD_TYPE:String=Asan .
make make
msg "test: main suites and selftest (ASan build)" # ~ 10s + 30s msg "test: main suites and selftest (ASan build)" # ~ 50s
make test make test
programs/test/selftest programs/test/selftest
msg "test: ssl-opt.sh (ASan build)" # ~ 1 min 10s msg "test: ssl-opt.sh (ASan build)" # ~ 1 min
cd tests cd tests
./ssl-opt.sh ./ssl-opt.sh
cd .. cd ..
msg "test/build: ref-configs (ASan build)" # ~ 4 min 45 s msg "test/build: ref-configs (ASan build)" # ~ 6 min 20s
tests/scripts/test-ref-configs.pl tests/scripts/test-ref-configs.pl
# Most issues are likely to be caught at this point # Most frequent issues are likely to be caught at this point
msg "build: with ASan (rebuild after ref-configs)" # ~ 1 min msg "build: with ASan (rebuild after ref-configs)" # ~ 1 min
make make
msg "test: compat.sh (ASan build)" # ~ 7 min 30s msg "test: compat.sh (ASan build)" # ~ 6 min
cd tests cd tests
./compat.sh ./compat.sh
cd .. cd ..
msg "build: cmake, full config, clang" # ~ 40s msg "build: cmake, full config, clang" # ~ 50s
cleanup cleanup
cp "$CONFIG_H" "$CONFIG_BAK" cp "$CONFIG_H" "$CONFIG_BAK"
scripts/config.pl full scripts/config.pl full
@ -105,15 +105,15 @@ scripts/config.pl unset POLARSSL_MEMORY_BACKTRACE # too slow for tests
CC=clang cmake -D CMAKE_BUILD_TYPE:String=Check . CC=clang cmake -D CMAKE_BUILD_TYPE:String=Check .
make make
msg "test: main suites (full config)" # ~ 30s (?) msg "test: main suites (full config)" # ~ 5s
make test make test
msg "test: ssl-opt.sh default (full config)" # < 5s msg "test: ssl-opt.sh default (full config)" # ~ 1s
cd tests cd tests
./ssl-opt.sh -f Default ./ssl-opt.sh -f Default
cd .. cd ..
msg "test: compat.sh 3DES & NULL (full config)" # ~ 2 min msg "test: compat.sh DES & NULL (full config)" # ~ 2 min
cd tests cd tests
./compat.sh -e '^$' -f 'NULL\|3DES-EDE-CBC\|DES-CBC3' ./compat.sh -e '^$' -f 'NULL\|3DES-EDE-CBC\|DES-CBC3'
cd .. cd ..
@ -127,14 +127,14 @@ msg "build: Unix make, -O2 (gcc)" # ~ 30s
cleanup cleanup
CC=gcc make CC=gcc make
msg "build: MSan (clang)" # ~ 1 min 30s msg "build: MSan (clang)" # ~ 1 min 20s
cleanup cleanup
cp "$CONFIG_H" "$CONFIG_BAK" cp "$CONFIG_H" "$CONFIG_BAK"
scripts/config.pl unset POLARSSL_AESNI_C # memsan doesn't grok asm scripts/config.pl unset POLARSSL_AESNI_C # memsan doesn't grok asm
CC=clang cmake -D CMAKE_BUILD_TYPE:String=MemSan . CC=clang cmake -D CMAKE_BUILD_TYPE:String=MemSan .
make make
msg "test: main suites (MSan)" # ~ 15s msg "test: main suites (MSan)" # ~ 10s
make test make test
msg "test: ssl-opt.sh (MSan)" # ~ 1 min msg "test: ssl-opt.sh (MSan)" # ~ 1 min