From d51f82d1b571b05cd8e8c9d14bd31eff2e04baff Mon Sep 17 00:00:00 2001
From: Kurtis Rader <krader@skepticism.us>
Date: Mon, 3 Jul 2017 15:36:38 -0700
Subject: [PATCH] fix bug in test3

The change for issue #4163 brought to light a bug in tests/test.in.
---
 tests/test1.in  | 6 +++---
 tests/test1.out | 4 ++--
 tests/test3.in  | 1 -
 3 files changed, 5 insertions(+), 6 deletions(-)

diff --git a/tests/test1.in b/tests/test1.in
index 3620566e9..86f7999c9 100644
--- a/tests/test1.in
+++ b/tests/test1.in
@@ -47,17 +47,17 @@ else
 end
 
 function foo
-    printf 'Test %s' $1; echo ' pass'
+    printf 'Test %s' $argv[1]; echo ' pass'
 end
 
-foo 3
+foo 3a
 
 for i in Test for continue break and switch builtins problems;
 	switch $i
 		case Test
 			printf "%s " $i
 		case "f??"
-			printf "%s " 3
+			printf "%s " 3b
 		case "c*"
 			echo pass
 		case break
diff --git a/tests/test1.out b/tests/test1.out
index 9588a84fd..63f84b048 100644
--- a/tests/test1.out
+++ b/tests/test1.out
@@ -14,8 +14,8 @@ a
 b
 c
 Test 2 pass
-Test  pass
-Test 3 pass
+Test 3a pass
+Test 3b pass
 Test 4 pass
 1
 0
diff --git a/tests/test3.in b/tests/test3.in
index baae4bebb..522f7085b 100644
--- a/tests/test3.in
+++ b/tests/test3.in
@@ -220,7 +220,6 @@ begin
 
     set -q __fish_test_universal_variables_variable_foo
     and echo __fish_test_universal_variables_variable_foo should set after test16 inner begin..end
-    #set -e __fish_test_universal_variables_variable_foo
   end
 
   test16