From e53cf9e244cf0dc57ea8a5c63e248253970b803a Mon Sep 17 00:00:00 2001 From: Cyril Bur Date: Fri, 17 Mar 2017 16:13:08 +1100 Subject: [PATCH] external/tests: Add a data directory for tests Signed-off-by: Cyril Bur Signed-off-by: Stewart Smith --- external/test/test.sh | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/external/test/test.sh b/external/test/test.sh index 827cd9217938..f63cce5fafd0 100755 --- a/external/test/test.sh +++ b/external/test/test.sh @@ -26,8 +26,6 @@ run_binary() { } fail_test() { - rm -rf "$STDERR_OUT"; - rm -rf "$STDOUT_OUT"; echo "$0 ($CUR_TEST): test failed"; exit ${1:-1}; } @@ -60,8 +58,8 @@ diff_with_result() { } run_tests() { - if [ $# -ne 2 ] ; then - echo "Usage run_tests test_dir result_dir"; + if [ $# -lt 2 ] ; then + echo "Usage run_tests test_dir result_dir [data_dir]"; exit 1; fi @@ -75,6 +73,10 @@ run_tests() { export STDERR_OUT=$(mktemp --tmpdir external-test-stderr.XXXXXX); export STDOUT_OUT=$(mktemp --tmpdir external-test-stdout.XXXXXX); + export DATA_DIR=$(mktemp --tmpdir -d external-test-datadir.XXXXXX); + if [ $# -eq 3 ] ; then + cp -r $3/* "$DATA_DIR" + fi for the_test in $all_tests; do @@ -93,6 +95,7 @@ run_tests() { rm -rf $STDERR_OUT; rm -rf $STDOUT_OUT; + rm -rf $DATA_DIR; echo "$0 tests passed"