Simplify some scripts
ssl-opt.sh and compat.sh can now be run from root too
diff --git a/.travis.yml b/.travis.yml
index 24c7667..a7b9a32 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -8,8 +8,8 @@
- cmake -D CMAKE_BUILD_TYPE:String="Check" .
- make
- make test
-- ( cd tests && ./compat.sh )
-- ( cd tests && ./ssl-opt.sh )
+- tests/compat.sh
+- tests/ssl-opt.sh
- tests/scripts/test-ref-configs.pl
env:
global:
diff --git a/CMakeLists.txt b/CMakeLists.txt
index c0d03f6..610f079 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -84,8 +84,8 @@
ADD_CUSTOM_TARGET(covtest
COMMAND make test
COMMAND programs/test/selftest
- COMMAND cd tests && ./compat.sh
- COMMAND cd tests && ./ssl-opt.sh
+ COMMAND tests/compat.sh
+ COMMAND tests/ssl-opt.sh
)
ADD_CUSTOM_TARGET(lcov
diff --git a/Makefile b/Makefile
index 2f05e12..0c489f8 100644
--- a/Makefile
+++ b/Makefile
@@ -70,8 +70,8 @@
covtest:
$(MAKE) check
programs/test/selftest
- ( cd tests && ./compat.sh )
- ( cd tests && ./ssl-opt.sh )
+ tests/compat.sh
+ tests/ssl-opt.sh
lcov:
rm -rf Coverage
diff --git a/tests/scripts/all.sh b/tests/scripts/all.sh
index 0562c75..7faeb11 100755
--- a/tests/scripts/all.sh
+++ b/tests/scripts/all.sh
@@ -93,9 +93,7 @@
programs/test/selftest
msg "test: ssl-opt.sh (ASan build)" # ~ 1 min
-cd tests
-./ssl-opt.sh
-cd ..
+tests/ssl-opt.sh
msg "test/build: ref-configs (ASan build)" # ~ 6 min 20s
tests/scripts/test-ref-configs.pl
@@ -106,9 +104,7 @@
make
msg "test: compat.sh (ASan build)" # ~ 6 min
-cd tests
-./compat.sh
-cd ..
+tests/compat.sh
msg "build: cmake, full config, clang" # ~ 50s
cleanup
@@ -122,14 +118,10 @@
make test
msg "test: ssl-opt.sh default (full config)" # ~ 1s
-cd tests
-./ssl-opt.sh -f Default
-cd ..
+tests/ssl-opt.sh -f Default
msg "test: compat.sh RC4, DES & NULL (full config)" # ~ 2 min
-cd tests
-./compat.sh -e '3DES\|DES-CBC3' -f 'NULL\|DES\|RC4\|ARCFOUR'
-cd ..
+tests/compat.sh -e '3DES\|DES-CBC3' -f 'NULL\|DES\|RC4\|ARCFOUR'
msg "test/build: curves.pl (gcc)" # ~ 5 min (?)
cleanup
@@ -261,17 +253,13 @@
make test
msg "test: ssl-opt.sh (MSan)" # ~ 1 min
-cd tests
-./ssl-opt.sh
-cd ..
+tests/ssl-opt.sh
# Optional part(s)
if [ "$MEMORY" -gt 0 ]; then
msg "test: compat.sh (MSan)" # ~ 6 min 20s
- cd tests
- ./compat.sh
- cd ..
+ tests/compat.sh
fi
else # no MemSan
@@ -290,16 +278,12 @@
if [ "$MEMORY" -gt 0 ]; then
msg "test: ssl-opt.sh --memcheck (Release)"
- cd tests
- ./ssl-opt.sh --memcheck
- cd ..
+ tests/ssl-opt.sh --memcheck
fi
if [ "$MEMORY" -gt 1 ]; then
msg "test: compat.sh --memcheck (Release)"
- cd tests
- ./compat.sh --memcheck
- cd ..
+ tests/compat.sh --memcheck
fi
fi # MemSan
diff --git a/tests/scripts/test-ref-configs.pl b/tests/scripts/test-ref-configs.pl
index 2343965..1c973eb 100755
--- a/tests/scripts/test-ref-configs.pl
+++ b/tests/scripts/test-ref-configs.pl
@@ -65,7 +65,7 @@
if( $args )
{
print "\nrunning compat.sh $args\n";
- system( "cd tests && ./compat.sh $args" )
+ system( "tests/compat.sh $args" )
and abort "Failed compat.sh: $conf\n";
}
else