Attachment 85696 Details for Bug 69258 – Import run-test.sh.in from Gabble master

[patch] Import run-test.sh.in from Gabble master

0002-Import-run-test.sh.in-from-Gabble-master.patch (text/plain), 2.67 KB, created by Guillaume Desmottes on 2013-09-12 08:58:57 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Guillaume Desmottes

Created: 2013-09-12 08:58:57 UTC

Size: 2.67 KB

patch

obsolete

>From 5c012a0ca8e8692efbc664e242e414950b38c4fd Mon Sep 17 00:00:00 2001
>From: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
>Date: Thu, 12 Sep 2013 10:33:15 +0200
>Subject: [PATCH 2/4] Import run-test.sh.in from Gabble master
>
>https://bugs.freedesktop.org/show_bug.cgi?id=69258
>---
> tests/twisted/Makefile.am    |  1 +
> tests/twisted/run-test.sh.in | 69 ++++++++++++++++++++++++++++++++++++++++++++
> 2 files changed, 70 insertions(+)
> create mode 100644 tests/twisted/run-test.sh.in
>
>diff --git a/tests/twisted/Makefile.am b/tests/twisted/Makefile.am
>index 764f074..17fa541 100644
>--- a/tests/twisted/Makefile.am
>+++ b/tests/twisted/Makefile.am
>@@ -68,6 +68,7 @@ endif
> 
> EXTRA_DIST = \
> 	     $(TWISTED_TESTS) \
>+	     run-test.sh.in \
> 	     servicetest.py \
> 	     idletest.py \
> 	     constants.py \
>diff --git a/tests/twisted/run-test.sh.in b/tests/twisted/run-test.sh.in
>new file mode 100644
>index 0000000..8dd5fd6
>--- /dev/null
>+++ b/tests/twisted/run-test.sh.in
>@@ -0,0 +1,69 @@
>+#!/bin/sh
>+
>+if test "x$GABBLE_TEST_UNINSTALLED" = x; then
>+  script_fullname=`readlink -e "@gabbletestsdir@/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"
>+
>+  PYTHONPATH="@gabbletestsdir@/twisted"
>+  export PYTHONPATH
>+
>+  GABBLE_TWISTED_PATH="@gabbletestsdir@/twisted"
>+  export GABBLE_TWISTED_PATH
>+else
>+  if test -z "$GABBLE_ABS_TOP_SRCDIR"; then
>+    echo "GABBLE_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
>+    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"
>+
>+  PYTHONPATH="${test_src}/twisted:${test_build}/twisted"
>+  export PYTHONPATH
>+
>+  GABBLE_TWISTED_PATH="${test_src}/twisted"
>+  export GABBLE_TWISTED_PATH
>+fi
>+
>+if [ -n "$1" ] ; then
>+  list="$1"
>+else
>+  list=$(cat "${test_build}"/twisted/gabble-twisted-tests.list)
>+fi
>+
>+any_failed=0
>+for i in $list ; do
>+  echo "Testing $i ..."
>+  sh "${test_src}/twisted/tools/with-session-bus.sh" \
>+    ${GABBLE_TEST_SLEEP} \
>+    --config-file="${config_file}" \
>+    -- \
>+    @TEST_PYTHON@ -u "${test_src}/twisted/$i"
>+  e=$?
>+  case "$e" in
>+    (0)
>+      echo "PASS: $i"
>+      ;;
>+    (77)
>+      echo "SKIP: $i"
>+      ;;
>+    (*)
>+      any_failed=1
>+      echo "FAIL: $i ($e)"
>+      ;;
>+  esac
>+done
>+
>+exit $any_failed
>-- 
>1.8.3.1
>

Actions: View | Splinter Review

Attachments on bug 69258: 85695 | 85696 | 85697 | 85698

Use of freedesktop.org services, including Bugzilla, is subject to our Code of Conduct. How we collect and use information is described in our Privacy Policy.