diff options
| author | Simon McVittie <simon.mcvittie@collabora.co.uk> | 2014-04-02 18:54:48 +0100 |
|---|---|---|
| committer | Simon McVittie <simon.mcvittie@collabora.co.uk> | 2014-04-03 21:11:34 +0100 |
| commit | ed8bc2fbb2916f951f711c9bc22aefdac4a5c1ed (patch) | |
| tree | b38b812598522d8aed194046e827d9044eff09e4 | |
| parent | f0dfb50381d8d5210681eba76b2625926deec6f6 (diff) | |
| download | telepathy-idle-ed8bc2fbb2916f951f711c9bc22aefdac4a5c1ed.tar.gz | |
Pass G_TEST_SRCDIR, G_TEST_BUILDDIR to run-test.sh in its environment
| -rw-r--r-- | tests/twisted/Makefile.am | 4 | ||||
| -rw-r--r-- | tests/twisted/run-test.sh.in | 13 |
2 files changed, 6 insertions, 11 deletions
diff --git a/tests/twisted/Makefile.am b/tests/twisted/Makefile.am index 903e4a7..1f79c60 100644 --- a/tests/twisted/Makefile.am +++ b/tests/twisted/Makefile.am @@ -54,8 +54,8 @@ check-twisted: $(BUILT_SOURCES) idle_test_sleep=--sleep=$(CHECK_TWISTED_SLEEP); \ fi; \ CHECK_TWISTED_UNINSTALLED=1 \ - IDLE_ABS_TOP_SRCDIR=@abs_top_srcdir@ \ - IDLE_ABS_TOP_BUILDDIR=@abs_top_builddir@ \ + G_TEST_SRCDIR=@abs_srcdir@ \ + G_TEST_BUILDDIR=@abs_builddir@ \ CHECK_TWISTED_SLEEP=$$idle_test_sleep \ ./run-test.sh "$(TWISTED_TESTS)" diff --git a/tests/twisted/run-test.sh.in b/tests/twisted/run-test.sh.in index 9faa55e..ffc7c0c 100644 --- a/tests/twisted/run-test.sh.in +++ b/tests/twisted/run-test.sh.in @@ -15,20 +15,15 @@ if test "x$CHECK_TWISTED_UNINSTALLED" = x; then PYTHONPATH="${G_TEST_SRCDIR}" export PYTHONPATH else - if test -z "$IDLE_ABS_TOP_SRCDIR"; then - echo "IDLE_ABS_TOP_SRCDIR must be set" >&2 + if ! test -d "$G_TEST_SRCDIR"; then + echo "G_TEST_SRCDIR must be set and absolute" >&2 exit 1 fi - if test -z "$IDLE_ABS_TOP_BUILDDIR"; then - echo "IDLE_ABS_TOP_BUILDDIR must be set" >&2 + if ! test -d "$G_TEST_BUILDDIR"; then + echo "G_TEST_BUILDDIR must be set and absolute" >&2 exit 1 fi - G_TEST_SRCDIR="${IDLE_ABS_TOP_SRCDIR}/tests/twisted" - export G_TEST_SRCDIR - G_TEST_BUILDDIR="${IDLE_ABS_TOP_BUILDDIR}/tests/twisted" - export G_TEST_BUILDDIR - PYTHONPATH="${G_TEST_SRCDIR}:${G_TEST_BUILDDIR}" export PYTHONPATH fi |