Swiftdiff options
| author | Tobias Markmann <tm@ayena.de> | 2015-06-30 07:50:35 (GMT) |
|---|---|---|
| committer | Kevin Smith <kevin.smith@isode.com> | 2015-07-07 19:58:27 (GMT) |
| commit | f4b96b3e1d66f1a7f3e13f5d3e3b293509190db2 (patch) | |
| tree | a99c28033760dfbdbd5b6e592cca7ea56e42cd36 /BuildTools/SCons/Tools/Test.py | |
| parent | 799a7ac203dc2576872894dfdd1adb5cdbbacf7b (diff) | |
| download | swift-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/Tools/Test.py')
| -rw-r--r-- | BuildTools/SCons/Tools/Test.py | 2 |
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) : | |||
| 19 | 19 | ||
| 20 | # Set environment variables for running the test | 20 | # Set environment variables for running the test |
| 21 | test_env = env.Clone() | 21 | test_env = env.Clone() |
| 22 | for i in ["HOME", "USERPROFILE", "APPDATA"]: | 22 | for i in ["HOME", "USERPROFILE", "APPDATA", "ASAN_OPTIONS", "LSAN_OPTIONS", "SWIFT_NETWORK_TEST_IPV4", "SWIFT_NETWORK_TEST_IPV6"]: |
| 23 | if os.environ.get(i, "") : | 23 | if os.environ.get(i, "") : |
| 24 | test_env["ENV"][i] = os.environ[i] | 24 | test_env["ENV"][i] = os.environ[i] |
| 25 | if env["target"] == "android" : | 25 | if env["target"] == "android" : |