summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTobias Markmann <tm@ayena.de>2015-06-30 07:50:35 (GMT)
committerKevin Smith <kevin.smith@isode.com>2015-07-07 19:58:27 (GMT)
commitf4b96b3e1d66f1a7f3e13f5d3e3b293509190db2 (patch)
treea99c28033760dfbdbd5b6e592cca7ea56e42cd36 /BuildTools/SCons
parent799a7ac203dc2576872894dfdd1adb5cdbbacf7b (diff)
downloadswift-f4b96b3e1d66f1a7f3e13f5d3e3b293509190db2.zip
swift-f4b96b3e1d66f1a7f3e13f5d3e3b293509190db2.tar.bz2
Use environment variables for addresses used in NetworkTest
Introducing SWIFT_NETWORK_TEST_IPV4 and SWIFT_NETWORK_TEST_IPV6 for the host addresses used in BoostConnectionTest.cpp. Passing these variables and ASAN/LSAN_OPTIONS for memory leak detection when calling the test from SCons. Test-Information: Tested on Elementary OS with correct available hosts and unavailable hosts. In both cases the behavior is the same as before. Change-Id: I24128c766642c5a2ee273f7c11624525ae33e270
Diffstat (limited to 'BuildTools/SCons')
-rw-r--r--BuildTools/SCons/Tools/Test.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/BuildTools/SCons/Tools/Test.py b/BuildTools/SCons/Tools/Test.py
index 7e4609d..1eee4f6 100644
--- a/BuildTools/SCons/Tools/Test.py
+++ b/BuildTools/SCons/Tools/Test.py
@@ -19,7 +19,7 @@ def generate(env) :
# Set environment variables for running the test
test_env = env.Clone()
- for i in ["HOME", "USERPROFILE", "APPDATA"]:
+ for i in ["HOME", "USERPROFILE", "APPDATA", "ASAN_OPTIONS", "LSAN_OPTIONS", "SWIFT_NETWORK_TEST_IPV4", "SWIFT_NETWORK_TEST_IPV6"]:
if os.environ.get(i, "") :
test_env["ENV"][i] = os.environ[i]
if env["target"] == "android" :