X-Git-Url: https://git.m6w6.name/?a=blobdiff_plain;f=libtest%2Fmain.cc;h=6bffa84cf86688a6be22fa55fcd47153375287f4;hb=0d5e8e1b19db6ff920eda2446883f3a7d781bf14;hp=0926dc6486568a35948b4060245fa60a53602372;hpb=47f45992107361ad58c170bdf78fdc92523fab06;p=awesomized%2Flibmemcached diff --git a/libtest/main.cc b/libtest/main.cc index 0926dc64..6bffa84c 100644 --- a/libtest/main.cc +++ b/libtest/main.cc @@ -43,6 +43,7 @@ #include #include #include +#include #include #include #include @@ -58,71 +59,23 @@ using namespace libtest; -static void stats_print(Stats *stats) +static void stats_print(libtest::Framework *frame) { - if (stats->collection_failed == 0 and stats->collection_success == 0) + if (frame->failed() == 0 and frame->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) -{ - long us, s; - - us = (long)(a.tv_usec - b.tv_usec); - us /= 1000; - s = (long)(a.tv_sec - b.tv_sec); - s *= 1000; - return s + us; -} - -static test_return_t runner_code(Framework* frame, - test_st* run, - void* creators_ptr, - long int& load_time) -{ // Runner Code - - struct timeval start_time, end_time; - - gettimeofday(&start_time, NULL); - assert(frame->runner()); - assert(run->test_fn); - - test_return_t return_code; - try - { - return_code= frame->runner()->run(run->test_fn, creators_ptr); - } - // Special case where check for the testing of the exception - // system. - catch (libtest::fatal &e) - { - if (fatal::is_disabled()) - { - fatal::increment_disabled_counter(); - return_code= TEST_SUCCESS; - } - else - { - throw; - } - } - - gettimeofday(&end_time, NULL); - load_time= timedif(end_time, start_time); - - return return_code; + Out << "Collections\t\t\t\t\t" << frame->total(); + Out << "\tFailed\t\t\t\t\t" << frame->failed(); + Out << "\tSkipped\t\t\t\t\t" << frame->skipped(); + Out << "\tSucceeded\t\t\t\t" << frame->success(); + Outn(); + Out << "Tests\t\t\t\t\t" << frame->sum_total(); + Out << "\tFailed\t\t\t\t" << frame->sum_failed(); + Out << "\tSkipped\t\t\t\t" << frame->sum_skipped(); + Out << "\tSucceeded\t\t\t" << frame->sum_success(); } #include @@ -134,6 +87,35 @@ int main(int argc, char *argv[]) unsigned long int opt_repeat= 1; // Run all tests once bool opt_quiet= false; std::string collection_to_run; + std::string wildcard; + std::string binary_name; + + const char *just_filename= rindex(argv[0], '/'); + if (just_filename) + { + just_filename++; + } + else + { + just_filename= argv[0]; + } + + if (just_filename[0] == 'l' and just_filename[1] == 't' and just_filename[2] == '-') + { + just_filename+= 3; + } + binary_name.append(just_filename); + + /* + Valgrind does not currently work reliably, or sometimes at all, on OSX + - Fri Jun 15 11:24:07 EDT 2012 + */ +#if defined(TARGET_OS_OSX) && TARGET_OS_OSX + if (valgrind_is_caller()) + { + return EXIT_SKIP; + } +#endif // Options parsing { @@ -142,6 +124,7 @@ int main(int argc, char *argv[]) OPT_LIBYATL_MATCH_COLLECTION, OPT_LIBYATL_MASSIVE, OPT_LIBYATL_QUIET, + OPT_LIBYATL_MATCH_WILDCARD, OPT_LIBYATL_REPEAT }; @@ -151,6 +134,7 @@ int main(int argc, char *argv[]) { "quiet", no_argument, NULL, OPT_LIBYATL_QUIET }, { "repeat", no_argument, NULL, OPT_LIBYATL_REPEAT }, { "collection", required_argument, NULL, OPT_LIBYATL_MATCH_COLLECTION }, + { "wildcard", required_argument, NULL, OPT_LIBYATL_MATCH_WILDCARD }, { "massive", no_argument, NULL, OPT_LIBYATL_MASSIVE }, { 0, 0, 0, 0 } }; @@ -181,6 +165,10 @@ int main(int argc, char *argv[]) collection_to_run= optarg; break; + case OPT_LIBYATL_MATCH_WILDCARD: + wildcard= optarg; + break; + case OPT_LIBYATL_MASSIVE: opt_massive= true; break; @@ -217,27 +205,37 @@ int main(int argc, char *argv[]) } } + if ((bool(getenv("YATL_RUN_MASSIVE_TESTS"))) or opt_massive) + { + opt_massive= true; + } + if (opt_quiet) { close(STDOUT_FILENO); } - char buffer[1024]; + if (opt_massive) + { + is_massive(opt_massive); + } + + char tmp_directory[1024]; if (getenv("LIBTEST_TMP")) { - snprintf(buffer, sizeof(buffer), "%s", getenv("LIBTEST_TMP")); + snprintf(tmp_directory, sizeof(tmp_directory), "%s", getenv("LIBTEST_TMP")); } else { - snprintf(buffer, sizeof(buffer), "%s", LIBTEST_TEMP); + snprintf(tmp_directory, sizeof(tmp_directory), "%s", LIBTEST_TEMP); } - if (chdir(buffer) == -1) + if (chdir(tmp_directory) == -1) { char getcwd_buffer[1024]; char *dir= getcwd(getcwd_buffer, sizeof(getcwd_buffer)); - Error << "Unable to chdir() from " << dir << " to " << buffer << " errno:" << strerror(errno); + Error << "Unable to chdir() from " << dir << " to " << tmp_directory << " errno:" << strerror(errno); return EXIT_FAILURE; } @@ -247,6 +245,24 @@ int main(int argc, char *argv[]) return EXIT_FAILURE; } + if (getenv("YATL_COLLECTION_TO_RUN")) + { + if (strlen(getenv("YATL_COLLECTION_TO_RUN"))) + { + 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; + } + int exit_code; try @@ -254,8 +270,6 @@ int main(int argc, char *argv[]) do { exit_code= EXIT_SUCCESS; - std::auto_ptr frame(new Framework); - fatal_assert(sigignore(SIGPIPE) == 0); libtest::SignalThread signal; @@ -265,182 +279,26 @@ int main(int argc, char *argv[]) return EXIT_FAILURE; } - Stats stats; - - get_world(frame.get()); - - test_return_t error; - void *creators_ptr= frame->create(error); + std::auto_ptr frame(new libtest::Framework(signal, binary_name, collection_to_run, wildcard)); - switch (error) + // Run create(), bail on error. { - case TEST_SUCCESS: - break; - - case TEST_SKIPPED: - Out << "SKIP " << argv[0]; - return EXIT_SUCCESS; - - case TEST_FAILURE: - return EXIT_FAILURE; - } - - if (getenv("YATL_COLLECTION_TO_RUN")) - { - if (strlen(getenv("YATL_COLLECTION_TO_RUN"))) + switch (frame->create()) { - collection_to_run= getenv("YATL_COLLECTION_TO_RUN"); - } - } + case TEST_SUCCESS: + break; - if (collection_to_run.compare("none") == 0) - { - return EXIT_SUCCESS; - } + case TEST_SKIPPED: + return EXIT_SKIP; - if (collection_to_run.empty() == false) - { - Out << "Only testing " << collection_to_run; - } - - char *wildcard= NULL; - if (argc == 3) - { - wildcard= argv[2]; - } - - for (collection_st *next= frame->collections; next and next->name and (not signal.is_shutdown()); next++) - { - if (collection_to_run.empty() == false and fnmatch(collection_to_run.c_str(), next->name, 0)) - { - continue; + case TEST_FAILURE: + std::cerr << "frame->create()" << std::endl; + return EXIT_FAILURE; } - - stats.collection_total++; - - bool failed= false; - bool skipped= false; - test_return_t collection_rc; - if (test_success(collection_rc= frame->runner()->pre(next->pre, creators_ptr))) - { - Out << "Collection: " << next->name; - - for (test_st *run= next->tests; run->name; run++) - { - long int load_time= 0; - - if (wildcard && fnmatch(wildcard, run->name, 0)) - { - continue; - } - - test_return_t return_code; - try - { - if (run->requires_flush) - { - if (test_failed(frame->runner()->flush(creators_ptr))) - { - Error << "frame->runner()->flush(creators_ptr)"; - continue; - } - } - - return_code= runner_code(frame.get(), run, creators_ptr, load_time); - - if (return_code == TEST_SKIPPED) - { } - else if (return_code == TEST_FAILURE) - { -#if 0 - Error << " frame->runner()->run(failure)"; - signal.set_shutdown(SHUTDOWN_GRACEFUL); -#endif - } - - } - catch (libtest::fatal &e) - { - Error << "Fatal exception was thrown: " << e.what(); - return_code= TEST_FAILURE; - throw; - } - catch (std::exception &e) - { - Error << "Exception was thrown: " << e.what(); - return_code= TEST_FAILURE; - throw; - } - catch (...) - { - Error << "Unknown exception occurred"; - return_code= TEST_FAILURE; - throw; - } - - stats.total++; - - switch (return_code) - { - case TEST_SUCCESS: - Out << "\tTesting " << run->name << "\t\t\t\t\t" << load_time / 1000 << "." << load_time % 1000 << "[ " << test_strerror(return_code) << " ]"; - stats.success++; - break; - - case TEST_FAILURE: - 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; - Out << "\tTesting " << run->name << "\t\t\t\t\t" << "[ " << test_strerror(return_code) << " ]"; - break; - - default: - fatal_message("invalid return code"); - } -#if 0 - @TODO add code here to allow for a collection to define a method to reset to allow tests to continue. -#endif - } - - (void) frame->runner()->post(next->post, creators_ptr); - } - else if (collection_rc == TEST_FAILURE) - { - Out << next->name << " [ failed ]"; - failed= true; -#if 0 - signal.set_shutdown(SHUTDOWN_GRACEFUL); -#endif - } - else if (collection_rc == TEST_SKIPPED) - { - Out << next->name << " [ skipping ]"; - skipped= true; - } - - if (failed == false and skipped == false) - { - stats.collection_success++; - } - - if (failed) - { - stats.collection_failed++; - } - - if (skipped) - { - stats.collection_skipped++; - } - - Outn(); } + frame->exec(); + if (signal.is_shutdown() == false) { signal.set_shutdown(SHUTDOWN_GRACEFUL); @@ -452,40 +310,63 @@ int main(int argc, char *argv[]) Out << "Tests were aborted."; exit_code= EXIT_FAILURE; } - else if (stats.collection_failed) + else if (frame->failed()) { Out << "Some test failed."; exit_code= EXIT_FAILURE; } - else if (stats.collection_skipped and stats.collection_failed and stats.collection_success) + else if (frame->skipped() and frame->failed() and frame->success()) { Out << "Some tests were skipped."; } - else if (stats.collection_success and (stats.collection_failed == 0)) + else if (frame->success() and (frame->failed() == 0)) { + Out; Out << "All tests completed successfully."; } - stats_print(&stats); + stats_print(frame.get()); + + std::ofstream xml_file; + std::string file_name; + file_name.append(tmp_directory); + file_name.append(frame->name()); + file_name.append(".xml"); + xml_file.open(file_name.c_str(), std::ios::trunc); + libtest::Formatter::xml(*frame, xml_file); Outn(); // Generate a blank to break up the messages if make check/test has been run } while (exit_code == EXIT_SUCCESS and --opt_repeat); } catch (libtest::fatal& e) { - std::cerr << e.what() << std::endl; + std::cerr << "FATAL:" << e.what() << std::endl; + exit_code= EXIT_FAILURE; + } + catch (libtest::start& e) + { + std::cerr << "Failure to start:" << e.what() << std::endl; + exit_code= EXIT_FAILURE; } catch (libtest::disconnected& e) { std::cerr << "Unhandled disconnection occurred:" << e.what() << std::endl; + exit_code= EXIT_FAILURE; } catch (std::exception& e) { - std::cerr << e.what() << std::endl; + std::cerr << "std::exception:" << e.what() << std::endl; + exit_code= EXIT_FAILURE; + } + catch (char const*) + { + std::cerr << "Exception:" << std::endl; + exit_code= EXIT_FAILURE; } catch (...) { std::cerr << "Unknown exception halted execution." << std::endl; + exit_code= EXIT_FAILURE; } return exit_code;