Swiftdiff options
| author | Tobias Markmann <tm@ayena.de> | 2017-04-10 14:37:00 (GMT) |
|---|---|---|
| committer | Tobias Markmann <tm@ayena.de> | 2017-04-10 15:07:30 (GMT) |
| commit | 3e9f6f98ae3d042ade8419a0c07a559abe7bd1fc (patch) | |
| tree | 4f5a55469e751606fad1093a6fb2efdb1bc47e40 | |
| parent | de89a73ff9c7575323cb61e358e8e3c8274214e4 (diff) | |
| download | swift-3e9f6f98ae3d042ade8419a0c07a559abe7bd1fc.zip swift-3e9f6f98ae3d042ade8419a0c07a559abe7bd1fc.tar.bz2 | |
Only add existing environment variables to QtUI test env
Furthermore extended the list of potential environment
variables based on what the qt4.py tool creates.
Fix for commit ed2226782ac15345aeb8e615b41d30e5aab67b51.
Test-Information:
Tested on Windows 8 with VS2013 with Qt 5.4.2 and on
macOS 10.12.4 with Qt 5.5.1.
Change-Id: Ib52084ca0e1505fe943c33fa74f479e360d834fe
| -rw-r--r-- | BuildTools/SCons/Tools/Test.py | 2 | ||||
| -rw-r--r-- | Swift/QtUI/SConscript | 9 |
2 files changed, 5 insertions, 6 deletions
diff --git a/BuildTools/SCons/Tools/Test.py b/BuildTools/SCons/Tools/Test.py index e609a04..ebf9dc6 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", "ASAN_OPTIONS", "LSAN_OPTIONS", "SWIFT_NETWORK_TEST_IPV4", "SWIFT_NETWORK_TEST_IPV6"]: + for i in ["HOME", "PATH", "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" : diff --git a/Swift/QtUI/SConscript b/Swift/QtUI/SConscript index 3ce2057..ff97b42 100644 --- a/Swift/QtUI/SConscript +++ b/Swift/QtUI/SConscript @@ -76,11 +76,10 @@ myenv.EnableQt4Modules(qt4modules, debug = False, version = qt_version) testQtEnv = env.Clone(); testQtEnv.Tool("qt4", toolpath = ["#/BuildTools/SCons/Tools"]) testQtEnv.EnableQt4Modules(qt4modules, debug = False, version = qt_version) -env["SWIFT_QTUI_TEST_FLAGS"] = { - "CPPFLAGS": testQtEnv["CPPFLAGS"], - "LIBS": testQtEnv["LIBS"], - "LINKFLAGS": testQtEnv["LINKFLAGS"], -} +env["SWIFT_QTUI_TEST_FLAGS"] = {} +for key in ["CCFLAGS", "CPPFLAGS", "CPPPATH", "CPPDEFINES", "LIBS", "LINKFLAGS", "LIBPATH"] : + if key in testQtEnv: + env["SWIFT_QTUI_TEST_FLAGS"][key] = testQtEnv[key] env.Append(UNITTEST_SOURCES = [ File("UnitTest/QtUtilitiesTest.cpp") |