From 77cf3697ae8acff0be77c3f849dcd6e5d4ecfa60 Mon Sep 17 00:00:00 2001
From: Dane Springmeyer <dane@mapbox.com>
Date: Fri, 15 May 2015 11:28:55 -0700
Subject: [PATCH] move sourcing of mapnik-settings.env to localize.sh

---
 localize.sh | 13 ++++++++++++-
 test/run    | 10 ----------
 2 files changed, 12 insertions(+), 11 deletions(-)

diff --git a/localize.sh b/localize.sh
index 628c1b2f8..5c2f75db3 100755
--- a/localize.sh
+++ b/localize.sh
@@ -5,4 +5,15 @@ if [ $(uname -s) = 'Darwin' ]; then
     export DYLD_LIBRARY_PATH="${CURRENT_DIR}/src/":${DYLD_LIBRARY_PATH}
 else
     export LD_LIBRARY_PATH="${CURRENT_DIR}/src/":${LD_LIBRARY_PATH}
-fi
\ No newline at end of file
+fi
+
+# mapnik-settings.env is an optional file to store
+# environment variables that should be used before
+# running tests like PROJ_LIB, GDAL_DATA, and ICU_DATA
+# These do not normally need to be set except when
+# building against binary versions of dependencies like
+# done via bootstrap.sh
+if [[ -f mapnik-settings.env ]]; then
+    echo "Inheriting from mapnik-settings.env"
+    source mapnik-settings.env
+fi
diff --git a/test/run b/test/run
index f0d4a8c47..47b8f5500 100755
--- a/test/run
+++ b/test/run
@@ -11,16 +11,6 @@ function run_substep { >&2 echo -e "\033[1m\033[36m* $1\033[0m"; }
 function run_success { >&2 echo -e "\033[1m\033[32m* $1\033[0m"; }
 
 run_step "Starting Mapnik tests"
-# mapnik-settings.env is an optional file to store
-# environment variables that should be used before
-# running tests like PROJ_LIB, GDAL_DATA, and ICU_DATA
-# These do not normally need to be set except when
-# building against binary versions of dependencies like
-# done via bootstrap.sh
-if [[ -f mapnik-settings.env ]]; then
-    run_substep "Inheriting from mapnik-settings.env"
-    source mapnik-settings.env
-fi
 
 run_substep "Running C++ Unit tests..."
 ./test/unit/run