Swiftdiff options
Diffstat (limited to 'Swiften/QA')
| -rw-r--r-- | Swiften/QA/ClientTest/SConscript | 4 | ||||
| -rw-r--r-- | Swiften/QA/SConscript | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/Swiften/QA/ClientTest/SConscript b/Swiften/QA/ClientTest/SConscript index 31c4011..15a68c6 100644 --- a/Swiften/QA/ClientTest/SConscript +++ b/Swiften/QA/ClientTest/SConscript @@ -4,8 +4,8 @@ Import("env") if env["TEST"] : myenv = env.Clone() - myenv.MergeFlags(myenv["SWIFTEN_FLAGS"]) - myenv.MergeFlags(myenv["SWIFTEN_DEP_FLAGS"]) + myenv.UseFlags(myenv["SWIFTEN_FLAGS"]) + myenv.UseFlags(myenv["SWIFTEN_DEP_FLAGS"]) for i in ["SWIFT_CLIENTTEST_JID", "SWIFT_CLIENTTEST_PASS"]: if ARGUMENTS.get(i.lower(), False) : diff --git a/Swiften/QA/SConscript b/Swiften/QA/SConscript index b885909..4638d6c 100644 --- a/Swiften/QA/SConscript +++ b/Swiften/QA/SConscript @@ -7,4 +7,4 @@ SConscript(dirs = [ # "DNSSDTest", "StorageTest", "TLSTest", - ])
\ No newline at end of file + ]) |