From a13e067b853a937775ffa1cee272d1ca766a4592 Mon Sep 17 00:00:00 2001
From: Kevin Ballard <kevin@sb.org>
Date: Tue, 7 Oct 2014 19:37:13 -0700
Subject: [PATCH] Fix test breakage from 14724401f

We can't use $PATHS to test the :-splitting because the global config
file adds extra paths based on /etc/paths and /etc/paths.d.

Ideally fish would have a way to suppress behavior like that, but for
the time being it doesn't.
---
 tests/test3.in  | 5 ++++-
 tests/test3.out | 2 +-
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/tests/test3.in b/tests/test3.in
index 816e94ec3..4dec9a838 100644
--- a/tests/test3.in
+++ b/tests/test3.in
@@ -246,6 +246,9 @@ env SHLVL="  3" ../fish -c 'echo SHLVL: $SHLVL'
 
 # Test transformation of inherited variables
 env DISPLAY="localhost:0.0" ../fish -c 'echo Elements in DISPLAY: (count $DISPLAY)'
-env PATH="/bin:/sbin:/usr/bin:/usr/sbin" ../fish -c 'echo Elements in PATH: (count $PATH)'
+# We can't use PATH for this because the global configuration will modify PATH
+# based on /etc/paths and /etc/paths.d.
+# At the moment, most variables split on :. So we can use an arbitrary variable for this.
+env FOO="one:two:three:four" ../fish -c 'echo Elements in FOO: (count $FOO)'
 
 true
diff --git a/tests/test3.out b/tests/test3.out
index 31ad6cb2e..5d3a48b23 100644
--- a/tests/test3.out
+++ b/tests/test3.out
@@ -29,4 +29,4 @@ SHLVL: 1
 SHLVL: 4
 SHLVL: 4
 Elements in DISPLAY: 1
-Elements in PATH: 4
+Elements in FOO: 4