X-Git-Url: https://git.m6w6.name/?a=blobdiff_plain;f=libtest%2Ftest.cc;h=d87f1b17733b95e78ae70b0b046a32e0d065971c;hb=61bb2c3a16c0c9723bbb6492283e349a8ccdf11f;hp=ee743983fffa7f73e3422c698212efa495afc816;hpb=ecc7382f48857cb22e74ffa9496f9a31e956bde3;p=m6w6%2Flibmemcached diff --git a/libtest/test.cc b/libtest/test.cc index ee743983..d87f1b17 100644 --- a/libtest/test.cc +++ b/libtest/test.cc @@ -21,6 +21,9 @@ #include #include #include +#include + +#include #include @@ -29,6 +32,7 @@ #endif static in_port_t global_port= 0; +static char global_socket[1024]; in_port_t default_port() { @@ -41,6 +45,22 @@ void set_default_port(in_port_t port) global_port= port; } +const char *default_socket() +{ + assert(global_socket[0]); + return global_socket; +} + +bool test_is_local() +{ + return (getenv("LIBTEST_LOCAL")); +} + +void set_default_socket(const char *socket) +{ + strncpy(global_socket, socket, strlen(socket)); +} + static void stats_print(Stats *stats) { std::cout << "\tTotal Collections\t\t\t\t" << stats->collection_total << std::endl; @@ -104,59 +124,91 @@ void create_core(void) } } +enum shutdown_t { + SHUTDOWN_RUNNING, + SHUTDOWN_GRACEFUL, + SHUTDOWN_FORCED +}; -static test_return_t _runner_default(test_callback_fn func, void *p) -{ - if (func) +static Framework *world= NULL; +static volatile shutdown_t __shutdown= SHUTDOWN_RUNNING; + +static void *sig_thread(void *arg) +{ + sigset_t *set= (sigset_t *) arg; + + for (;__shutdown == SHUTDOWN_RUNNING;) { - return func(p); + int sig; + int error; + while ((error= sigwait(set, &sig)) == EINTR) ; + + switch (sig) + { + case SIGSEGV: + case SIGINT: + case SIGABRT: + std::cerr << std::endl << "Signal handling thread got signal " << strsignal(sig) << std::endl; + __shutdown= SHUTDOWN_FORCED; + break; + + default: + std::cerr << std::endl << "Signal handling thread got unexpected signal " << strsignal(sig) << std::endl; + case SIGUSR1: + break; + } } - return TEST_SUCCESS; + return NULL; } -static Runner defualt_runners= { - _runner_default, - _runner_default, - _runner_default -}; -static test_return_t _default_callback(void *p) +static void setup_signals(pthread_t& thread) { - (void)p; + sigset_t set; - return TEST_SUCCESS; -} + sigemptyset(&set); + sigaddset(&set, SIGSEGV); + sigaddset(&set, SIGABRT); + sigaddset(&set, SIGINT); + sigaddset(&set, SIGUSR1); -Framework::Framework() : - collections(NULL), - _create(NULL), - _destroy(NULL), - collection_startup(_default_callback), - collection_shutdown(_default_callback), - _on_error(NULL), - runner(&defualt_runners) -{ + int error; + if ((error= pthread_sigmask(SIG_BLOCK, &set, NULL)) != 0) + { + std::cerr << __FILE__ << ":" << __LINE__ << " died during pthread_sigmask(" << strerror(error) << ")" << std::endl; + exit(EXIT_FAILURE); + } + + if ((error= pthread_create(&thread, NULL, &sig_thread, (void *) &set)) != 0) + { + std::cerr << __FILE__ << ":" << __LINE__ << " died during pthread_create(" << strerror(error) << ")" << std::endl; + exit(EXIT_FAILURE); + } } int main(int argc, char *argv[]) { - Framework world; - - Stats stats; - - get_world(&world); + world= new Framework(); - if (not world.runner) + if (not world) { - world.runner= &defualt_runners; + return EXIT_FAILURE; } + pthread_t thread; + setup_signals(thread); + + Stats stats; + + get_world(world); + test_return_t error; - void *world_ptr= world.create(&error); + void *creators_ptr= world->create(error); if (test_failed(error)) { + std::cerr << "create() failed" << std::endl; return EXIT_FAILURE; } @@ -181,7 +233,7 @@ int main(int argc, char *argv[]) wildcard= argv[2]; } - for (collection_st *next= world.collections; next->name; next++) + for (collection_st *next= world->collections; next->name and __shutdown == SHUTDOWN_RUNNING; next++) { test_return_t collection_rc= TEST_SUCCESS; bool failed= false; @@ -192,11 +244,11 @@ int main(int argc, char *argv[]) stats.collection_total++; - collection_rc= world.startup(world_ptr); + collection_rc= world->startup(creators_ptr); if (collection_rc == TEST_SUCCESS and next->pre) { - collection_rc= world.runner->pre(next->pre, world_ptr); + collection_rc= world->runner->pre(next->pre, creators_ptr); } switch (collection_rc) @@ -232,21 +284,34 @@ int main(int argc, char *argv[]) std::cerr << "\tTesting " << run->name; - world.item.startup(world_ptr); - - world.item.flush(world_ptr, run); - - world.item.pre(world_ptr); - test_return_t return_code; - { // Runner Code - gettimeofday(&start_time, NULL); - return_code= world.runner->run(run->test_fn, world_ptr); - gettimeofday(&end_time, NULL); - load_time= timedif(end_time, start_time); + if (test_success(return_code= world->item.startup(creators_ptr))) + { + 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))) + { + { // Runner Code + gettimeofday(&start_time, NULL); + return_code= world->runner->run(run->test_fn, creators_ptr); + gettimeofday(&end_time, NULL); + load_time= timedif(end_time, start_time); + } + } + + // @todo do something if post fails + (void)world->item.post(creators_ptr); + } + else + { + std::cerr << __FILE__ << ":" << __LINE__ << " item.flush(failure)" << std::endl; + } + } + else + { + std::cerr << __FILE__ << ":" << __LINE__ << " item.startup(failure)" << std::endl; } - - world.item.post(world_ptr); stats.total++; @@ -276,15 +341,15 @@ int main(int argc, char *argv[]) std::cerr << "[ " << test_strerror(return_code) << " ]" << std::endl; - if (test_failed(world.on_error(return_code, world_ptr))) + if (test_failed(world->on_error(return_code, creators_ptr))) { break; } } - if (next->post && world.runner->post) + if (next->post and world->runner->post) { - (void) world.runner->post(next->post, world_ptr); + (void) world->runner->post(next->post, creators_ptr); } if (failed == 0 and skipped == 0) @@ -293,27 +358,34 @@ int main(int argc, char *argv[]) } cleanup: - world.shutdown(world_ptr); + world->shutdown(creators_ptr); } - if (stats.collection_failed || stats.collection_skipped) + if (__shutdown == SHUTDOWN_RUNNING) + { + __shutdown= SHUTDOWN_GRACEFUL; + } + + if (__shutdown == SHUTDOWN_FORCED) + { + std::cerr << std::endl << std::endl << "Tests were aborted." << std::endl << std::endl; + } + else if (stats.collection_failed or stats.collection_skipped) { std::cerr << std::endl << std::endl << "Some test failures and/or skipped test occurred." << std::endl << std::endl; -#if 0 - print_failed_test(); -#endif } else { std::cout << std::endl << std::endl << "All tests completed successfully." << std::endl << std::endl; } - if (test_failed(world.destroy(world_ptr))) - { - stats.failed++; // We do this to make our exit code return EXIT_FAILURE - } - stats_print(&stats); - return stats.failed == 0 ? 0 : 1; + void *retval; + pthread_kill(thread, SIGUSR1); + pthread_join(thread, &retval); + + delete world; + + return stats.failed == 0 and __shutdown == SHUTDOWN_GRACEFUL ? EXIT_SUCCESS : EXIT_FAILURE; }