X-Git-Url: https://git.m6w6.name/?a=blobdiff_plain;f=libtest%2Ftest.cc;h=52dd03e7b4e60263b744b42e68df826fe9faa545;hb=da8731f513af0fcd2011e244a065f164241bced3;hp=2c57d206430ec460f4f794ea9f170e4bfca8961d;hpb=9fd31c03436acf24c593dc3a77c905eb137ef570;p=m6w6%2Flibmemcached

diff --git a/libtest/test.cc b/libtest/test.cc
index 2c57d206..52dd03e7 100644
--- a/libtest/test.cc
+++ b/libtest/test.cc
@@ -1,45 +1,66 @@
-/* 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 <libtest/common.h>
 
-#include <config.h>
-
-#include <stdint.h>
-#include <assert.h>
-#include <stdlib.h>
-#include <string.h>
+#include <cassert>
+#include <cstdlib>
+#include <cstring>
 #include <sys/time.h>
 #include <sys/types.h>
 #include <sys/stat.h>
 #include <sys/wait.h>
 #include <unistd.h>
-#include <time.h>
+#include <ctime>
 #include <fnmatch.h>
 #include <iostream>
 
-#include <libtest/test.h>
+#include <signal.h>
+
+#if defined(HAVE_CURL_CURL_H) && HAVE_CURL_CURL_H
+#include <curl/curl.h>
+#endif
 
 #ifndef __INTEL_COMPILER
 #pragma GCC diagnostic ignored "-Wold-style-cast"
 #endif
 
-static void world_stats_print(world_stats_st *stats)
+using namespace libtest;
+
+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)
@@ -53,317 +74,371 @@ static long int timedif(struct timeval a, struct timeval b)
   return s + us;
 }
 
-const char *test_strerror(test_return_t code)
+static void cleanup_curl(void)
 {
-  switch (code) {
-  case TEST_SUCCESS:
-    return "ok";
-  case TEST_FAILURE:
-    return "failed";
-  case TEST_FATAL:
-    return "failed";
-  case TEST_MEMORY_ALLOCATION_FAILURE:
-    return "memory allocation";
-  case TEST_SKIPPED:
-    return "skipped";
-  case TEST_MAXIMUM_RETURN:
-  default:
-     std::cerr << "Unknown return value." << std::endl;
-    abort();
-  }
+#if defined(HAVE_CURL_CURL_H) && HAVE_CURL_CURL_H
+  curl_global_cleanup();
+#endif
 }
 
-void create_core(void)
+#include <getopt.h>
+#include <unistd.h>
+
+int main(int argc, char *argv[])
 {
-  if (getenv("LIBMEMCACHED_NO_COREDUMP") == NULL)
+#if defined(HAVE_CURL_CURL_H) && HAVE_CURL_CURL_H
+  if (curl_global_init(CURL_GLOBAL_ALL))
   {
-    pid_t pid= fork();
-
-    if (pid == 0)
-    {
-      abort();
-    }
-    else
-    {
-      while (waitpid(pid, NULL, 0) != pid) {};
-    }
+    Error << "curl_global_init(CURL_GLOBAL_ALL) failed";
+    return EXIT_FAILURE;
   }
-}
-
-
-static test_return_t _runner_default(test_callback_fn func, void *p)
-{
-  if (func)
-    return func(p);
-
-  return TEST_SUCCESS;
-}
-
-static world_runner_st defualt_runners= {
-  _runner_default,
-  _runner_default,
-  _runner_default
-};
-
-static test_return_t _default_callback(void *p)
-{
-  (void)p;
-
-  return TEST_SUCCESS;
-}
+#endif
 
-static collection_st *init_world(world_st *world)
-{
-  if (world->runner == NULL)
+  if (atexit(cleanup_curl))
   {
-    world->runner= &defualt_runners;
+    Error << "atexit() failed";
+    return EXIT_FAILURE;
   }
 
-  if (world->collection_startup == NULL)
-    world->collection_startup= _default_callback;
+  bool opt_repeat= false;
+  std::string collection_to_run;
 
-  if (world->collection_shutdown == NULL)
-    world->collection_shutdown= _default_callback;
+  // Options parsing
+  {
+    enum long_option_t {
+      OPT_LIBYATL_VERSION,
+      OPT_LIBYATL_MATCH_COLLECTION,
+      OPT_LIBYATL_REPEAT
+    };
 
-  return world->collections;
-}
+    static struct option long_options[]=
+    {
+      {"repeat", no_argument, NULL, OPT_LIBYATL_REPEAT},
+      {"collection", required_argument, NULL, OPT_LIBYATL_MATCH_COLLECTION},
+      {0, 0, 0, 0}
+    };
 
+    int option_index= 0;
+    while (1)
+    {
+      int option_rv= getopt_long(argc, argv, "", long_options, &option_index);
+      if (option_rv == -1)
+      {
+        break;
+      }
 
-int main(int argc, char *argv[])
-{
-  world_st world;
-  void *world_ptr;
+      switch (option_rv)
+      {
+      case OPT_LIBYATL_VERSION:
+        break;
 
-  world_stats_st stats;
+      case OPT_LIBYATL_REPEAT:
+        opt_repeat= true;
+        break;
 
-  get_world(&world);
+      case OPT_LIBYATL_MATCH_COLLECTION:
+        collection_to_run= optarg;
+        break;
 
-  if (not world.runner)
-  {
-    world.runner= &defualt_runners;
+      case '?':
+        /* getopt_long already printed an error message. */
+        Error << "unknown option to getopt_long()";
+        exit(EXIT_FAILURE);
+
+      default:
+        break;
+      }
+    }
   }
 
