X-Git-Url: https://git.m6w6.name/?a=blobdiff_plain;f=libtest%2Ftest.cc;h=d71057d36bdf14f8f93457a644d5a96b771585fe;hb=b90c798532ec8d4d4e2f5c1eea1ec18354dd2070;hp=49f3893b49b1d99458b6606d4f664688354b21ec;hpb=06b419b10f9a86ebc584949162c7d81eab061e8a;p=m6w6%2Flibmemcached diff --git a/libtest/test.cc b/libtest/test.cc index 49f3893b..d71057d3 100644 --- a/libtest/test.cc +++ b/libtest/test.cc @@ -1,13 +1,40 @@ -/* uTest - * Copyright (C) 2011 Data Differential, http://datadifferential.com/ - * Copyright (C) 2006-2009 Brian Aker - * All rights reserved. +/* vim:expandtab:shiftwidth=2:tabstop=2:smarttab: + * + * uTest, libtest + * + * Copyright (C) 2011 Data Differential, http://datadifferential.com/ + * Copyright (C) 2006-2009 Brian Aker + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions are + * met: + * + * * Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * + * * Redistributions in binary form must reproduce the above + * copyright notice, this list of conditions and the following disclaimer + * in the documentation and/or other materials provided with the + * distribution. + * + * * The names of its contributors may not be used to endorse or + * promote products derived from this software without specific prior + * written permission. + * + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS + * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT + * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR + * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT + * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, + * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT + * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, + * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY + * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT + * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE + * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * - * Use and distribution licensed under the BSD license. See - * the COPYING file in the parent directory for full text. */ - #include #include @@ -21,22 +48,23 @@ #include #include #include -#include #include #include +#include #ifndef __INTEL_COMPILER #pragma GCC diagnostic ignored "-Wold-style-cast" #endif +using namespace libtest; + static in_port_t global_port= 0; static char global_socket[1024]; in_port_t default_port() { - assert(global_port); return global_port; } @@ -50,23 +78,31 @@ 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)); + if (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; - std::cout << "\tFailed Collections\t\t\t\t" << stats->collection_failed << std::endl; - std::cout << "\tSkipped Collections\t\t\t\t" << stats->collection_skipped << std::endl; - std::cout << "\tSucceeded Collections\t\t\t\t" << stats->collection_success << std::endl; - std::cout << std::endl; - std::cout << "Total\t\t\t\t" << stats->total << std::endl; - std::cout << "\tFailed\t\t\t" << stats->failed << std::endl; - std::cout << "\tSkipped\t\t\t" << stats->skipped << std::endl; - std::cout << "\tSucceeded\t\t" << stats->success << std::endl; + Out << "\tTotal Collections\t\t\t\t" << stats->collection_total; + Out << "\tFailed Collections\t\t\t\t" << stats->collection_failed; + Out << "\tSkipped Collections\t\t\t\t" << stats->collection_skipped; + Out << "\tSucceeded Collections\t\t\t\t" << stats->collection_success; + Outn(); + Out << "Total\t\t\t\t" << stats->total; + Out << "\tFailed\t\t\t" << stats->failed; + Out << "\tSkipped\t\t\t" << stats->skipped; + Out << "\tSucceeded\t\t" << stats->success; } static long int timedif(struct timeval a, struct timeval b) @@ -119,68 +155,11 @@ void create_core(void) } } -enum shutdown_t { - SHUTDOWN_RUNNING, - SHUTDOWN_GRACEFUL, - SHUTDOWN_FORCED -}; - 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;) - { - int sig; - int error; - while ((error= sigwait(set, &sig)) == EINTR) ; - - std::cerr << std::endl << "Signal handling thread got signal " << strsignal(sig) << std::endl; - switch (sig) - { - case SIGSEGV: - case SIGINT: - case SIGABRT: - __shutdown= SHUTDOWN_FORCED; - - default: - break; - } - } - - return NULL; -} - - -static void setup_signals(pthread_t& thread) -{ - sigset_t set; - - sigemptyset(&set); - sigaddset(&set, SIGSEGV); - sigaddset(&set, SIGABRT); - sigaddset(&set, SIGINT); - - 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[]) { + srandom((unsigned int)time(NULL)); + world= new Framework(); if (not world) @@ -188,18 +167,22 @@ int main(int argc, char *argv[]) return EXIT_FAILURE; } - pthread_t thread; - setup_signals(thread); + libtest::SignalThread signal; + if (not signal.setup()) + { + return EXIT_FAILURE; + } Stats stats; get_world(world); test_return_t error; - void *creators_ptr= world->create(&error); + void *creators_ptr= world->create(error); if (test_failed(error)) { - std::cerr << "create() failed" << std::endl; + Error << "create() failed"; + delete world; return EXIT_FAILURE; } @@ -215,7 +198,7 @@ int main(int argc, char *argv[]) if (collection_to_run) { - std::cout << "Only testing " << collection_to_run << std::endl; + Out << "Only testing " << collection_to_run; } char *wildcard= NULL; @@ -224,7 +207,7 @@ int main(int argc, char *argv[]) wildcard= argv[2]; } - for (collection_st *next= world->collections; next->name and __shutdown == SHUTDOWN_RUNNING; next++) + for (collection_st *next= world->collections; next->name and (not signal.is_shutdown()); next++) { test_return_t collection_rc= TEST_SUCCESS; bool failed= false; @@ -239,30 +222,32 @@ int main(int argc, char *argv[]) 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) { case TEST_SUCCESS: - std::cerr << std::endl << next->name << std::endl << std::endl; break; case TEST_FATAL: case TEST_FAILURE: - std::cerr << std::endl << next->name << " [ failed ]" << std::endl << std::endl; - stats.collection_failed++; + Out << next->name << " [ failed ]"; + failed= true; + signal.set_shutdown(SHUTDOWN_GRACEFUL); goto cleanup; case TEST_SKIPPED: - std::cerr << std::endl << next->name << " [ skipping ]" << std::endl << std::endl; - stats.collection_skipped++; + Out << next->name << " [ skipping ]"; + skipped= true; goto cleanup; case TEST_MEMORY_ALLOCATION_FAILURE: test_assert(0, "Allocation failure, or unknown return"); } + Out << "Collection: " << next->name; + for (test_st *run= next->tests; run->name; run++) { struct timeval start_time, end_time; @@ -270,11 +255,9 @@ int main(int argc, char *argv[]) if (wildcard && fnmatch(wildcard, run->name, 0)) { - continue; + continue; } - std::cerr << "\tTesting " << run->name; - test_return_t return_code; if (test_success(return_code= world->item.startup(creators_ptr))) { @@ -285,7 +268,9 @@ int main(int argc, char *argv[]) { { // Runner Code gettimeofday(&start_time, NULL); - return_code= world->runner->run(run->test_fn, creators_ptr); + assert(world->runner()); + assert(run->test_fn); + return_code= world->runner()->run(run->test_fn, creators_ptr); gettimeofday(&end_time, NULL); load_time= timedif(end_time, start_time); } @@ -294,85 +279,109 @@ int main(int argc, char *argv[]) // @todo do something if post fails (void)world->item.post(creators_ptr); } - else + else if (return_code == TEST_SKIPPED) + { } + else if (return_code == TEST_FAILURE) { - std::cerr << __FILE__ << ":" << __LINE__ << " item.flush(failure)" << std::endl; + Error << " item.flush(failure)"; + signal.set_shutdown(SHUTDOWN_GRACEFUL); } } - else + else if (return_code == TEST_SKIPPED) + { } + else if (return_code == TEST_FAILURE) { - std::cerr << __FILE__ << ":" << __LINE__ << " item.startup(failure)" << std::endl; + Error << " item.startup(failure)"; + signal.set_shutdown(SHUTDOWN_GRACEFUL); } stats.total++; - std::cerr << "\t\t\t\t\t"; - switch (return_code) { case TEST_SUCCESS: - std::cerr << load_time / 1000 << "." << load_time % 1000; - stats.success++; - break; + Out << "\tTesting " << run->name << "\t\t\t\t\t" << load_time / 1000 << "." << load_time % 1000 << "[ " << test_strerror(return_code) << " ]"; + stats.success++; + break; case TEST_FATAL: case TEST_FAILURE: - stats.failed++; - failed= true; - break; + stats.failed++; + failed= true; + Out << "\tTesting " << run->name << "\t\t\t\t\t" << "[ " << test_strerror(return_code) << " ]"; + break; case TEST_SKIPPED: - stats.skipped++; - skipped= true; - break; + stats.skipped++; + skipped= true; + Out << "\tTesting " << run->name << "\t\t\t\t\t" << "[ " << test_strerror(return_code) << " ]"; + break; case TEST_MEMORY_ALLOCATION_FAILURE: - test_assert(0, "Memory Allocation Error"); + test_assert(0, "Memory Allocation Error"); } - std::cerr << "[ " << test_strerror(return_code) << " ]" << std::endl; - if (test_failed(world->on_error(return_code, creators_ptr))) { + Error << "Failed while running on_error()"; + signal.set_shutdown(SHUTDOWN_GRACEFUL); break; } } - if (next->post and world->runner->post) + (void) world->runner()->post(next->post, creators_ptr); + +cleanup: + if (failed == false and skipped == false) { - (void) world->runner->post(next->post, creators_ptr); + stats.collection_success++; } - if (failed == 0 and skipped == 0) + if (failed) { - stats.collection_success++; + stats.collection_failed++; + } + + if (skipped) + { + stats.collection_skipped++; } -cleanup: world->shutdown(creators_ptr); + Outn(); } - if (__shutdown == SHUTDOWN_RUNNING) + if (not signal.is_shutdown()) { - __shutdown= SHUTDOWN_GRACEFUL; + signal.set_shutdown(SHUTDOWN_GRACEFUL); } - if (__shutdown == SHUTDOWN_FORCED) + int exit_code= EXIT_SUCCESS; + shutdown_t status= signal.get_shutdown(); + if (status == SHUTDOWN_FORCED) + { + Out << "Tests were aborted."; + exit_code= EXIT_FAILURE; + } + else if (stats.collection_failed) { - std::cerr << std::endl << std::endl << "Tests were aborted." << std::endl << std::endl; + Out << "Some test failed."; + exit_code= EXIT_FAILURE; } - else if (stats.collection_failed or stats.collection_skipped) + else if (stats.collection_skipped) { - std::cerr << std::endl << std::endl << "Some test failures and/or skipped test occurred." << std::endl << std::endl; + Out << "Some tests were skipped."; } else { - std::cout << std::endl << std::endl << "All tests completed successfully." << std::endl << std::endl; + Out << "All tests completed successfully."; } stats_print(&stats); delete world; - return stats.failed == 0 and __shutdown == SHUTDOWN_GRACEFUL ? EXIT_SUCCESS : EXIT_FAILURE; + Outn(); // Generate a blank to break up the messages if make check/test has been run + + return exit_code; }