aboutsummaryrefslogtreecommitdiffstats
path: root/test/test.sh
diff options
context:
space:
mode:
authorEvan Huus <eapache@gmail.com>2013-10-06 23:39:16 +0000
committerEvan Huus <eapache@gmail.com>2013-10-06 23:39:16 +0000
commit0777f96c6380875a7a1d7008dc590632ab711dce (patch)
treeb623f274325236d446fd1ec5e8f341d2ee24d8b9 /test/test.sh
parent84aebfb9dd2da9e023dae6e429e41e2dbd49e71f (diff)
Another path and ordering tweak.
svn path=/trunk/; revision=52430
Diffstat (limited to 'test/test.sh')
-rwxr-xr-xtest/test.sh15
1 files changed, 8 insertions, 7 deletions
diff --git a/test/test.sh b/test/test.sh
index 64bbce5f2c..e640ed2f3d 100755
--- a/test/test.sh
+++ b/test/test.sh
@@ -65,13 +65,6 @@ fi
source test-backend.sh
source config.sh
-source suite-clopts.sh
-source suite-io.sh
-source suite-capture.sh
-source suite-unittests.sh
-source suite-fileformats.sh
-source suite-decryption.sh
-source suite-nameres.sh
# needed by some tests
TEST_OUTDIR=$(mktemp -d)
@@ -84,6 +77,14 @@ fi
test_build_paths
+source $TESTS_DIR/suite-clopts.sh
+source $TESTS_DIR/suite-io.sh
+source $TESTS_DIR/suite-capture.sh
+source $TESTS_DIR/suite-unittests.sh
+source $TESTS_DIR/suite-fileformats.sh
+source $TESTS_DIR/suite-decryption.sh
+source $TESTS_DIR/suite-nameres.sh
+
test_cleanup() {
if [ $TEST_OUTDIR_CLEAN = 1 ]; then
# display contents of test outputs, ignore directory: