diff options
Diffstat (limited to 'test')
| -rw-r--r-- | test/backupstore/testbackupstore.cpp | 26 | ||||
| -rw-r--r-- | test/backupstorefix/testbackupstorefix.cpp | 5 | ||||
| -rw-r--r-- | test/bbackupd/testbbackupd.cpp | 4 |
3 files changed, 24 insertions, 11 deletions
diff --git a/test/backupstore/testbackupstore.cpp b/test/backupstore/testbackupstore.cpp index 4030e39f..64271f04 100644 --- a/test/backupstore/testbackupstore.cpp +++ b/test/backupstore/testbackupstore.cpp @@ -1778,9 +1778,12 @@ int test3(int argc, const char *argv[]) TEST_THAT(KillServer(pid)); ::sleep(1); TEST_THAT(!ServerIsAlive(pid)); -#ifndef WIN32 - TestRemoteProcessMemLeaks("bbstored.memleaks"); -#endif + + #ifdef WIN32 + TEST_THAT(unlink("testfiles/bbstored.pid") == 0); + #else + TestRemoteProcessMemLeaks("bbstored.memleaks"); + #endif // Set a new limit on the account -- leave the hard limit // high to make sure the target for freeing space is the @@ -1872,9 +1875,11 @@ int test3(int argc, const char *argv[]) ::sleep(1); TEST_THAT(!ServerIsAlive(pid)); -#ifndef WIN32 - TestRemoteProcessMemLeaks("bbstored.memleaks"); -#endif + #ifdef WIN32 + TEST_THAT(unlink("testfiles/bbstored.pid") == 0); + #else + TestRemoteProcessMemLeaks("bbstored.memleaks"); + #endif } return 0; @@ -1911,9 +1916,12 @@ int multi_server() TEST_THAT(KillServer(pid)); ::sleep(1); TEST_THAT(!ServerIsAlive(pid)); -#ifndef WIN32 - TestRemoteProcessMemLeaks("bbstored.memleaks"); -#endif + + #ifdef WIN32 + TEST_THAT(unlink("testfiles/bbstored.pid") == 0); + #else + TestRemoteProcessMemLeaks("bbstored.memleaks"); + #endif } diff --git a/test/backupstorefix/testbackupstorefix.cpp b/test/backupstorefix/testbackupstorefix.cpp index 34565bd5..3954d7ad 100644 --- a/test/backupstorefix/testbackupstorefix.cpp +++ b/test/backupstorefix/testbackupstorefix.cpp @@ -601,7 +601,10 @@ int test(int argc, const char *argv[]) // ------------------------------------------------------------------------------------------------ // Stop server TEST_THAT(KillServer(pid)); - #ifndef WIN32 + + #ifdef WIN32 + TEST_THAT(unlink("testfiles/bbstored.pid") == 0); + #else TestRemoteProcessMemLeaks("bbstored.memleaks"); #endif } diff --git a/test/bbackupd/testbbackupd.cpp b/test/bbackupd/testbbackupd.cpp index a0732c21..0e9e9b9d 100644 --- a/test/bbackupd/testbbackupd.cpp +++ b/test/bbackupd/testbbackupd.cpp @@ -461,7 +461,9 @@ int test_kill_bbstored() ::safe_sleep(1); TEST_THAT(!ServerIsAlive(bbstored_pid)); - #ifndef WIN32 + #ifdef WIN32 + TEST_THAT(unlink("testfiles/bbstored.pid") == 0); + #else TestRemoteProcessMemLeaks("bbstored.memleaks"); #endif |