From 45943bd58e0d11eab967b3a15289c88121f33cf3 Mon Sep 17 00:00:00 2001 From: Chris Wilson Date: Thu, 24 Dec 2015 23:22:17 +0000 Subject: Replace shell implementation of test/bbackupd kill_running_daemons() with pure C++. Allows it to work with Visual Studio and no Cygwin/MSYS shell. --- test/bbackupd/testbbackupd.cpp | 20 +++++++++++++------- 1 file changed, 13 insertions(+), 7 deletions(-) (limited to 'test') diff --git a/test/bbackupd/testbbackupd.cpp b/test/bbackupd/testbbackupd.cpp index 4302fb69..759b3987 100644 --- a/test/bbackupd/testbbackupd.cpp +++ b/test/bbackupd/testbbackupd.cpp @@ -412,13 +412,19 @@ bool configure_bbackupd(BackupDaemon& bbackupd, const std::string& config_file) bool kill_running_daemons() { - TEST_THAT_OR(::system("test ! -r testfiles/bbstored.pid || " - "kill `cat testfiles/bbstored.pid`") == 0, FAIL); - TEST_THAT_OR(::system("test ! -r testfiles/bbackupd.pid || " - "kill `cat testfiles/bbackupd.pid`") == 0, FAIL); - TEST_THAT_OR(::system("rm -f testfiles/bbackupd.pid " - "testfiles/bbstored.pid") == 0, FAIL); - return true; + bool success = true; + + if(FileExists("testfiles/bbstored.pid")) + { + TEST_THAT_OR(KillServer("testfiles/bbstored.pid", true), success = false); + } + + if(FileExists("testfiles/bbackupd.pid")) + { + TEST_THAT_OR(KillServer("testfiles/bbackupd.pid", true), success = false); + } + + return success; } bool setup_test_bbackupd(BackupDaemon& bbackupd, bool do_unpack_files = true, -- cgit v1.2.3