X-Git-Url: https://git.m6w6.name/?a=blobdiff_plain;f=libtest%2Fmain.cc;h=83e95cd65a7bc10c9bab62c0b7611d70a354d957;hb=eb3945ce9820053036c315bd5faae7af83977217;hp=80ffa769344d5ac89c5d72283c0c37cfa3a23b1b;hpb=91ea3455ccf0cebaecbb2c0ee4ead073b6d86354;p=awesomized%2Flibmemcached

diff --git a/libtest/main.cc b/libtest/main.cc
index 80ffa769..83e95cd6 100644
--- a/libtest/main.cc
+++ b/libtest/main.cc
@@ -110,7 +110,7 @@ int main(int argc, char *argv[])
     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 defined(__APPLE__) && __APPLE__
   if (valgrind_is_caller())
   {
     return EXIT_SKIP;
@@ -165,7 +165,6 @@ int main(int argc, char *argv[])
           Error << "unknown value passed to --repeat: `" << optarg << "`";
           exit(EXIT_FAILURE);
         }
-
         break;
 
       case OPT_LIBYATL_MATCH_COLLECTION:
@@ -298,7 +297,6 @@ int main(int argc, char *argv[])
       std::auto_ptr<libtest::Framework> frame(new libtest::Framework(signal, binary_name, collection_to_run, wildcard));
 
       // Run create(), bail on error.
-      try
       {
         switch (frame->create())
         {
@@ -306,17 +304,14 @@ int main(int argc, char *argv[])
           break;
 
         case TEST_SKIPPED:
-          return EXIT_SKIP;
+          SKIP("SKIP was returned from framework create()");
+          break;
 
         case TEST_FAILURE:
           std::cerr << "Could not call frame->create()" << std::endl;
           return EXIT_FAILURE;
         }
       }
-      catch (const libtest::__skipped& e)
-      {
-        return EXIT_SKIP;
-      }
 
       frame->exec();
 
@@ -383,9 +378,9 @@ int main(int argc, char *argv[])
     std::cerr << "std::exception:" << e.what() << std::endl;
     exit_code= EXIT_FAILURE;
   }
-  catch (char const*)
+  catch (char const* s)
   {
-    std::cerr << "Exception:" << std::endl;
+    std::cerr << "Exception:" << s << std::endl;
     exit_code= EXIT_FAILURE;
   }
   catch (...)