-  collection_st *collection= init_world(&world);
+  srandom((unsigned int)time(NULL));
 
-  if (world.create)
+  if (getenv("LIBTEST_QUIET") and strcmp(getenv("LIBTEST_QUIET"), "0") == 0)
   {
-    test_return_t error;
-    world_ptr= world.create(&error);
-    if (error != TEST_SUCCESS)
-    {
-      return EXIT_FAILURE;
-    }
+    close(STDOUT_FILENO);
   }
-  else
+  else if (getenv("JENKINS_URL"))
   {
-    world_ptr= NULL;
+    close(STDOUT_FILENO);
   }
 
-  char *collection_to_run= NULL;
-  if (argc > 1)
+  char buffer[1024];
+  if (getenv("LIBTEST_TMP"))
   {
-    collection_to_run= argv[1];
+    snprintf(buffer, sizeof(buffer), "%s", getenv("LIBTEST_TMP"));
   }
-  else if (getenv("TEST_COLLECTION"))
+  else
   {
-    collection_to_run= getenv("TEST_COLLECTION");
+    snprintf(buffer, sizeof(buffer), "%s", LIBTEST_TEMP);
   }
 
-  if (collection_to_run)
+  if (chdir(buffer) == -1)
   {
-    std::cout << "Only testing " <<  collection_to_run << std::endl;
-  }
+    char getcwd_buffer[1024];
+    char *dir= getcwd(getcwd_buffer, sizeof(getcwd_buffer));
 
-  char *wildcard= NULL;
-  if (argc == 3)
-  {
-    wildcard= argv[2];
+    Error << "Unable to chdir() from " << dir << " to " << buffer << " errno:" << strerror(errno);
+    return EXIT_FAILURE;
   }
 
-  for (collection_st *next= collection; next->name; next++)
+  if (libtest::libtool() == NULL)
   {
-    test_return_t collection_rc= TEST_SUCCESS;
-    bool failed= false;
-    bool skipped= false;
+    Error << "Failed to locate libtool";
+    return EXIT_FAILURE;
+  }
 
