mirror of
https://github.com/yuzu-emu/mbedtls.git
synced 2024-12-23 01:05:35 +00:00
Simplify some scripts
ssl-opt.sh and compat.sh can now be run from root too
This commit is contained in:
parent
89eb1970e9
commit
3d404b4763
|
@ -8,8 +8,8 @@ script:
|
||||||
- cmake -D CMAKE_BUILD_TYPE:String="Check" .
|
- cmake -D CMAKE_BUILD_TYPE:String="Check" .
|
||||||
- make
|
- make
|
||||||
- make test
|
- make test
|
||||||
- ( cd tests && ./compat.sh )
|
- tests/compat.sh
|
||||||
- ( cd tests && ./ssl-opt.sh )
|
- tests/ssl-opt.sh
|
||||||
- tests/scripts/test-ref-configs.pl
|
- tests/scripts/test-ref-configs.pl
|
||||||
env:
|
env:
|
||||||
global:
|
global:
|
||||||
|
|
|
@ -84,8 +84,8 @@ if(ENABLE_TESTING)
|
||||||
ADD_CUSTOM_TARGET(covtest
|
ADD_CUSTOM_TARGET(covtest
|
||||||
COMMAND make test
|
COMMAND make test
|
||||||
COMMAND programs/test/selftest
|
COMMAND programs/test/selftest
|
||||||
COMMAND cd tests && ./compat.sh
|
COMMAND tests/compat.sh
|
||||||
COMMAND cd tests && ./ssl-opt.sh
|
COMMAND tests/ssl-opt.sh
|
||||||
)
|
)
|
||||||
|
|
||||||
ADD_CUSTOM_TARGET(lcov
|
ADD_CUSTOM_TARGET(lcov
|
||||||
|
|
4
Makefile
4
Makefile
|
@ -70,8 +70,8 @@ ifndef WINDOWS
|
||||||
covtest:
|
covtest:
|
||||||
$(MAKE) check
|
$(MAKE) check
|
||||||
programs/test/selftest
|
programs/test/selftest
|
||||||
( cd tests && ./compat.sh )
|
tests/compat.sh
|
||||||
( cd tests && ./ssl-opt.sh )
|
tests/ssl-opt.sh
|
||||||
|
|
||||||
lcov:
|
lcov:
|
||||||
rm -rf Coverage
|
rm -rf Coverage
|
||||||
|
|
|
@ -93,9 +93,7 @@ make test
|
||||||
programs/test/selftest
|
programs/test/selftest
|
||||||
|
|
||||||
msg "test: ssl-opt.sh (ASan build)" # ~ 1 min
|
msg "test: ssl-opt.sh (ASan build)" # ~ 1 min
|
||||||
cd tests
|
tests/ssl-opt.sh
|
||||||
./ssl-opt.sh
|
|
||||||
cd ..
|
|
||||||
|
|
||||||
msg "test/build: ref-configs (ASan build)" # ~ 6 min 20s
|
msg "test/build: ref-configs (ASan build)" # ~ 6 min 20s
|
||||||
tests/scripts/test-ref-configs.pl
|
tests/scripts/test-ref-configs.pl
|
||||||
|
@ -106,9 +104,7 @@ msg "build: with ASan (rebuild after ref-configs)" # ~ 1 min
|
||||||
make
|
make
|
||||||
|
|
||||||
msg "test: compat.sh (ASan build)" # ~ 6 min
|
msg "test: compat.sh (ASan build)" # ~ 6 min
|
||||||
cd tests
|
tests/compat.sh
|
||||||
./compat.sh
|
|
||||||
cd ..
|
|
||||||
|
|
||||||
msg "build: cmake, full config, clang" # ~ 50s
|
msg "build: cmake, full config, clang" # ~ 50s
|
||||||
cleanup
|
cleanup
|
||||||
|
@ -122,14 +118,10 @@ msg "test: main suites (full config)" # ~ 5s
|
||||||
make test
|
make test
|
||||||
|
|
||||||
msg "test: ssl-opt.sh default (full config)" # ~ 1s
|
msg "test: ssl-opt.sh default (full config)" # ~ 1s
|
||||||
cd tests
|
tests/ssl-opt.sh -f Default
|
||||||
./ssl-opt.sh -f Default
|
|
||||||
cd ..
|
|
||||||
|
|
||||||
msg "test: compat.sh RC4, DES & NULL (full config)" # ~ 2 min
|
msg "test: compat.sh RC4, DES & NULL (full config)" # ~ 2 min
|
||||||
cd tests
|
tests/compat.sh -e '3DES\|DES-CBC3' -f 'NULL\|DES\|RC4\|ARCFOUR'
|
||||||
./compat.sh -e '3DES\|DES-CBC3' -f 'NULL\|DES\|RC4\|ARCFOUR'
|
|
||||||
cd ..
|
|
||||||
|
|
||||||
msg "test/build: curves.pl (gcc)" # ~ 5 min (?)
|
msg "test/build: curves.pl (gcc)" # ~ 5 min (?)
|
||||||
cleanup
|
cleanup
|
||||||
|
@ -261,17 +253,13 @@ 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
|
||||||
cd tests
|
tests/ssl-opt.sh
|
||||||
./ssl-opt.sh
|
|
||||||
cd ..
|
|
||||||
|
|
||||||
# Optional part(s)
|
# Optional part(s)
|
||||||
|
|
||||||
if [ "$MEMORY" -gt 0 ]; then
|
if [ "$MEMORY" -gt 0 ]; then
|
||||||
msg "test: compat.sh (MSan)" # ~ 6 min 20s
|
msg "test: compat.sh (MSan)" # ~ 6 min 20s
|
||||||
cd tests
|
tests/compat.sh
|
||||||
./compat.sh
|
|
||||||
cd ..
|
|
||||||
fi
|
fi
|
||||||
|
|
||||||
else # no MemSan
|
else # no MemSan
|
||||||
|
@ -290,16 +278,12 @@ make test
|
||||||
|
|
||||||
if [ "$MEMORY" -gt 0 ]; then
|
if [ "$MEMORY" -gt 0 ]; then
|
||||||
msg "test: ssl-opt.sh --memcheck (Release)"
|
msg "test: ssl-opt.sh --memcheck (Release)"
|
||||||
cd tests
|
tests/ssl-opt.sh --memcheck
|
||||||
./ssl-opt.sh --memcheck
|
|
||||||
cd ..
|
|
||||||
fi
|
fi
|
||||||
|
|
||||||
if [ "$MEMORY" -gt 1 ]; then
|
if [ "$MEMORY" -gt 1 ]; then
|
||||||
msg "test: compat.sh --memcheck (Release)"
|
msg "test: compat.sh --memcheck (Release)"
|
||||||
cd tests
|
tests/compat.sh --memcheck
|
||||||
./compat.sh --memcheck
|
|
||||||
cd ..
|
|
||||||
fi
|
fi
|
||||||
|
|
||||||
fi # MemSan
|
fi # MemSan
|
||||||
|
|
|
@ -65,7 +65,7 @@ while( my ($conf, $args) = each %configs ) {
|
||||||
if( $args )
|
if( $args )
|
||||||
{
|
{
|
||||||
print "\nrunning compat.sh $args\n";
|
print "\nrunning compat.sh $args\n";
|
||||||
system( "cd tests && ./compat.sh $args" )
|
system( "tests/compat.sh $args" )
|
||||||
and abort "Failed compat.sh: $conf\n";
|
and abort "Failed compat.sh: $conf\n";
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
|
|
Loading…
Reference in a new issue