Reinstated #include that broke single include

This commit is contained in:
Phil Nash 2012-05-22 22:21:17 +01:00
parent 7004f4a234
commit 1787da54a7
4 changed files with 11 additions and 1 deletions

View File

@ -8,6 +8,7 @@
#ifndef TWOBLUECUBES_CATCH_HPP_INCLUDED #ifndef TWOBLUECUBES_CATCH_HPP_INCLUDED
#define TWOBLUECUBES_CATCH_HPP_INCLUDED #define TWOBLUECUBES_CATCH_HPP_INCLUDED
#include "internal/catch_test_case_info.hpp" // This needs to be here to prevent the single_include script ommitting it after the obj_c header
#include "internal/catch_context.h" #include "internal/catch_context.h"
#include "internal/catch_test_registry.hpp" #include "internal/catch_test_registry.hpp"
#include "internal/catch_capture.hpp" #include "internal/catch_capture.hpp"

View File

@ -8,6 +8,7 @@
#ifndef TWOBLUECUBES_CATCH_TESTCASEINFO_HPP_INCLUDED #ifndef TWOBLUECUBES_CATCH_TESTCASEINFO_HPP_INCLUDED
#define TWOBLUECUBES_CATCH_TESTCASEINFO_HPP_INCLUDED #define TWOBLUECUBES_CATCH_TESTCASEINFO_HPP_INCLUDED
#include "catch_common.h"
#include "catch_interfaces_testcase.h" #include "catch_interfaces_testcase.h"
#include <map> #include <map>
#include <string> #include <string>

View File

@ -75,3 +75,12 @@ TEST_CASE( "./succeeding/message/sections/stdout", "Output from all sections is
std::cout << "Message from section two" << std::endl; std::cout << "Message from section two" << std::endl;
} }
} }
TEST_CASE( "./mixed/message/scoped", "" )
{
for( int i=0; i<100; i++ )
{
SCOPED_INFO( "current counter " << i );
REQUIRE( i < 10 );
}
}

View File

@ -9,7 +9,6 @@
#define TWOBLUECUBES_CATCH_SELF_TEST_HPP_INCLUDED #define TWOBLUECUBES_CATCH_SELF_TEST_HPP_INCLUDED
#include "catch.hpp" #include "catch.hpp"
#include "catch_test_case_info.hpp"
#include "set" #include "set"