-    if (collection_to_run && fnmatch(collection_to_run, next->name, 0))
-      continue;
+  int exit_code;
+  do {
+    exit_code= EXIT_SUCCESS;
+    Framework *world= new Framework();
 
-    stats.collection_total++;
+    if (world == NULL)
+    {
+      Error << "Failed to create Framework()";
+      return EXIT_FAILURE;
+    }
 
-    collection_rc= world.collection_startup(world_ptr);
+    assert(sigignore(SIGPIPE) == 0);
 
-    if (collection_rc == TEST_SUCCESS and next->pre)
+    libtest::SignalThread signal;
+    if (not signal.setup())
     {
-      collection_rc= world.runner->pre(next->pre, world_ptr);
+      Error << "Failed to setup signals";
+      return EXIT_FAILURE;
     }
 
-    switch (collection_rc)
+    Stats stats;
+
+    get_world(world);
+
+    test_return_t error;
+    void *creators_ptr= world->create(error);
+
+    switch (error)
     {
     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++;
-      goto cleanup;
-
     case TEST_SKIPPED:
-      std::cerr << std::endl << next->name << " [ skipping ]" << std::endl << std::endl;
-      stats.collection_skipped++;
-      goto cleanup;
+      Out << "SKIP " << argv[0];
+      delete world;
+      return EXIT_SUCCESS;
 
+    case TEST_FATAL:
+    case TEST_FAILURE:
     case TEST_MEMORY_ALLOCATION_FAILURE:
-    case TEST_MAXIMUM_RETURN:
-    default:
-      assert(0);
-      break;
+      delete world;
+      return EXIT_FAILURE;
     }
 
-    for (test_st *run= next->tests; run->name; run++)
+    if (getenv("TEST_COLLECTION"))
     {
-      struct timeval start_time, end_time;
-      long int load_time= 0;
-
-      if (wildcard && fnmatch(wildcard, run->name, 0))
+      if (strlen(getenv("TEST_COLLECTION")))
       {
-	continue;
+        collection_to_run= getenv("TEST_COLLECTION");
       }
+    }
 
-      std::cerr << "\tTesting " << run->name;
+    if (collection_to_run.empty() == false)
+    {
+      Out << "Only testing " <<  collection_to_run;
+    }
 
-      if (world.run_startup)
-      {
-	world.run_startup(world_ptr);
-      }
+    char *wildcard= NULL;
+    if (argc == 3)
+    {
+      wildcard= argv[2];
+    }
 
-      if (run->requires_flush && world.flush)
-      {
-	world.flush(world_ptr);
-      }
+    for (collection_st *next= world->collections; next and next->name and (not signal.is_shutdown()); next++)
+    {
+      bool failed= false;
+      bool skipped= false;
 
-      if (world.pre_run)
+      if (collection_to_run.empty() == false and fnmatch(collection_to_run.c_str(), next->name, 0))
       {
-	world.pre_run(world_ptr);
+        continue;
       }
 
+      stats.collection_total++;
 
-      test_return_t return_code;
-      { // Runner Code
-#if 0
-	if (next->pre and world.runner->pre)
-	{
-	  return_code= world.runner->pre(next->pre, world_ptr);
+      test_return_t collection_rc= world->startup(creators_ptr);
 
-	  if (return_code != TEST_SUCCESS)
-	  {
-	    goto error;
-	  }
-	}
-#endif
-
-	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 0
-	if (next->post && world.runner->post)
-	{
-	  (void) world.runner->post(next->post, world_ptr);
-	}
-#endif
-      }
-
-      if (world.post_run)
+      if (collection_rc == TEST_SUCCESS and next->pre)
       {
-	world.post_run(world_ptr);
+        collection_rc= world->runner()->pre(next->pre, creators_ptr);
       }
 
-      stats.total++;
-
-      std::cerr << "\t\t\t\t\t";
-
-      switch (return_code)
+      switch (collection_rc)
       {
       case TEST_SUCCESS:
-	std::cerr << load_time / 1000 << "." << load_time % 1000;
-	stats.success++;
-	break;
+        break;
 
       case TEST_FATAL:
       case TEST_FAILURE:
-	stats.failed++;
-	failed= true;
-	break;
+        Out << next->name << " [ failed ]";
+        failed= true;
+        signal.set_shutdown(SHUTDOWN_GRACEFUL);
+        goto cleanup;
 
       case TEST_SKIPPED:
-	stats.skipped++;
-	skipped= true;
-	break;
+        Out << next->name << " [ skipping ]";
+        skipped= true;
+        goto cleanup;
 
       case TEST_MEMORY_ALLOCATION_FAILURE:
-      case TEST_MAXIMUM_RETURN:
-      default:
-	break;
-	abort();
+        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;
+        long int load_time= 0;
+
+        if (wildcard && fnmatch(wildcard, run->name, 0))
+        {
+          continue;
+        }
+
+        test_return_t return_code;
+        try {
+          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);
+                  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);
+                }
+              }
+
+              // @todo do something if post fails
+              (void)world->item.post(creators_ptr);
+            }
+            else if (return_code == TEST_SKIPPED)
+            { }
+            else if (return_code == TEST_FAILURE)
+            {
+              Error << " item.flush(failure)";
+              signal.set_shutdown(SHUTDOWN_GRACEFUL);
+            }
+          }
+          else if (return_code == TEST_SKIPPED)
+          { }
+          else if (return_code == TEST_FAILURE)
+          {
+            Error << " item.startup(failure)";
+            signal.set_shutdown(SHUTDOWN_GRACEFUL);
+          }
+        }
+
+        catch (std::exception &e)
+        {
+          Error << "Exception was thrown: " << e.what();
+          return_code= TEST_FAILURE;
+        }
+        catch (...)
+        {
+          Error << "Unknown exception occurred";
+          return_code= TEST_FAILURE;
+        }
+
+        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_FATAL:
+        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;
+
+        case TEST_MEMORY_ALLOCATION_FAILURE:
+          test_assert(0, "Memory Allocation Error");
+        }
+
+        if (test_failed(world->on_error(return_code, creators_ptr)))
+        {
+          Error << "Failed while running on_error()";
+          signal.set_shutdown(SHUTDOWN_GRACEFUL);
+          break;
+        }
       }
 
