From 6533a89b7e98c5d4663cb04ca31228f5d79dfd0b Mon Sep 17 00:00:00 2001 From: Andrew McMillan Date: Sat, 6 Nov 2010 18:05:04 +1300 Subject: [PATCH] Change regression runner to look for sample data with tests. --- testing/run_regressions.sh | 9 ++++++--- {dba => testing/tests/regression-suite}/sample-data.sql | 0 2 files changed, 6 insertions(+), 3 deletions(-) rename {dba => testing/tests/regression-suite}/sample-data.sql (100%) diff --git a/testing/run_regressions.sh b/testing/run_regressions.sh index 103007c0..7f0e7979 100755 --- a/testing/run_regressions.sh +++ b/testing/run_regressions.sh @@ -113,9 +113,11 @@ initialise_regression() { ../dba/update-davical-database --dbname=${DBNAME} --nopatch --appuser davical_app --owner davical_dba >"${RESULTS}/${TEST}" 2>&1 check_result "${TEST}" - TEST="Load-Sample-Data" - psql -q -f "../dba/sample-data.sql" "${DBNAME}" >"${RESULTS}/${TEST}" 2>&1 - check_result "${TEST}" + if [ -f "${REGRESSION}/sample-data.sql" ]; then + TEST="Load-Sample-Data" + psql -q -f "${REGRESSION}/sample-data.sql" "${DBNAME}" >"${RESULTS}/${TEST}" 2>&1 + check_result "${TEST}" + fi } @@ -131,6 +133,7 @@ run_regression_suite() { fi for T in ${REGRESSION}/*.test ; do + [ -f "${T}" ] || break TEST="`basename ${T} .test`" TESTNUM="`echo ${TEST} | cut -f1 -d'-'`" TESTNUM="${TEST/-*}" diff --git a/dba/sample-data.sql b/testing/tests/regression-suite/sample-data.sql similarity index 100% rename from dba/sample-data.sql rename to testing/tests/regression-suite/sample-data.sql