X-Git-Url: https://git.m6w6.name/?a=blobdiff_plain;f=libtest%2Ftest.cc;h=ef10028c5800160dabb687448ec433b0bc0ba321;hb=560784bd3bc77b292761ef878dfb5f6205054946;hp=66d258a0b009094430793e268598203ee8a836b9;hpb=64e9fa38f42f0d30463da5ddc3a573619941d93a;p=m6w6%2Flibmemcached diff --git a/libtest/test.cc b/libtest/test.cc index 66d258a0..ef10028c 100644 --- a/libtest/test.cc +++ b/libtest/test.cc @@ -19,6 +19,7 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ +#include #include #include @@ -35,10 +36,6 @@ #include -#if defined(HAVE_CURL_CURL_H) && HAVE_CURL_CURL_H -#include -#endif - #ifndef __INTEL_COMPILER #pragma GCC diagnostic ignored "-Wold-style-cast" #endif @@ -74,33 +71,14 @@ static long int timedif(struct timeval a, struct timeval b) return s + us; } -static void cleanup_curl(void) -{ -#if defined(HAVE_CURL_CURL_H) && HAVE_CURL_CURL_H - curl_global_cleanup(); -#endif -} - #include #include int main(int argc, char *argv[]) { -#if defined(HAVE_CURL_CURL_H) && HAVE_CURL_CURL_H - if (curl_global_init(CURL_GLOBAL_ALL)) - { - Error << "curl_global_init(CURL_GLOBAL_ALL) failed"; - return EXIT_FAILURE; - } -#endif - - if (atexit(cleanup_curl)) - { - Error << "atexit() failed"; - return EXIT_FAILURE; - } - - bool opt_repeat= false; + bool opt_massive= false; + unsigned long int opt_repeat= 1; // Run all tests once + bool opt_quiet= false; std::string collection_to_run; // Options parsing @@ -108,14 +86,19 @@ int main(int argc, char *argv[]) enum long_option_t { OPT_LIBYATL_VERSION, OPT_LIBYATL_MATCH_COLLECTION, + OPT_LIBYATL_MASSIVE, + OPT_LIBYATL_QUIET, OPT_LIBYATL_REPEAT }; static struct option long_options[]= { - {"repeat", no_argument, NULL, OPT_LIBYATL_REPEAT}, - {"collection", required_argument, NULL, OPT_LIBYATL_MATCH_COLLECTION}, - {0, 0, 0, 0} + { "version", no_argument, NULL, OPT_LIBYATL_VERSION }, + { "quiet", no_argument, NULL, OPT_LIBYATL_QUIET }, + { "repeat", no_argument, NULL, OPT_LIBYATL_REPEAT }, + { "collection", required_argument, NULL, OPT_LIBYATL_MATCH_COLLECTION }, + { "massive", no_argument, NULL, OPT_LIBYATL_MASSIVE }, + { 0, 0, 0, 0 } }; int option_index= 0; @@ -132,14 +115,22 @@ int main(int argc, char *argv[]) case OPT_LIBYATL_VERSION: break; + case OPT_LIBYATL_QUIET: + opt_quiet= true; + break; + case OPT_LIBYATL_REPEAT: - opt_repeat= true; + opt_repeat= strtoul(optarg, (char **) NULL, 10); break; case OPT_LIBYATL_MATCH_COLLECTION: collection_to_run= optarg; break; + case OPT_LIBYATL_MASSIVE: + opt_massive= true; + break; + case '?': /* getopt_long already printed an error message. */ Error << "unknown option to getopt_long()"; @@ -153,11 +144,26 @@ int main(int argc, char *argv[]) srandom((unsigned int)time(NULL)); - if (getenv("LIBTEST_QUIET") and strcmp(getenv("LIBTEST_QUIET"), "0") == 0) + if (bool(getenv("YATL_REPEAT")) and (strtoul(getenv("YATL_REPEAT"), (char **) NULL, 10) > 1)) { - close(STDOUT_FILENO); + opt_repeat= strtoul(getenv("YATL_REPEAT"), (char **) NULL, 10); + } + + if ((bool(getenv("YATL_QUIET")) and (strcmp(getenv("YATL_QUIET"), "0") == 0)) or opt_quiet) + { + opt_quiet= true; } else if (getenv("JENKINS_URL")) + { + if (bool(getenv("YATL_QUIET")) and (strcmp(getenv("YATL_QUIET"), "1") == 0)) + { } + else + { + opt_quiet= true; + } + } + + if (opt_quiet) { close(STDOUT_FILENO); } @@ -192,18 +198,12 @@ int main(int argc, char *argv[]) try { do { exit_code= EXIT_SUCCESS; - Framework *world= new Framework(); - - if (world == NULL) - { - Error << "Failed to create Framework()"; - return EXIT_FAILURE; - } + Framework world; - assert(sigignore(SIGPIPE) == 0); + fatal_assert(sigignore(SIGPIPE) == 0); libtest::SignalThread signal; - if (not signal.setup()) + if (signal.setup() == false) { Error << "Failed to setup signals"; return EXIT_FAILURE; @@ -211,10 +211,10 @@ int main(int argc, char *argv[]) Stats stats; - get_world(world); + get_world(&world); test_return_t error; - void *creators_ptr= world->create(error); + void *creators_ptr= world.create(error); switch (error) { @@ -223,22 +223,25 @@ int main(int argc, char *argv[]) case TEST_SKIPPED: Out << "SKIP " << argv[0]; - delete world; return EXIT_SUCCESS; case TEST_FAILURE: - delete world; return EXIT_FAILURE; } - if (getenv("TEST_COLLECTION")) + if (getenv("YATL_COLLECTION_TO_RUN")) { - if (strlen(getenv("TEST_COLLECTION"))) + if (strlen(getenv("YATL_COLLECTION_TO_RUN"))) { - collection_to_run= getenv("TEST_COLLECTION"); + collection_to_run= getenv("YATL_COLLECTION_TO_RUN"); } } + if (collection_to_run.compare("none") == 0) + { + return EXIT_SUCCESS; + } + if (collection_to_run.empty() == false) { Out << "Only testing " << collection_to_run; @@ -250,7 +253,7 @@ int main(int argc, char *argv[]) wildcard= argv[2]; } - for (collection_st *next= world->collections; next and next->name and (not signal.is_shutdown()); next++) + for (collection_st *next= world.collections; next and next->name and (not signal.is_shutdown()); next++) { bool failed= false; bool skipped= false; @@ -262,11 +265,11 @@ int main(int argc, char *argv[]) stats.collection_total++; - test_return_t collection_rc= world->startup(creators_ptr); + test_return_t collection_rc= world.startup(creators_ptr); if (collection_rc == TEST_SUCCESS and next->pre) { - collection_rc= world->runner()->pre(next->pre, creators_ptr); + collection_rc= world.runner()->pre(next->pre, creators_ptr); } switch (collection_rc) @@ -286,7 +289,7 @@ int main(int argc, char *argv[]) goto cleanup; default: - throw fatal_message("invalid return code"); + fatal_message("invalid return code"); } Out << "Collection: " << next->name; @@ -303,20 +306,20 @@ int main(int argc, char *argv[]) test_return_t return_code; try { - if (test_success(return_code= world->item.startup(creators_ptr))) + if (test_success(return_code= world.item.startup(creators_ptr))) { - if (test_success(return_code= world->item.flush(creators_ptr, run))) + if (test_success(return_code= world.item.flush(creators_ptr, run))) { // @note pre will fail is SKIPPED is returned - if (test_success(return_code= world->item.pre(creators_ptr))) + if (test_success(return_code= world.item.pre(creators_ptr))) { { // Runner Code gettimeofday(&start_time, NULL); - assert(world->runner()); + assert(world.runner()); assert(run->test_fn); try { - return_code= world->runner()->run(run->test_fn, creators_ptr); + return_code= world.runner()->run(run->test_fn, creators_ptr); } // Special case where check for the testing of the exception // system. @@ -339,7 +342,7 @@ int main(int argc, char *argv[]) } // @todo do something if post fails - (void)world->item.post(creators_ptr); + (void)world.item.post(creators_ptr); } else if (return_code == TEST_SKIPPED) { } @@ -358,6 +361,11 @@ int main(int argc, char *argv[]) } } + catch (libtest::fatal &e) + { + Error << "Fatal exception was thrown: " << e.what(); + return_code= TEST_FAILURE; + } catch (std::exception &e) { Error << "Exception was thrown: " << e.what(); @@ -391,10 +399,10 @@ int main(int argc, char *argv[]) break; default: - throw fatal_message("invalid return code"); + fatal_message("invalid return code"); } - if (test_failed(world->on_error(return_code, creators_ptr))) + if (test_failed(world.on_error(return_code, creators_ptr))) { Error << "Failed while running on_error()"; signal.set_shutdown(SHUTDOWN_GRACEFUL); @@ -402,7 +410,7 @@ int main(int argc, char *argv[]) } } - (void) world->runner()->post(next->post, creators_ptr); + (void) world.runner()->post(next->post, creators_ptr); cleanup: if (failed == false and skipped == false) @@ -420,7 +428,7 @@ cleanup: stats.collection_skipped++; } - world->shutdown(creators_ptr); + world.shutdown(creators_ptr); Outn(); } @@ -451,22 +459,20 @@ cleanup: stats_print(&stats); - delete world; - Outn(); // Generate a blank to break up the messages if make check/test has been run - } while (exit_code == EXIT_SUCCESS and opt_repeat); + } while (exit_code == EXIT_SUCCESS and --opt_repeat); } catch (libtest::fatal& e) { std::cerr << e.what() << std::endl; } - catch (std::bad_alloc& e) + catch (std::exception& e) { std::cerr << e.what() << std::endl; } catch (...) { - std::cerr << "Unknown exception halted execution" << std::endl; + std::cerr << "Unknown exception halted execution." << std::endl; } return exit_code;