From 533202637476e2386621fe3de3c6644cc63f033f Mon Sep 17 00:00:00 2001 From: Chris Wilson Date: Thu, 6 Aug 2015 21:25:31 +0000 Subject: Really fix check for s3simulator memleaks. --- test/httpserver/testhttpserver.cpp | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) (limited to 'test/httpserver') diff --git a/test/httpserver/testhttpserver.cpp b/test/httpserver/testhttpserver.cpp index 0369cd13..968870d0 100644 --- a/test/httpserver/testhttpserver.cpp +++ b/test/httpserver/testhttpserver.cpp @@ -143,6 +143,8 @@ int test(int argc, const char *argv[]) S3Simulator server; return server.Main("doesnotexist", argc - 1, argv + 1); } + + TEST_THAT(system("rm -rf *.memleaks") == 0); // Start the server int pid = LaunchServer("./_test server testfiles/httpserver.conf", "testfiles/httpserver.pid"); @@ -244,7 +246,7 @@ int test(int argc, const char *argv[]) #ifdef WIN32 TEST_THAT(unlink("testfiles/httpserver.pid") == 0); #else - TestRemoteProcessMemLeaks("s3simulator.memleaks"); + TestRemoteProcessMemLeaks("generic-httpserver.memleaks"); #endif // correct, official signature should succeed, with lower-case header @@ -472,7 +474,7 @@ int test(int argc, const char *argv[]) #ifdef WIN32 TEST_THAT(unlink("testfiles/s3simulator.pid") == 0); #else - TestRemoteProcessMemLeaks("generic-httpserver.memleaks"); + TestRemoteProcessMemLeaks("s3simulator.memleaks"); #endif return 0; -- cgit v1.2.3