-      std::cerr << "[ " << test_strerror(return_code) << " ]" << std::endl;
+      (void) world->runner()->post(next->post, creators_ptr);
 
-      if (world.on_error)
+cleanup:
+      if (failed == false and skipped == false)
       {
-	test_return_t rc= world.on_error(return_code, world_ptr);
+        stats.collection_success++;
+      }
 
-	if (rc != TEST_SUCCESS)
-	  break;
+      if (failed)
+      {
+        stats.collection_failed++;
       }
 
+      if (skipped)
+      {
+        stats.collection_skipped++;
+      }
+
+      world->shutdown(creators_ptr);
+      Outn();
     }
 
-    if (next->post && world.runner->post)
+    if (not signal.is_shutdown())
     {
-      (void) world.runner->post(next->post, world_ptr);
+      signal.set_shutdown(SHUTDOWN_GRACEFUL);
     }
 
-    if (failed == 0 and skipped == 0)
+    shutdown_t status= signal.get_shutdown();
+    if (status == SHUTDOWN_FORCED)
     {
-      stats.collection_success++;
+      Out << "Tests were aborted.";
+      exit_code= EXIT_FAILURE;
     }
-cleanup:
-
-    if (world.collection_shutdown)
+    else if (stats.collection_failed)
     {
-      world.collection_shutdown(world_ptr);
+      Out << "Some test failed.";
+      exit_code= EXIT_FAILURE;
     }
-  }
-
-  if (stats.collection_failed || 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 (world.destroy)
-  {
-    test_return_t error= world.destroy(world_ptr);
-
-    if (error != TEST_SUCCESS)
+    else if (stats.collection_skipped and stats.collection_failed and stats.collection_success)
     {
-      std::cerr << "Failure during shutdown." << std::endl;
-      stats.failed++; // We do this to make our exit code return EXIT_FAILURE
+      Out << "Some tests were skipped.";
     }
-  }
+    else if (stats.collection_success and stats.collection_failed == 0)
+    {
+      Out << "All tests completed successfully.";
+    }
+
+    stats_print(&stats);
+
+    delete world;
 
-  world_stats_print(&stats);
+    Outn(); // Generate a blank to break up the messages if make check/test has been run
+  } while (exit_code == EXIT_SUCCESS and opt_repeat);
 
-  return stats.failed == 0 ? 0 : 1;
+  return exit_code;
 }