Swiftdiff options
| -rw-r--r-- | Swiften/QA/ClientTest/ClientTest.cpp | 2 | ||||
| -rw-r--r-- | Swiften/QA/ClientTest/SConscript | 4 | ||||
| -rw-r--r-- | Swiften/QA/SConscript | 2 |
3 files changed, 5 insertions, 3 deletions
diff --git a/Swiften/QA/ClientTest/ClientTest.cpp b/Swiften/QA/ClientTest/ClientTest.cpp index 872d6f2..7b2c7f4 100644 --- a/Swiften/QA/ClientTest/ClientTest.cpp +++ b/Swiften/QA/ClientTest/ClientTest.cpp @@ -38,7 +38,7 @@ void handleRosterReceived(boost::shared_ptr<Payload>) { } void handleConnected() { - boost::shared_ptr<GetRosterRequest> rosterRequest(new GetRosterRequest(client)); + GetRosterRequest::ref rosterRequest = GetRosterRequest::create(client->getIQRouter()); rosterRequest->onResponse.connect(boost::bind(&handleRosterReceived, _1)); rosterRequest->send(); } diff --git a/Swiften/QA/ClientTest/SConscript b/Swiften/QA/ClientTest/SConscript index f0c73ff..e85d8c8 100644 --- a/Swiften/QA/ClientTest/SConscript +++ b/Swiften/QA/ClientTest/SConscript @@ -16,7 +16,9 @@ if env["TEST"] : myenv.MergeFlags(myenv["PLATFORM_FLAGS"]) for i in ["SWIFT_CLIENTTEST_JID", "SWIFT_CLIENTTEST_PASS"]: - if os.environ.get(i, "") : + if ARGUMENTS.get(i.lower(), False) : + myenv["ENV"][i] = ARGUMENTS[i.lower()] + elif os.environ.get(i, "") : myenv["ENV"][i] = os.environ[i] tester = myenv.Program("ClientTest", ["ClientTest.cpp"]) diff --git a/Swiften/QA/SConscript b/Swiften/QA/SConscript index 4a049e4..8fb7c24 100644 --- a/Swiften/QA/SConscript +++ b/Swiften/QA/SConscript @@ -1,7 +1,7 @@ SConscript(dirs = [ "NetworkTest", # "ReconnectTest", -# "ClientTest", + "ClientTest", # "DNSSDTest", "StorageTest", ]) |