aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAvatar Ciaran McCreesh <ciaran.mccreesh@googlemail.com> 2006-09-15 13:45:15 +0000
committerAvatar Ciaran McCreesh <ciaran.mccreesh@googlemail.com> 2006-09-15 13:45:15 +0000
commit919d8bb5890d4aab898dc9c6f29015eeacc3d195 (patch)
tree4809602b6ae05c3697c454dd884a99f47cb3ce6b
parent1c3ecb57e35c8e212d5d725192bea80cb9bc61fe (diff)
downloadpaludis-919d8bb5890d4aab898dc9c6f29015eeacc3d195.tar.gz
paludis-919d8bb5890d4aab898dc9c6f29015eeacc3d195.tar.xz
Don't display xterm titles for testcases
-rw-r--r--src/adjutrix/Makefile.am1
-rw-r--r--src/colour.cc3
-rw-r--r--src/paludis/Makefile.am1
-rw-r--r--src/qualudis/Makefile.am1
4 files changed, 5 insertions, 1 deletions
diff --git a/src/adjutrix/Makefile.am b/src/adjutrix/Makefile.am
index f38109c..2fdd9b4 100644
--- a/src/adjutrix/Makefile.am
+++ b/src/adjutrix/Makefile.am
@@ -48,6 +48,7 @@ adjutrix_LDADD = \
TESTS_ENVIRONMENT = env \
TEST_SCRIPT_DIR="$(srcdir)/" \
PALUDIS_NO_GLOBAL_HOOKS="yes" \
+ PALUDIS_NO_XTERM_TITLES="yes" \
PALUDIS_EBUILD_DIR="`$(top_srcdir)/ebuild/utils/canonicalise $(top_srcdir)/ebuild/`" \
PALUDIS_EBUILD_DIR_FALLBACK="`$(top_srcdir)/ebuild/utils/canonicalise $(top_builddir)/ebuild/`" \
PALUDIS_REPOSITORY_SO_DIR="`$(top_srcdir)/ebuild/utils/canonicalise $(top_builddir)/paludis/repositories`" \
diff --git a/src/colour.cc b/src/colour.cc
index 31c79b7..c985971 100644
--- a/src/colour.cc
+++ b/src/colour.cc
@@ -50,7 +50,8 @@ use_xterm_titles()
{
static bool result(
(0 != paludis::getenv_with_default("TERM", "").compare(0, 4, "dumb")) &&
- (0 != paludis::getenv_with_default("TERM", "").compare(0, 5, "linux")));
+ (0 != paludis::getenv_with_default("TERM", "").compare(0, 5, "linux")) &&
+ (0 != paludis::getenv_with_default("PALUDIS_NO_XTERM_TITLES", "").length()));
return result;
}
diff --git a/src/paludis/Makefile.am b/src/paludis/Makefile.am
index fa6835f..e9dcad7 100644
--- a/src/paludis/Makefile.am
+++ b/src/paludis/Makefile.am
@@ -52,6 +52,7 @@ paludis_LDADD = \
TESTS_ENVIRONMENT = env \
TEST_SCRIPT_DIR="$(srcdir)/" \
PALUDIS_NO_GLOBAL_HOOKS="yes" \
+ PALUDIS_NO_XTERM_TITLES="yes" \
PALUDIS_EBUILD_DIR="`$(top_srcdir)/ebuild/utils/canonicalise $(top_srcdir)/ebuild/`" \
PALUDIS_EBUILD_DIR_FALLBACK="`$(top_srcdir)/ebuild/utils/canonicalise $(top_builddir)/ebuild/`" \
PALUDIS_REPOSITORY_SO_DIR="`$(top_srcdir)/ebuild/utils/canonicalise $(top_builddir)/paludis/repositories`" \
diff --git a/src/qualudis/Makefile.am b/src/qualudis/Makefile.am
index a160edd..7157136 100644
--- a/src/qualudis/Makefile.am
+++ b/src/qualudis/Makefile.am
@@ -32,6 +32,7 @@ INCLUDES = $(PCREPLUSPLUS_CFLAGS) $(LIBXML2DEPS_CFLAGS)
TESTS_ENVIRONMENT = env \
TEST_SCRIPT_DIR="$(srcdir)/" \
PALUDIS_REPOSITORY_SO_DIR="$(top_builddir)/paludis/repositories" \
+ PALUDIS_NO_XTERM_TITLES="yes" \
bash $(top_srcdir)/test/run_test.sh bash
TESTS = version_TEST