[Box Backup-dev] COMMIT r672 - box/chris/general/test/backupstorefix
boxbackup-dev at fluffy.co.uk
boxbackup-dev at fluffy.co.uk
Sun Jul 23 00:25:28 BST 2006
Author: chris
Date: 2006-07-22 23:25:22 +0000 (Sat, 22 Jul 2006)
New Revision: 672
Modified:
box/chris/general/test/backupstorefix/testbackupstorefix.cpp
Log:
* testbackupstorefix.cpp
- Stop the server using terminate_bbackupd() rather than killing it,
since killing can interrupt the SSL connection and thus kill bbstored
as well (Win32 only)
Modified: box/chris/general/test/backupstorefix/testbackupstorefix.cpp
===================================================================
--- box/chris/general/test/backupstorefix/testbackupstorefix.cpp 2006-07-22 23:23:59 UTC (rev 671)
+++ box/chris/general/test/backupstorefix/testbackupstorefix.cpp 2006-07-22 23:25:22 UTC (rev 672)
@@ -333,18 +333,19 @@
wait_for_operation(14);
// That'll do nicely, stop the server
+ #ifdef WIN32
+ terminate_bbackupd(bbackupd_pid);
+ // implicit check for memory leaks
+ #else
TEST_THAT(KillServer(bbackupd_pid));
-#ifndef WIN32
TestRemoteProcessMemLeaks("bbackupd.memleaks");
-#endif
+ #endif
}
// Generate a list of all the object IDs
-#ifdef WIN32
- TEST_THAT_ABORTONFAIL(::system("..\\..\\bin\\bbackupquery\\bbackupquery -q -c testfiles/bbackupd.conf \"list -r\" quit > testfiles/initial-listing.txt") == 0);
-#else
- TEST_THAT_ABORTONFAIL(::system("../../bin/bbackupquery/bbackupquery -q -c testfiles/bbackupd.conf \"list -r\" quit > testfiles/initial-listing.txt") == 0);
-#endif
+ TEST_THAT_ABORTONFAIL(::system(BBACKUPQUERY " -q "
+ "-c testfiles/bbackupd.conf \"list -r\" quit "
+ "> testfiles/initial-listing.txt") == 0);
// And load it in
{
More information about the Boxbackup-dev
mailing list