From b513d6a07b52fc2666d101248428d5e5a2919ab2 Mon Sep 17 00:00:00 2001 From: artemp Date: Mon, 4 Jan 2016 14:24:25 +0000 Subject: [PATCH] don't export DYLD_LIBRARY_PATH multiple times --- test/unit/datasource/csv.cpp | 2 +- test/unit/datasource/geojson.cpp | 2 +- test/unit/datasource/postgis.cpp | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/test/unit/datasource/csv.cpp b/test/unit/datasource/csv.cpp index 72e87193c..7db9bd1f1 100644 --- a/test/unit/datasource/csv.cpp +++ b/test/unit/datasource/csv.cpp @@ -80,7 +80,7 @@ int create_disk_index(std::string const& filename, bool silent = true) std::string cmd; if (std::getenv("DYLD_LIBRARY_PATH") != nullptr) { - cmd += std::string("export DYLD_LIBRARY_PATH=") + std::getenv("DYLD_LIBRARY_PATH") + " && "; + cmd += std::string("DYLD_LIBRARY_PATH=") + std::getenv("DYLD_LIBRARY_PATH") + " "; } cmd += "mapnik-index " + filename; if (silent) diff --git a/test/unit/datasource/geojson.cpp b/test/unit/datasource/geojson.cpp index d27347c6b..7b8c1038c 100644 --- a/test/unit/datasource/geojson.cpp +++ b/test/unit/datasource/geojson.cpp @@ -66,7 +66,7 @@ int create_disk_index(std::string const& filename, bool silent = true) std::string cmd; if (std::getenv("DYLD_LIBRARY_PATH") != nullptr) { - cmd += std::string("export DYLD_LIBRARY_PATH=") + std::getenv("DYLD_LIBRARY_PATH") + " && "; + cmd += std::string("DYLD_LIBRARY_PATH=") + std::getenv("DYLD_LIBRARY_PATH") + " "; } cmd += "mapnik-index " + filename; if (silent) diff --git a/test/unit/datasource/postgis.cpp b/test/unit/datasource/postgis.cpp index 4aaa76fe1..f814dd2f4 100644 --- a/test/unit/datasource/postgis.cpp +++ b/test/unit/datasource/postgis.cpp @@ -43,7 +43,7 @@ int run(std::string const& command, bool silent = false) std::string cmd; if (std::getenv("DYLD_LIBRARY_PATH") != nullptr) { - cmd += std::string("export DYLD_LIBRARY_PATH=") + std::getenv("DYLD_LIBRARY_PATH") + " && "; + cmd += std::string("DYLD_LIBRARY_PATH=") + std::getenv("DYLD_LIBRARY_PATH") + " "; } cmd += command; if (silent) @@ -91,4 +91,4 @@ TEST_CASE("postgis") { } -} \ No newline at end of file +}