diff options
| author | Phil Nash | 2013-11-19 19:03:11 +0000 |
|---|---|---|
| committer | Phil Nash | 2013-11-19 19:03:11 +0000 |
| commit | ca7292e3a74d4a6e99309618ad483171f428a35b (patch) | |
| tree | b518fcf91bfa3ab227dc0af53a9f2a4a81f7a0fd /projects/SelfTest/TestMain.cpp | |
| parent | 200197f0b2ec58a835f968a233539de9626ab794 (diff) | |
| download | catch3-ca7292e3a74d4a6e99309618ad483171f428a35b.tar.gz | |
Removed redundant MetaTestRunner
Diffstat (limited to 'projects/SelfTest/TestMain.cpp')
| -rw-r--r-- | projects/SelfTest/TestMain.cpp | 17 |
1 files changed, 8 insertions, 9 deletions
diff --git a/projects/SelfTest/TestMain.cpp b/projects/SelfTest/TestMain.cpp index 00796e93..1d7211e5 100644 --- a/projects/SelfTest/TestMain.cpp +++ b/projects/SelfTest/TestMain.cpp @@ -5,22 +5,21 @@ * Distributed under the Boost Software License, Version 1.0. (See accompanying * file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt) */ + +#define CATCH_CONFIG_MAIN +#include "catch.hpp" + #ifdef __clang__ #pragma clang diagnostic ignored "-Wpadded" +#pragma clang diagnostic ignored "-Wweak-vtables" #endif -#include "catch_self_test.hpp" #include "internal/catch_text.h" #include "internal/catch_console_colour.hpp" +#include "internal/catch_commandline.hpp" +#include "internal/catch_test_spec.h" - -#ifdef __clang__ -#pragma clang diagnostic ignored "-Wweak-vtables" -#endif - -#include "../../include/internal/catch_commandline.hpp" -#include "../../include/internal/catch_test_spec.h" -#include "../../include/reporters/catch_reporter_xml.hpp" +#include "reporters/catch_reporter_xml.hpp" template<size_t size> void parseIntoConfig( const char * (&argv)[size], Catch::ConfigData& config ) { |