From 9ca6cb9fc82d0a720325beaf2c827ed8a8cc20d0 Mon Sep 17 00:00:00 2001
From: Fabian Homborg <FHomborg@gmail.com>
Date: Wed, 21 Jun 2017 16:53:50 +0200
Subject: [PATCH] Test that exported vars remain exported

I.e. the fix for #2611.
---
 tests/test3.in  | 2 ++
 tests/test3.out | 1 +
 2 files changed, 3 insertions(+)

diff --git a/tests/test3.in b/tests/test3.in
index 522f7085b..0bcb419a8 100644
--- a/tests/test3.in
+++ b/tests/test3.in
@@ -244,6 +244,8 @@ function __fish_test_shadow
   env | string match -q '__fish_test_env17=*' ; or echo SHADOWED
 end
 __fish_test_shadow
+# Test that the variable is still exported (#2611)
+env | string match '__fish_test_env17=*'
 
 # clear for other shells
 set -eU __fish_test_universal_variables_variable_foo
diff --git a/tests/test3.out b/tests/test3.out
index 7f31877bd..8059d475f 100644
--- a/tests/test3.out
+++ b/tests/test3.out
@@ -19,6 +19,7 @@ count:5 content:[functionblock function global universal blocklocal]
 Test 16 pass
 __fish_test_env17=UNSHADOWED
 SHADOWED
+__fish_test_env17=UNSHADOWED
 Testing Universal Startup
 1
 1