← Back to branch summary

~brianaker/libmemcached/merge-of-1.0

« back to all changes in this revision

Viewing changes to libtest/main.cc

  • Committer: Continuous Integration
  • Date: 2013-05-04 09:21:59 UTC
  • mfrom: (1102.1.1 libmemcached-1.2)
  • Revision ID: ci@tangent.org-20130504092159-z0z9cm0gnu15wxs0
Merge lp:~tangent-org/libmemcached/1.2-build/ Build: jenkins-Libmemcached-297

Show diffs side-by-side

added added

removed removed

Lines of Context:
libtest/main.cc
297
297
      std::auto_ptr<libtest::Framework> frame(new libtest::Framework(signal, binary_name, collection_to_run, wildcard));
298
298
 
299
299
      // Run create(), bail on error.
300
 
      try
301
300
      {
302
301
        switch (frame->create())
303
302
        {
305
304
          break;
306
305
 
307
306
        case TEST_SKIPPED:
308
 
          return EXIT_SKIP;
 
307
          SKIP("SKIP was returned from framework create()");
 
308
          break;
309
309
 
310
310
        case TEST_FAILURE:
311
311
          std::cerr << "Could not call frame->create()" << std::endl;
312
312
          return EXIT_FAILURE;
313
313
        }
314
314
      }
315
 
      catch (const libtest::__skipped& e)
316
 
      {
317
 
        return EXIT_SKIP;
318
 
      }
319
315
 
320
316
      frame->exec();
321
317