Patchwork [4,of,8] tests: use small conditional section for tic requirement in test-status-color.t

login
register
mail settings
Submitter Mads Kiilerich
Date Jan. 20, 2014, 12:32 a.m.
Message ID <183ba00bd39626c65140.1390177948@localhost.localdomain>
Download mbox | patch
Permalink /patch/3390/
State Superseded
Commit 16c643f3a1a5e433e3d1e12b03dba9792d9956ae
Headers show

Comments

Mads Kiilerich - Jan. 20, 2014, 12:32 a.m.
# HG changeset patch
# User Mads Kiilerich <madski@unity3d.com>
# Date 1390177794 -3600
#      Mon Jan 20 01:29:54 2014 +0100
# Node ID 183ba00bd39626c65140cf5715211895c84810a0
# Parent  9978663473ce220310ec5286a32890444c3daee8
tests: use small conditional section for tic requirement in test-status-color.t

Patch

diff --git a/tests/test-status-color.t b/tests/test-status-color.t
--- a/tests/test-status-color.t
+++ b/tests/test-status-color.t
@@ -1,5 +1,3 @@ 
-  $ "$TESTDIR/hghave" tic || exit 80
-
   $ echo "[extensions]" >> $HGRCPATH
   $ echo "color=" >> $HGRCPATH
   $ echo "[color]" >> $HGRCPATH
@@ -186,8 +184,11 @@  hg status -A:
   \x1b[0;0mC \x1b[0m\x1b[0;0m.hgignore\x1b[0m (esc)
   \x1b[0;0mC \x1b[0m\x1b[0;0mmodified\x1b[0m (esc)
 
+
 hg status -A (with terminfo color):
 
+#if tic
+
   $ mkdir "$TESTTMP/terminfo"
   $ TERMINFO="$TESTTMP/terminfo" tic "$TESTDIR/hgterm.ti"
   $ TERM=hgterm TERMINFO="$TESTTMP/terminfo" hg status --config color.mode=terminfo --color=always -A
@@ -201,6 +202,8 @@  hg status -A (with terminfo color):
   \x1b[30m\x1b[30mC \x1b[30m\x1b[30m\x1b[30m.hgignore\x1b[30m (esc)
   \x1b[30m\x1b[30mC \x1b[30m\x1b[30m\x1b[30mmodified\x1b[30m (esc)
 
+#endif
+
 
   $ echo "^ignoreddir$" > .hgignore
   $ mkdir ignoreddir