summaryrefslogtreecommitdiff
path: root/test/backupstore
diff options
context:
space:
mode:
authorChris Wilson <chris+github@qwirx.com>2012-11-18 16:34:10 +0000
committerChris Wilson <chris+github@qwirx.com>2012-11-18 16:34:10 +0000
commit0d4c4ace97095fd37ea11ac289d02012f6e5f820 (patch)
treeb8aae4f48d5be7291c0b168e1ef27e706c3672cd /test/backupstore
parentf1e2b1a897e26123359e60aec40ef41cd8788ebf (diff)
Fix testbackupstore: don't keep using a reference to a protocol object
that's been disposed (Windows only).
Diffstat (limited to 'test/backupstore')
-rw-r--r--test/backupstore/testbackupstore.cpp3
1 files changed, 2 insertions, 1 deletions
diff --git a/test/backupstore/testbackupstore.cpp b/test/backupstore/testbackupstore.cpp
index 19fbc35f..661973e0 100644
--- a/test/backupstore/testbackupstore.cpp
+++ b/test/backupstore/testbackupstore.cpp
@@ -1040,7 +1040,7 @@ int test_server(const char *hostname)
TEST_THAT(loginConf->GetClientStoreMarker() == 0x8732523ab23aLL);
}
#else // WIN32
- BackupProtocolClient& protocolReadOnly(*apProtocol);
+ #define protocolReadOnly (*apProtocol)
#endif
test_server_1(*apProtocol, protocolReadOnly);
@@ -2490,6 +2490,7 @@ int test_read_old_backupstoreinfo_files()
*apInfo, "spurtle", false /* AccountEnabled */, extra_data);
// Delete the account to leave the store in the same state as before
+ apInfo.reset();
TEST_THAT_ABORTONFAIL(::system(BBSTOREACCOUNTS
" -c testfiles/bbstored.conf delete 01234567 yes") == 0);
TestRemoteProcessMemLeaks("bbstoreaccounts.memleaks");