diff options
Diffstat (limited to 'vespalog/src/test/bufferedlogtest.cpp')
-rw-r--r-- | vespalog/src/test/bufferedlogtest.cpp | 21 |
1 files changed, 11 insertions, 10 deletions
diff --git a/vespalog/src/test/bufferedlogtest.cpp b/vespalog/src/test/bufferedlogtest.cpp index 09e103986ac..4035e98653f 100644 --- a/vespalog/src/test/bufferedlogtest.cpp +++ b/vespalog/src/test/bufferedlogtest.cpp @@ -8,6 +8,7 @@ #include <fstream> #include <iostream> #include <unistd.h> +#include <cstdlib> LOG_SETUP("bufferedlogtest"); @@ -98,7 +99,7 @@ void testThatEntriesWithHighCountIsKept(const std::string& file, uint64_t& timer [[maybe_unused]] int systemResult = system(("diff -u " + file + " bufferedlogtest.highcountkept.log") .c_str()); - exit(EXIT_FAILURE); + std::_Exit(EXIT_FAILURE); } unlink(file.c_str()); } @@ -134,7 +135,7 @@ void testThatEntriesWithHighCountsAreEventuallyRemoved( [[maybe_unused]] int systemResult = system(("diff -u " + file + " bufferedlogtest.highcountexpire.log") .c_str()); - exit(EXIT_FAILURE); + std::_Exit(EXIT_FAILURE); } unlink(file.c_str()); } @@ -168,7 +169,7 @@ void testThatEntriesExpire( << "testThatEntriesExpire\n"; [[maybe_unused]] int systemResult = system(("diff -u " + file + " bufferedlogtest.expire.log").c_str()); - exit(EXIT_FAILURE); + std::_Exit(EXIT_FAILURE); } unlink(file.c_str()); } @@ -237,7 +238,7 @@ void testThatHighCountEntriesDontStarveOthers( << "testThatHighCountEntriesDontStarveOthers\n"; [[maybe_unused]] int systemResult = system(("diff -u " + file + " bufferedlogtest.nostarve.log").c_str()); - exit(EXIT_FAILURE); + std::_Exit(EXIT_FAILURE); } unlink(file.c_str()); } @@ -270,7 +271,7 @@ void testNoTokenMatchAcrossComponents(const std::string& file, [[maybe_unused]] int systemResult = system(("diff -u " + file + " bufferedlogtest.tokenacrossloggers.log").c_str()); - exit(EXIT_FAILURE); + std::_Exit(EXIT_FAILURE); } unlink(file.c_str()); } @@ -299,7 +300,7 @@ void testLogLocationAsToken(const std::string& file, uint64_t& timer) [[maybe_unused]] int systemResult = system(("diff -u " + file + " bufferedlogtest.locationastoken.log").c_str()); - exit(EXIT_FAILURE); + std::_Exit(EXIT_FAILURE); } unlink(file.c_str()); } @@ -328,7 +329,7 @@ void testLogMessageAsToken(const std::string& file, uint64_t& timer) [[maybe_unused]] int systemResult = system(("diff -u " + file + " bufferedlogtest.messageastoken.log").c_str()); - exit(EXIT_FAILURE); + std::_Exit(EXIT_FAILURE); } unlink(file.c_str()); } @@ -363,7 +364,7 @@ void testNonBufferedLoggerTriggersBufferedLogTrim(const std::string& file, [[maybe_unused]] int systemResult = system(("diff -u " + file + " bufferedlogtest.trimcache.log").c_str()); - exit(EXIT_FAILURE); + std::_Exit(EXIT_FAILURE); } unlink(file.c_str()); @@ -380,7 +381,7 @@ main(int argc, char **argv) { if (argc != 2) { std::cerr << "bufferedlogtest must be called with one argument\n"; - exit(EXIT_FAILURE); + return EXIT_FAILURE; } ns_log::Logger::fakePid = true; ns_log::BufferedLogger::logger.setMaxCacheSize(10); @@ -405,5 +406,5 @@ main(int argc, char **argv) reset(timer); testNonBufferedLoggerTriggersBufferedLogTrim(argv[1], timer); - exit(EXIT_SUCCESS); + return EXIT_SUCCESS; } |