Attachment 81127 Details for Bug 65979 – Rename TEST_PYTHON to PYTHON

[patch] Rename TEST_PYTHON to PYTHON

0001-Rename-TEST_PYTHON-to-PYTHON-which-is-the-common-nam.patch (text/plain), 2.25 KB, created by Jasper Lievisse Adriaanse on 2013-06-20 18:36:59 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Jasper Lievisse Adriaanse

Created: 2013-06-20 18:36:59 UTC

Size: 2.25 KB

patch

obsolete

>From 934befb57936ebe6c716005dd0fbbcc7cc70b5c8 Mon Sep 17 00:00:00 2001
>From: Jasper Lievisse Adriaanse <jasper@humppa.nl>
>Date: Thu, 20 Jun 2013 20:33:01 +0200
>Subject: [PATCH] Rename TEST_PYTHON to PYTHON, which is the common name for
> this variable.
>
>https://bugs.freedesktop.org/show_bug.cgi?id=65979
>---
> configure.ac              | 14 +++++++-------
> tests/twisted/Makefile.am |  2 +-
> 2 files changed, 8 insertions(+), 8 deletions(-)
>
>diff --git a/configure.ac b/configure.ac
>index c534f2c..abe60a6 100644
>--- a/configure.ac
>+++ b/configure.ac
>@@ -108,19 +108,19 @@ AM_PATH_PYTHON([2.3])
> 
> dnl check for a version of python that can run the twisted tests
> AC_MSG_CHECKING([for Python with Twisted and IRC protocol support])
>-for TEST_PYTHON in python2.5 python2.6 python; do
>-  if $TEST_PYTHON -c "from sys import version_info; import dbus, dbus.mainloop.glib; raise SystemExit(version_info < (2, 5, 0, 'final', 0))" >/dev/null 2>&1; then
>-    if $TEST_PYTHON -c "import twisted.words.protocols.irc, twisted.internet.reactor" >/dev/null 2>&1; then
>+for PYTHON in python2.5 python2.6 python; do
>+  if $PYTHON -c "from sys import version_info; import dbus, dbus.mainloop.glib; raise SystemExit(version_info < (2, 5, 0, 'final', 0))" >/dev/null 2>&1; then
>+    if $PYTHON -c "import twisted.words.protocols.irc, twisted.internet.reactor" >/dev/null 2>&1; then
>       AM_CONDITIONAL([WANT_TWISTED_TESTS], true)
>       break
>     else
>-      TEST_PYTHON=no
>+      PYTHON=no
>     fi
>   fi
> done
>-AC_MSG_RESULT([$TEST_PYTHON])
>-AC_SUBST(TEST_PYTHON)
>-AM_CONDITIONAL([WANT_TWISTED_TESTS], test xno != x$TEST_PYTHON)
>+AC_MSG_RESULT([$PYTHON])
>+AC_SUBST(PYTHON)
>+AM_CONDITIONAL([WANT_TWISTED_TESTS], test xno != x$PYTHON)
> 
> 
> AS_AC_EXPAND(DATADIR, $datadir)
>diff --git a/tests/twisted/Makefile.am b/tests/twisted/Makefile.am
>index 764f074..5beca1e 100644
>--- a/tests/twisted/Makefile.am
>+++ b/tests/twisted/Makefile.am
>@@ -54,7 +54,7 @@ check-twisted:
> 		--config-file=tools/tmp-session-bus.conf \
> 		-- $(MAKE) check-TESTS \
> 		TESTS="$(TWISTED_TESTS)" \
>-		TESTS_ENVIRONMENT="$(TESTS_ENVIRONMENT) $(TEST_PYTHON) -u" || \
>+		TESTS_ENVIRONMENT="$(TESTS_ENVIRONMENT) $(PYTHON) -u" || \
> 		failed=1; \
> 	if test -e tools/core; then\
> 		echo -e "\033[0;31;1mCore dump exists: tools/core\033[0m";\
>-- 
>1.8.3.1
>

Actions: View | Splinter Review

Attachments on bug 65979: 81127

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.