X-Git-Url: https://git.m6w6.name/?a=blobdiff_plain;f=libtest%2Ftest.cc;h=5c43e40b35d9f0211d076c19d24c6864fe7dfa59;hb=58c279d58e2a44562f729e93e301dfedf42f530b;hp=d87f1b17733b95e78ae70b0b046a32e0d065971c;hpb=61bb2c3a16c0c9723bbb6492283e349a8ccdf11f;p=m6w6%2Flibmemcached diff --git a/libtest/test.cc b/libtest/test.cc index d87f1b17..5c43e40b 100644 --- a/libtest/test.cc +++ b/libtest/test.cc @@ -1,13 +1,24 @@ -/* 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: + * + * libtest * - * Use and distribution licensed under the BSD license. See - * the COPYING file in the parent directory for full text. + * Copyright (C) 2011 Data Differential, http://datadifferential.com/ + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 3 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ - #include #include @@ -21,22 +32,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; } @@ -58,20 +70,28 @@ bool test_is_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; + if (stats->collection_failed == 0 and stats->collection_success == 0) + { + return; + } + + 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) @@ -124,81 +144,54 @@ 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; +int main(int argc, char *argv[]) +{ + srandom((unsigned int)time(NULL)); - for (;__shutdown == SHUTDOWN_RUNNING;) + if (getenv("LIBTEST_QUIET")) { - 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; - } + close(STDOUT_FILENO); } - return NULL; -} - - -static void setup_signals(pthread_t& thread) -{ - sigset_t set; - - sigemptyset(&set); - sigaddset(&set, SIGSEGV); - sigaddset(&set, SIGABRT); - sigaddset(&set, SIGINT); - sigaddset(&set, SIGUSR1); - - int error; - if ((error= pthread_sigmask(SIG_BLOCK, &set, NULL)) != 0) + char buffer[1024]; + if (getenv("LIBTEST_TMP")) + { + snprintf(buffer, sizeof(buffer), "%s", getenv("LIBTEST_TMP")); + } + else { - std::cerr << __FILE__ << ":" << __LINE__ << " died during pthread_sigmask(" << strerror(error) << ")" << std::endl; - exit(EXIT_FAILURE); + snprintf(buffer, sizeof(buffer), "%s", LIBTEST_TEMP); } - if ((error= pthread_create(&thread, NULL, &sig_thread, (void *) &set)) != 0) + if (chdir(buffer) == -1) { - std::cerr << __FILE__ << ":" << __LINE__ << " died during pthread_create(" << strerror(error) << ")" << std::endl; - exit(EXIT_FAILURE); + char getcwd_buffer[1024]; + char *dir= getcwd(getcwd_buffer, sizeof(getcwd_buffer)); + + Error << "Unable to chdir() from " << dir << " to " << buffer << " errno:" << strerror(errno); + return EXIT_FAILURE; } -} + if (libtest::libtool() == NULL) + { + Error << "Failed to locate libtool"; + return EXIT_FAILURE; + } -int main(int argc, char *argv[]) -{ world= new Framework(); if (not world) { + Error << "Failed to create Framework()"; return EXIT_FAILURE; } - pthread_t thread; - setup_signals(thread); + libtest::SignalThread signal; + if (not signal.setup()) + { + return EXIT_FAILURE; + } Stats stats; @@ -206,9 +199,22 @@ int main(int argc, char *argv[]) test_return_t error; void *creators_ptr= world->create(error); - if (test_failed(error)) + + switch (error) { - std::cerr << "create() failed" << std::endl; + case TEST_SUCCESS: + break; + + case TEST_SKIPPED: + Out << "SKIP " << argv[0]; + delete world; + return EXIT_SUCCESS; + + case TEST_FATAL: + case TEST_FAILURE: + case TEST_MEMORY_ALLOCATION_FAILURE: + Error << argv[0] << " failed in Framework::create()"; + delete world; return EXIT_FAILURE; } @@ -224,7 +230,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; @@ -233,7 +239,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; @@ -248,30 +254,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; @@ -279,11 +287,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))) { @@ -294,7 +300,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); } @@ -303,89 +311,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) { - std::cerr << std::endl << std::endl << "Tests were aborted." << std::endl << std::endl; + Out << "Tests were aborted."; + exit_code= EXIT_FAILURE; } - else if (stats.collection_failed or stats.collection_skipped) + else if (stats.collection_failed) { - std::cerr << std::endl << std::endl << "Some test failures and/or skipped test occurred." << std::endl << std::endl; + Out << "Some test failed."; + exit_code= EXIT_FAILURE; } - else + else if (stats.collection_skipped and stats.collection_failed and stats.collection_success) { - std::cout << std::endl << std::endl << "All tests completed successfully." << std::endl << std::endl; + Out << "Some tests were skipped."; + } + else if (stats.collection_success and stats.collection_failed == 0) + { + Out << "All tests completed successfully."; } stats_print(&stats); - void *retval; - pthread_kill(thread, SIGUSR1); - pthread_join(thread, &retval); - 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; }