summaryrefslogtreecommitdiff
path: root/test/httpserver/testhttpserver.cpp
diff options
context:
space:
mode:
authorChris Wilson <chris+github@qwirx.com>2015-08-06 21:25:31 +0000
committerChris Wilson <chris+github@qwirx.com>2015-08-06 21:25:31 +0000
commit533202637476e2386621fe3de3c6644cc63f033f (patch)
tree8cc49d960b3bfc00f4a3b15b53fedb7dfc9ffa90 /test/httpserver/testhttpserver.cpp
parentf580744a3752f498befebea05f599c30cf897eae (diff)
Really fix check for s3simulator memleaks.
Diffstat (limited to 'test/httpserver/testhttpserver.cpp')
-rw-r--r--test/httpserver/testhttpserver.cpp6
1 files changed, 4 insertions, 2 deletions
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;