diff options
Diffstat (limited to 'tests/twisted/run-test.sh.in')
| -rw-r--r-- | tests/twisted/run-test.sh.in | 43 |
1 files changed, 24 insertions, 19 deletions
diff --git a/tests/twisted/run-test.sh.in b/tests/twisted/run-test.sh.in index 8dd5fd66..d517ad78 100644 --- a/tests/twisted/run-test.sh.in +++ b/tests/twisted/run-test.sh.in @@ -1,54 +1,59 @@ #!/bin/sh -if test "x$GABBLE_TEST_UNINSTALLED" = x; then - script_fullname=`readlink -e "@gabbletestsdir@/twisted/run-test.sh"` +if test "x$SALUT_TEST_UNINSTALLED" = x; then + script_fullname=`readlink -e "@saluttestsdir@/twisted/run-test.sh"` if [ `readlink -e "$0"` != "$script_fullname" ] ; then echo "This script is meant to be installed at $script_fullname" >&2 exit 1 fi - test_src="@gabbletestsdir@" - test_build="@gabbletestsdir@" - config_file="@gabbletestsdir@/twisted/tools/servicedir/tmp-session-bus.conf" + test_src="@saluttestsdir@" + test_build="@saluttestsdir@" + config_file="@saluttestsdir@/twisted/tools/servicedir/tmp-session-bus.conf" - PYTHONPATH="@gabbletestsdir@/twisted" + PYTHONPATH="@saluttestsdir@/twisted" export PYTHONPATH - GABBLE_TWISTED_PATH="@gabbletestsdir@/twisted" - export GABBLE_TWISTED_PATH + SALUT_TWISTED_PATH="@saluttestsdir@/twisted" + export SALUT_TWISTED_PATH else - if test -z "$GABBLE_ABS_TOP_SRCDIR"; then - echo "GABBLE_ABS_TOP_SRCDIR must be set" >&2 + if test -z "$SALUT_ABS_TOP_SRCDIR"; then + echo "SALUT_ABS_TOP_SRCDIR must be set" >&2 exit 1 fi - if test -z "$GABBLE_ABS_TOP_BUILDDIR"; then - echo "GABBLE_ABS_TOP_BUILDDIR must be set" >&2 + if test -z "$SALUT_ABS_TOP_BUILDDIR"; then + echo "SALUT_ABS_TOP_BUILDDIR must be set" >&2 exit 1 fi - test_src="${GABBLE_ABS_TOP_SRCDIR}/tests" - test_build="${GABBLE_ABS_TOP_BUILDDIR}/tests" - config_file="${test_build}/twisted/tools/servicedir-uninstalled/tmp-session-bus.conf" + test_src="${SALUT_ABS_TOP_SRCDIR}/tests" + test_build="${SALUT_ABS_TOP_BUILDDIR}/tests" + config_file="${test_build}/twisted/tools/tmp-session-bus.conf" PYTHONPATH="${test_src}/twisted:${test_build}/twisted" export PYTHONPATH - GABBLE_TWISTED_PATH="${test_src}/twisted" - export GABBLE_TWISTED_PATH + SALUT_TWISTED_PATH="${test_src}/twisted" + export SALUT_TWISTED_PATH fi if [ -n "$1" ] ; then list="$1" else - list=$(cat "${test_build}"/twisted/gabble-twisted-tests.list) + list=$(cat "${test_build}"/twisted/salut-twisted-tests.list) +fi + +if [ -z "$SALUT_TEST_REAL_AVAHI" ]; then + also_for_system="--also-for-system"; fi any_failed=0 for i in $list ; do echo "Testing $i ..." sh "${test_src}/twisted/tools/with-session-bus.sh" \ - ${GABBLE_TEST_SLEEP} \ + ${SALUT_TEST_SLEEP} \ --config-file="${config_file}" \ + ${also_for_system} \ -- \ @TEST_PYTHON@ -u "${test_src}/twisted/$i" e=$? |