mirror of https://github.com/catchorg/Catch2.git
Tweaked single include merging to remove comment blocks
Also removed multiple blank lines
This commit is contained in:
Phil Nash
parent
e0dd4a5469
commit
aec1e5ed86
|
|
@ -5,11 +5,15 @@ import re
|
|||
includesParser = re.compile( r'\s*#include\s*"(.*)"' )
|
||||
guardParser = re.compile( r'\s*#.*_INCLUDED')
|
||||
defineParser = re.compile( r'\s*#define')
|
||||
commentParser1 = re.compile( r'^\s*/\*')
|
||||
commentParser2 = re.compile( r'^\s*\*')
|
||||
blankParser = re.compile( r'^\s*$')
|
||||
seenHeaders = set([])
|
||||
rootPath = os.path.join( os.path.realpath(os.path.dirname(sys.argv[0])), 'include/' )
|
||||
|
||||
def parseFile( path, filename ):
|
||||
f = open( path + filename, 'r' )
|
||||
blanks = 0
|
||||
for line in f:
|
||||
m = includesParser.match( line )
|
||||
if m:
|
||||
|
|
@ -18,7 +22,6 @@ def parseFile( path, filename ):
|
|||
if not headerFile in seenHeaders:
|
||||
seenHeaders.add( headerFile )
|
||||
print "// #included from: " + header
|
||||
print
|
||||
if( headerPath == "internal" and path.endswith( "internal/" ) ):
|
||||
headerPath = ""
|
||||
sep = ""
|
||||
|
|
@ -26,16 +29,23 @@ def parseFile( path, filename ):
|
|||
parseFile( path + headerPath + sep, headerFile )
|
||||
else:
|
||||
parseFile( rootPath + headerPath + sep, headerFile )
|
||||
elif not guardParser.match( line ):
|
||||
print line.rstrip()
|
||||
elif defineParser.match( line ):
|
||||
print line.rstrip()
|
||||
|
||||
elif not guardParser.match( line ) and not commentParser1.match( line )and not commentParser2.match( line ):
|
||||
if blankParser.match( line ):
|
||||
blanks = blanks + 1
|
||||
else:
|
||||
blanks = 0
|
||||
if blanks < 2:
|
||||
print line.rstrip()
|
||||
|
||||
print "// This file has been merged from multiple headers. Please don't edit it directly"
|
||||
print
|
||||
print '#ifndef TWOBLUECUBES_CATCH_HPP_INCLUDED'
|
||||
print '#define TWOBLUECUBES_CATCH_HPP_INCLUDED'
|
||||
print "/*"
|
||||
print " * This file has been merged from multiple headers. Please don't edit it directly"
|
||||
print " * Copyright (c) 2012 Two Blue Cubes Ltd. All rights reserved."
|
||||
print " *"
|
||||
print " * Distributed under the Boost Software License, Version 1.0. (See accompanying"
|
||||
print " * file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)"
|
||||
print " */"
|
||||
print '#ifndef TWOBLUECUBES_SINGLE_INCLUDE_CATCH_HPP_INCLUDED'
|
||||
print '#define TWOBLUECUBES_SINGLE_INCLUDE_CATCH_HPP_INCLUDED'
|
||||
parseFile( rootPath, 'catch.hpp' )
|
||||
print '#endif // TWOBLUECUBES_CATCH_HPP_INCLUDED'
|
||||
print
|
||||
print '#endif // TWOBLUECUBES_SINGLE_INCLUDE_CATCH_HPP_INCLUDED'
|
||||
print
|
||||
|
|
@ -1,66 +1,19 @@
|
|||
// This file has been merged from multiple headers. Please don't edit it directly
|
||||
|
||||
#ifndef TWOBLUECUBES_CATCH_HPP_INCLUDED
|
||||
#define TWOBLUECUBES_CATCH_HPP_INCLUDED
|
||||
/*
|
||||
* catch.hpp
|
||||
* Catch
|
||||
*
|
||||
* Created by Phil on 22/10/2010.
|
||||
* Copyright 2010 Two Blue Cubes Ltd
|
||||
* This file has been merged from multiple headers. Please don't edit it directly
|
||||
* Copyright (c) 2012 Two Blue Cubes Ltd. All rights reserved.
|
||||
*
|
||||
* 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)
|
||||
*
|
||||
*/
|
||||
#ifndef TWOBLUECUBES_SINGLE_INCLUDE_CATCH_HPP_INCLUDED
|
||||
#define TWOBLUECUBES_SINGLE_INCLUDE_CATCH_HPP_INCLUDED
|
||||
|
||||
/* TBD:
|
||||
|
||||
Next:
|
||||
|
||||
Later:
|
||||
Finish command line parser (list as xml)
|
||||
Tags?
|
||||
Finish macros, listed here, later (just CHECK_NOFAIL now)
|
||||
*/
|
||||
#define TWOBLUECUBES_CATCH_HPP_INCLUDED
|
||||
// #included from: internal/catch_hub.h
|
||||
|
||||
/*
|
||||
* catch_hub.h
|
||||
* Catch
|
||||
*
|
||||
* Created by Phil on 31/12/2010.
|
||||
* Copyright 2010 Two Blue Cubes Ltd. All rights reserved.
|
||||
*
|
||||
* 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 TWOBLUECUBES_CATCH_HUB_H_INCLUDED
|
||||
|
||||
// #included from: catch_interfaces_reporter.h
|
||||
|
||||
/*
|
||||
* Created by Phil on 31/12/2010.
|
||||
* Copyright 2010 Two Blue Cubes Ltd. All rights reserved.
|
||||
*
|
||||
* 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 TWOBLUECUBES_CATCH_IREPORTERREGISTRY_INCLUDED
|
||||
|
||||
// #included from: catch_common.h
|
||||
|
||||
/*
|
||||
* Created by Phil on 29/10/2010.
|
||||
* Copyright 2010 Two Blue Cubes Ltd. All rights reserved.
|
||||
*
|
||||
* 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 TWOBLUECUBES_CATCH_COMMON_H_INCLUDED
|
||||
|
||||
#define INTERNAL_CATCH_UNIQUE_NAME_LINE2( name, line ) name##line
|
||||
#define INTERNAL_CATCH_UNIQUE_NAME_LINE( name, line ) INTERNAL_CATCH_UNIQUE_NAME_LINE2( name, line )
|
||||
#define INTERNAL_CATCH_UNIQUE_NAME( name ) INTERNAL_CATCH_UNIQUE_NAME_LINE( name, __LINE__ )
|
||||
|
|
@ -157,22 +110,8 @@ namespace Catch
|
|||
#define CATCH_INTERNAL_ERROR( msg ) throwLogicError( msg, __FILE__, __LINE__ );
|
||||
#define CATCH_INTERNAL_LINEINFO ::Catch::SourceLineInfo( __FILE__, __LINE__ )
|
||||
|
||||
|
||||
// #included from: catch_totals.hpp
|
||||
|
||||
//
|
||||
// catch_totals.hpp
|
||||
// Catch
|
||||
//
|
||||
// Created by Phil Nash on 23/02/2012.
|
||||
// Copyright (c) 2012 Two Blue Cubes Ltd. All rights reserved.
|
||||
//
|
||||
// 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 TWOBLUECUBES_CATCH_TOTALS_HPP_INCLUDED
|
||||
|
||||
namespace Catch
|
||||
{
|
||||
struct Counts
|
||||
|
|
@ -216,20 +155,6 @@ namespace Catch
|
|||
|
||||
// #included from: catch_ptr.hpp
|
||||
|
||||
/*
|
||||
* catch_ptr.hpp
|
||||
* Catch
|
||||
*
|
||||
* Created by Phil on 02/05/2012.
|
||||
* Copyright 2012 Two Blue Cubes Ltd. All rights reserved.
|
||||
*
|
||||
* 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 TWOBLUECUBES_CATCH_PTR_HPP_INCLUDED
|
||||
|
||||
|
||||
namespace Catch
|
||||
{
|
||||
// An intrusive reference counting smart pointer.
|
||||
|
|
@ -313,7 +238,6 @@ namespace Catch
|
|||
|
||||
} // end namespace Catch
|
||||
|
||||
|
||||
#include <string>
|
||||
#include <ostream>
|
||||
#include <map>
|
||||
|
|
@ -368,7 +292,6 @@ namespace Catch
|
|||
}
|
||||
}
|
||||
|
||||
|
||||
#include <memory>
|
||||
#include <vector>
|
||||
#include <stdlib.h>
|
||||
|
|
@ -456,35 +379,8 @@ namespace Catch
|
|||
|
||||
// #included from: internal/catch_test_registry.hpp
|
||||
|
||||
/*
|
||||
* catch_test_registry.hpp
|
||||
* Catch
|
||||
*
|
||||
* Created by Phil on 18/10/2010.
|
||||
* Copyright 2010 Two Blue Cubes Ltd. All rights reserved.
|
||||
*
|
||||
* 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 TWOBLUECUBES_CATCH_REGISTRY_HPP_INCLUDED
|
||||
|
||||
// #included from: catch_interfaces_testcase.h
|
||||
|
||||
/*
|
||||
* catch_interfaces_testcase.h
|
||||
* Catch
|
||||
*
|
||||
* Created by Phil on 07/01/2011.
|
||||
* Copyright 2011 Two Blue Cubes Ltd. All rights reserved.
|
||||
*
|
||||
* 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 TWOBLUECUBES_CATCH_INTERFACES_TESTCASE_H_INCLUDED
|
||||
|
||||
#include <vector>
|
||||
|
||||
namespace Catch
|
||||
|
|
@ -531,9 +427,6 @@ namespace Catch
|
|||
};
|
||||
}
|
||||
|
||||
|
||||
|
||||
|
||||
namespace Catch
|
||||
{
|
||||
|
||||
|
|
@ -665,37 +558,10 @@ private:
|
|||
|
||||
// #included from: internal/catch_capture.hpp
|
||||
|
||||
/*
|
||||
* Created by Phil on 18/10/2010.
|
||||
* Copyright 2010 Two Blue Cubes Ltd. All rights reserved.
|
||||
*
|
||||
* 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 TWOBLUECUBES_CATCH_CAPTURE_HPP_INCLUDED
|
||||
|
||||
// #included from: catch_resultinfo_builder.hpp
|
||||
|
||||
/*
|
||||
* Created by Phil on 8/5/2012.
|
||||
* Copyright 2012 Two Blue Cubes Ltd. All rights reserved.
|
||||
*
|
||||
* 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 TWOBLUECUBES_CATCH_RESULTINFO_BUILDER_HPP_INCLUDED
|
||||
|
||||
// #included from: catch_tostring.hpp
|
||||
|
||||
/*
|
||||
* Created by Phil on 8/5/2012.
|
||||
* Copyright 2012 Two Blue Cubes Ltd. All rights reserved.
|
||||
*
|
||||
* 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 TWOBLUECUBES_CATCH_TOSTRING_HPP_INCLUDED
|
||||
|
||||
#include <sstream>
|
||||
|
||||
namespace Catch
|
||||
|
|
@ -807,36 +673,9 @@ inline std::string toString( bool value ) {
|
|||
|
||||
// #included from: catch_resultinfo.hpp
|
||||
|
||||
/*
|
||||
* catch_resultinfo.hpp
|
||||
* Catch
|
||||
*
|
||||
* Created by Phil on 28/10/2010.
|
||||
* Copyright 2010 Two Blue Cubes Ltd. All rights reserved.
|
||||
*
|
||||
* 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 TWOBLUECUBES_CATCH_RESULT_INFO_HPP_INCLUDED
|
||||
|
||||
#include <string>
|
||||
// #included from: catch_result_type.h
|
||||
|
||||
/*
|
||||
* catch_result_type.h
|
||||
* Catch
|
||||
*
|
||||
* Created by Phil on 07/01/2011.
|
||||
* Copyright 2011 Two Blue Cubes Ltd. All rights reserved.
|
||||
*
|
||||
* 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 TWOBLUECUBES_CATCH_RESULT_TYPE_H_INCLUDED
|
||||
|
||||
namespace Catch
|
||||
{
|
||||
|
||||
|
|
@ -872,7 +711,6 @@ struct ResultWas{ enum OfType
|
|||
}
|
||||
|
||||
|
||||
|
||||
namespace Catch
|
||||
{
|
||||
class ResultInfo
|
||||
|
|
@ -1054,23 +892,8 @@ namespace Catch
|
|||
|
||||
} // end namespace Catch
|
||||
|
||||
|
||||
// #included from: catch_evaluate.hpp
|
||||
|
||||
/*
|
||||
* catch_evaluate.hpp
|
||||
* Catch
|
||||
*
|
||||
* Created by Phil on 04/03/2011.
|
||||
* Copyright 2011 Two Blue Cubes Ltd. All rights reserved.
|
||||
*
|
||||
* 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 TWOBLUECUBES_CATCH_EVALUATE_HPP_INCLUDED
|
||||
|
||||
namespace Catch
|
||||
{
|
||||
namespace Internal
|
||||
|
|
@ -1256,7 +1079,6 @@ namespace Internal
|
|||
} // end of namespace Internal
|
||||
} // end of namespace Catch
|
||||
|
||||
|
||||
namespace Catch
|
||||
{
|
||||
|
||||
|
|
@ -1350,19 +1172,6 @@ private:
|
|||
|
||||
// #included from: catch_interfaces_capture.h
|
||||
|
||||
/*
|
||||
* catch_interfaces_capture.h
|
||||
* Catch
|
||||
*
|
||||
* Created by Phil on 07/01/2011.
|
||||
* Copyright 2011 Two Blue Cubes Ltd. All rights reserved.
|
||||
*
|
||||
* 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 TWOBLUECUBES_CATCH_INTERFACES_CAPTURE_H_INCLUDED
|
||||
|
||||
#include <string>
|
||||
|
||||
namespace Catch
|
||||
|
|
@ -1423,21 +1232,6 @@ namespace Catch
|
|||
|
||||
// #included from: catch_debugger.hpp
|
||||
|
||||
/*
|
||||
* catch_debugger.hpp
|
||||
* Catch
|
||||
*
|
||||
* Created by Phil on 27/12/2010.
|
||||
* Copyright 2010 Two Blue Cubes Ltd. All rights reserved.
|
||||
*
|
||||
* 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)
|
||||
*
|
||||
* Provides a BreakIntoDebugger() macro for Windows and Mac (so far)
|
||||
*/
|
||||
|
||||
#define TWOBLUECUBES_CATCH_DEBUGGER_HPP_INCLUDED
|
||||
|
||||
#include <iostream>
|
||||
|
||||
#if defined(__MAC_OS_X_VERSION_MIN_REQUIRED)
|
||||
|
|
@ -1729,13 +1523,11 @@ public:
|
|||
return m_result->captureBoolExpression( m_lhs );
|
||||
}
|
||||
|
||||
|
||||
private:
|
||||
ResultInfoBuilder* m_result;
|
||||
const LhsT* m_lhs;
|
||||
};
|
||||
|
||||
|
||||
class ResultBuilder
|
||||
{
|
||||
public:
|
||||
|
|
@ -2000,21 +1792,6 @@ inline bool isTrue( bool value ){ return value; }
|
|||
|
||||
// #included from: internal/catch_section.hpp
|
||||
|
||||
/*
|
||||
* catch_section.hpp
|
||||
* Catch
|
||||
*
|
||||
* Created by Phil on 03/11/2010.
|
||||
* Copyright 2010 Two Blue Cubes Ltd. All rights reserved.
|
||||
*
|
||||
* 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 TWOBLUECUBES_CATCH_SECTION_HPP_INCLUDED
|
||||
|
||||
|
||||
#include <string>
|
||||
|
||||
namespace Catch
|
||||
|
|
@ -2064,21 +1841,6 @@ namespace Catch
|
|||
|
||||
// #included from: internal/catch_generators.hpp
|
||||
|
||||
/*
|
||||
* catch_generators.hpp
|
||||
* Catch
|
||||
*
|
||||
* Created by Phil on 27/01/2011.
|
||||
* Copyright 2011 Two Blue Cubes Ltd. All rights reserved.
|
||||
*
|
||||
* 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 TWOBLUECUBES_CATCH_GENERATORS_HPP_INCLUDED
|
||||
|
||||
|
||||
#include <iterator>
|
||||
#include <vector>
|
||||
#include <string>
|
||||
|
|
@ -2373,19 +2135,6 @@ using namespace Generators;
|
|||
|
||||
// #included from: internal/catch_interfaces_exception.h
|
||||
|
||||
/*
|
||||
* catch_exception_interfaces.h
|
||||
* Catch
|
||||
*
|
||||
* Created by Phil on 20/04/2011.
|
||||
* Copyright 2011 Two Blue Cubes Ltd. All rights reserved.
|
||||
*
|
||||
* 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 TWOBLUECUBES_CATCH_INTERFACES_EXCEPTIONS_H_INCLUDED
|
||||
|
||||
#include <string>
|
||||
|
||||
namespace Catch
|
||||
|
|
@ -2465,20 +2214,6 @@ namespace Catch
|
|||
|
||||
// #included from: internal/catch_approx.hpp
|
||||
|
||||
/*
|
||||
* catch_approx.hpp
|
||||
* Catch
|
||||
*
|
||||
* Created by Phil on 28/04/2011.
|
||||
* Copyright 2010 Two Blue Cubes Ltd. All rights reserved.
|
||||
*
|
||||
* 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 TWOBLUECUBES_CATCH_APPROX_HPP_INCLUDED
|
||||
|
||||
|
||||
#include <cmath>
|
||||
#include <limits>
|
||||
|
||||
|
|
@ -2571,7 +2306,6 @@ namespace Catch
|
|||
return !operator==( rhs, lhs );
|
||||
}
|
||||
|
||||
|
||||
///////////////////////////////////////////////////////////////////////////
|
||||
Approx& epsilon
|
||||
(
|
||||
|
|
@ -2621,20 +2355,6 @@ namespace Catch
|
|||
|
||||
// #included from: internal/catch_test_case_info.hpp
|
||||
|
||||
/*
|
||||
* catch_test_case_info.hpp
|
||||
* Catch
|
||||
*
|
||||
* Created by Phil on 29/10/2010.
|
||||
* Copyright 2010 Two Blue Cubes Ltd. All rights reserved.
|
||||
*
|
||||
* 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 TWOBLUECUBES_CATCH_TESTCASEINFO_HPP_INCLUDED
|
||||
|
||||
#include <map>
|
||||
#include <string>
|
||||
|
||||
|
|
@ -2831,19 +2551,6 @@ namespace Catch
|
|||
|
||||
// #included from: internal/catch_matchers.hpp
|
||||
|
||||
//
|
||||
// catch_matchers.hpp
|
||||
// CatchSelfTest
|
||||
//
|
||||
// Created by Phil Nash on 04/03/2012.
|
||||
// Copyright (c) 2012 Two Blue Cubes Ltd. All rights reserved.
|
||||
//
|
||||
// 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 TWOBLUECUBES_CATCH_MATCHERS_HPP_INCLUDED
|
||||
|
||||
namespace Catch
|
||||
{
|
||||
namespace Matchers
|
||||
|
|
@ -2915,24 +2622,9 @@ using namespace Matchers;
|
|||
|
||||
} // namespace Catch
|
||||
|
||||
|
||||
#ifdef __OBJC__
|
||||
// #included from: internal/catch_objc.hpp
|
||||
|
||||
/*
|
||||
* catch_objc.hpp
|
||||
* Catch
|
||||
*
|
||||
* Created by Phil on 14/11/2010.
|
||||
* Copyright 2010 Two Blue Cubes Ltd. All rights reserved.
|
||||
*
|
||||
* 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 TWOBLUECUBES_CATCH_OBJC_HPP_INCLUDED
|
||||
|
||||
#import <Foundation/Foundation.h>
|
||||
#import <objc/runtime.h>
|
||||
|
||||
|
|
@ -3245,49 +2937,9 @@ return @ desc; \
|
|||
#if defined( CATCH_CONFIG_MAIN ) || defined( CATCH_CONFIG_RUNNER )
|
||||
// #included from: catch_runner.hpp
|
||||
|
||||
/*
|
||||
* catch_runner.hpp
|
||||
* Catch
|
||||
*
|
||||
* Created by Phil on 31/10/2010.
|
||||
* Copyright 2010 Two Blue Cubes Ltd. All rights reserved.
|
||||
*
|
||||
* 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 TWOBLUECUBES_CATCH_RUNNER_HPP_INCLUDED
|
||||
|
||||
// #included from: internal/catch_hub_impl.hpp
|
||||
|
||||
/*
|
||||
* catch_hub_impl.hpp
|
||||
* Catch
|
||||
*
|
||||
* Created by Phil on 31/12/2010.
|
||||
* Copyright 2010 Two Blue Cubes Ltd. All rights reserved.
|
||||
*
|
||||
* 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)
|
||||
*
|
||||
*/
|
||||
// #included from: catch_reporter_registry.hpp
|
||||
|
||||
/*
|
||||
* catch_reporter_registry.hpp
|
||||
* Catch
|
||||
*
|
||||
* Created by Phil on 29/10/2010.
|
||||
* Copyright 2010 Two Blue Cubes Ltd. All rights reserved.
|
||||
*
|
||||
* 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 TWOBLUECUBES_CATCH_REPORTER_REGISTRY_HPP_INCLUDED
|
||||
|
||||
|
||||
#include <map>
|
||||
|
||||
namespace Catch
|
||||
|
|
@ -3342,19 +2994,6 @@ namespace Catch
|
|||
|
||||
// #included from: catch_test_case_registry_impl.hpp
|
||||
|
||||
/*
|
||||
* catch_test_case_registry_impl.hpp
|
||||
* Catch
|
||||
*
|
||||
* Created by Phil on 7/1/2011
|
||||
* Copyright 2010 Two Blue Cubes Ltd. All rights reserved.
|
||||
*
|
||||
* 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)
|
||||
*
|
||||
*/
|
||||
|
||||
|
||||
#include <vector>
|
||||
#include <set>
|
||||
#include <sstream>
|
||||
|
|
@ -3437,7 +3076,6 @@ namespace Catch
|
|||
///////////////////////////////////////////////////////////////////////////
|
||||
///////////////////////////////////////////////////////////////////////////
|
||||
|
||||
|
||||
struct FreeFunctionTestCase : ITestCase
|
||||
{
|
||||
///////////////////////////////////////////////////////////////////////////
|
||||
|
|
@ -3527,20 +3165,6 @@ namespace Catch
|
|||
|
||||
// #included from: catch_exception_translator_registry.hpp
|
||||
|
||||
/*
|
||||
* catch_exception_translator_registry.hpp
|
||||
* Catch
|
||||
*
|
||||
* Created by Phil on 20/04/2011.
|
||||
* Copyright 2011 Two Blue Cubes Ltd. All rights reserved.
|
||||
*
|
||||
* 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 TWOBLUECUBES_CATCH_EXCEPTION_TRANSLATOR_HPP_INCLUDED
|
||||
|
||||
|
||||
namespace Catch
|
||||
{
|
||||
class ExceptionTranslatorRegistry : public IExceptionTranslatorRegistry
|
||||
|
|
@ -3615,35 +3239,8 @@ namespace Catch
|
|||
|
||||
// #included from: catch_runner_impl.hpp
|
||||
|
||||
/*
|
||||
* catch_runner.hpp
|
||||
* Catch
|
||||
*
|
||||
* Created by Phil on 22/10/2010.
|
||||
* Copyright 2010 Two Blue Cubes Ltd. All rights reserved.
|
||||
*
|
||||
* 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 TWOBLUECUBES_INTERNAL_CATCH_RUNNER_HPP_INCLUDED
|
||||
|
||||
// #included from: catch_interfaces_runner.h
|
||||
|
||||
/*
|
||||
* catch_interfaces_runner.h
|
||||
* Catch
|
||||
*
|
||||
* Created by Phil on 07/01/2011.
|
||||
* Copyright 2011 Two Blue Cubes Ltd. All rights reserved.
|
||||
*
|
||||
* 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 TWOBLUECUBES_INTERNAL_CATCH_INTERFACES_RUNNER_H_INCLUDED
|
||||
|
||||
|
||||
#include <string>
|
||||
|
||||
namespace Catch
|
||||
|
|
@ -3672,21 +3269,6 @@ namespace Catch
|
|||
|
||||
// #included from: catch_config.hpp
|
||||
|
||||
/*
|
||||
* catch_config.hpp
|
||||
* Catch
|
||||
*
|
||||
* Created by Phil on 08/11/2010.
|
||||
* Copyright 2010 Two Blue Cubes Ltd. All rights reserved.
|
||||
*
|
||||
* 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 TWOBLUECUBES_CATCH_RUNNERCONFIG_HPP_INCLUDED
|
||||
|
||||
|
||||
#include <memory>
|
||||
#include <vector>
|
||||
#include <string>
|
||||
|
|
@ -3724,7 +3306,6 @@ namespace Catch
|
|||
AsMask = 0xf0
|
||||
}; };
|
||||
|
||||
|
||||
///////////////////////////////////////////////////////////////////////////
|
||||
Config()
|
||||
: m_listSpec( List::None ),
|
||||
|
|
@ -3918,27 +3499,8 @@ namespace Catch
|
|||
|
||||
// #included from: catch_running_test.hpp
|
||||
|
||||
/*
|
||||
* Created by Phil Nash on 4/5/2012
|
||||
* Copyright 2012 Two Blue Cubes Ltd. All rights reserved.
|
||||
*
|
||||
* 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 TWOBLUECUBES_INTERNAL_CATCH_RUNNING_TEST_HPP_INCLUDED
|
||||
|
||||
// #included from: catch_section_info.hpp
|
||||
|
||||
/*
|
||||
* Created by Phil Nash on 4/5/2012
|
||||
* Copyright 2012 Two Blue Cubes Ltd. All rights reserved.
|
||||
*
|
||||
* 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 TWOBLUECUBES_INTERNAL_CATCH_SECTION_INFO_HPP_INCLUDED
|
||||
|
||||
|
||||
#include <map>
|
||||
#include <string>
|
||||
|
||||
|
|
@ -4068,7 +3630,6 @@ namespace Catch
|
|||
};
|
||||
}
|
||||
|
||||
|
||||
namespace Catch
|
||||
{
|
||||
class RunningTest
|
||||
|
|
@ -4204,7 +3765,6 @@ namespace Catch
|
|||
};
|
||||
}
|
||||
|
||||
|
||||
#include <set>
|
||||
#include <string>
|
||||
|
||||
|
|
@ -4572,21 +4132,6 @@ namespace Catch
|
|||
|
||||
// #included from: catch_generators_impl.hpp
|
||||
|
||||
/*
|
||||
* catch_generators_impl.hpp
|
||||
* Catch
|
||||
*
|
||||
* Created by Phil on 28/01/2011.
|
||||
* Copyright 2011 Two Blue Cubes Ltd. All rights reserved.
|
||||
*
|
||||
* 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 TWOBLUECUBES_CATCH_GENERATORS_IMPL_HPP_INCLUDED
|
||||
|
||||
|
||||
#include <vector>
|
||||
#include <string>
|
||||
#include <map>
|
||||
|
|
@ -4689,35 +4234,8 @@ namespace Catch
|
|||
|
||||
// #included from: catch_console_colour_impl.hpp
|
||||
|
||||
/*
|
||||
* catch_console_colour_impl.hpp
|
||||
* Catch
|
||||
*
|
||||
* Created by Phil on 25/2/2012.
|
||||
* Copyright 2012 Two Blue Cubes Ltd. All rights reserved.
|
||||
*
|
||||
* 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 TWOBLUECUBES_CATCH_CONSOLE_COLOUR_IMPL_HPP_INCLUDED
|
||||
|
||||
// #included from: catch_console_colour.hpp
|
||||
|
||||
/*
|
||||
* catch_console_colour.hpp
|
||||
* Catch
|
||||
*
|
||||
* Created by Phil on 25/2/2012.
|
||||
* Copyright 2012 Two Blue Cubes Ltd. All rights reserved.
|
||||
*
|
||||
* 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 TWOBLUECUBES_CATCH_CONSOLE_COLOUR_HPP_INCLUDED
|
||||
|
||||
|
||||
namespace Catch
|
||||
{
|
||||
struct ConsoleColourImpl;
|
||||
|
|
@ -4751,7 +4269,6 @@ namespace Catch
|
|||
|
||||
} // end namespace Catch
|
||||
|
||||
|
||||
#ifdef CATCH_PLATFORM_WINDOWS
|
||||
|
||||
#include <windows.h>
|
||||
|
|
@ -4839,20 +4356,6 @@ namespace Catch
|
|||
|
||||
// #included from: catch_stream.hpp
|
||||
|
||||
/*
|
||||
* catch_stream.hpp
|
||||
* Catch
|
||||
*
|
||||
* Created by Phil on 17/01/2011.
|
||||
* Copyright 2011 Two Blue Cubes Ltd. All rights reserved.
|
||||
*
|
||||
* 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 TWOBLUECUBES_CATCH_STREAM_HPP_INCLUDED
|
||||
|
||||
#include <stdexcept>
|
||||
#include <cstdio>
|
||||
|
||||
|
|
@ -5071,24 +4574,8 @@ namespace Catch
|
|||
return generators && generators->moveNext();
|
||||
}
|
||||
}
|
||||
|
||||
// #included from: internal/catch_commandline.hpp
|
||||
|
||||
/*
|
||||
* catch_commandline.hpp
|
||||
* Catch
|
||||
*
|
||||
* Created by Phil on 02/11/2010.
|
||||
* Copyright 2010 Two Blue Cubes Ltd. All rights reserved.
|
||||
*
|
||||
* 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 TWOBLUECUBES_CATCH_COMMANDLINE_HPP_INCLUDED
|
||||
|
||||
|
||||
namespace Catch
|
||||
{
|
||||
// !TBD: This could be refactored to be more "declarative"
|
||||
|
|
@ -5294,25 +4781,10 @@ namespace Catch
|
|||
Config& m_config;
|
||||
};
|
||||
|
||||
|
||||
} // end namespace Catch
|
||||
|
||||
// #included from: internal/catch_list.hpp
|
||||
|
||||
/*
|
||||
* catch_list.hpp
|
||||
* Catch
|
||||
*
|
||||
* Created by Phil on 5/11/2010.
|
||||
* Copyright 2010 Two Blue Cubes Ltd. All rights reserved.
|
||||
*
|
||||
* 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 TWOBLUECUBES_CATCH_LIST_HPP_INCLUDED
|
||||
|
||||
#include <limits>
|
||||
|
||||
namespace Catch
|
||||
|
|
@ -5369,35 +4841,8 @@ namespace Catch
|
|||
|
||||
// #included from: reporters/catch_reporter_basic.hpp
|
||||
|
||||
/*
|
||||
* catch_reporter_basic.hpp
|
||||
* Catch
|
||||
*
|
||||
* Created by Phil on 28/10/2010.
|
||||
* Copyright 2010 Two Blue Cubes Ltd. All rights reserved.
|
||||
*
|
||||
* 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 TWOBLUECUBES_CATCH_REPORTER_BASIC_HPP_INCLUDED
|
||||
|
||||
// #included from: ../internal/catch_reporter_registrars.hpp
|
||||
|
||||
/*
|
||||
* catch_reporter_registrars.hpp
|
||||
* Test
|
||||
*
|
||||
* Created by Phil on 31/12/2010.
|
||||
* Copyright 2010 Two Blue Cubes Ltd. All rights reserved.
|
||||
*
|
||||
* 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 TWOBLUECUBES_CATCH_REPORTER_REGISTRARS_HPP_INCLUDED
|
||||
|
||||
|
||||
namespace Catch
|
||||
{
|
||||
template<typename T>
|
||||
|
|
@ -5440,7 +4885,6 @@ namespace Catch
|
|||
#define INTERNAL_CATCH_REGISTER_REPORTER( name, reporterType ) \
|
||||
Catch::ReporterRegistrar<reporterType> catch_internal_RegistrarFor##reporterType( name );
|
||||
|
||||
|
||||
namespace Catch
|
||||
{
|
||||
struct pluralise
|
||||
|
|
@ -5859,33 +5303,8 @@ namespace Catch
|
|||
|
||||
// #included from: reporters/catch_reporter_xml.hpp
|
||||
|
||||
/*
|
||||
* catch_reporter_xml.hpp
|
||||
* Catch
|
||||
*
|
||||
* Created by Phil on 28/10/2010.
|
||||
* Copyright 2010 Two Blue Cubes Ltd. All rights reserved.
|
||||
*
|
||||
* 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 TWOBLUECUBES_CATCH_REPORTER_XML_HPP_INCLUDED
|
||||
|
||||
// #included from: ../internal/catch_xmlwriter.hpp
|
||||
|
||||
/*
|
||||
* catch_xmlwriter.hpp
|
||||
* Catch
|
||||
*
|
||||
* Created by Phil on 09/12/2010.
|
||||
* Copyright 2010 Two Blue Cubes Ltd. All rights reserved.
|
||||
*
|
||||
* 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 TWOBLUECUBES_CATCH_XMLWRITER_HPP_INCLUDED
|
||||
|
||||
#include <sstream>
|
||||
#include <string>
|
||||
#include <vector>
|
||||
|
|
@ -6202,7 +5621,6 @@ namespace Catch
|
|||
};
|
||||
|
||||
}
|
||||
|
||||
namespace Catch
|
||||
{
|
||||
class XmlReporter : public SharedImpl<IReporter>
|
||||
|
|
@ -6377,20 +5795,6 @@ namespace Catch
|
|||
|
||||
// #included from: reporters/catch_reporter_junit.hpp
|
||||
|
||||
/*
|
||||
* catch_reporter_junit.hpp
|
||||
* Catch
|
||||
*
|
||||
* Created by Phil on 26/11/2010.
|
||||
* Copyright 2010 Two Blue Cubes Ltd. All rights reserved.
|
||||
*
|
||||
* 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 TWOBLUECUBES_CATCH_REPORTER_JUNIT_HPP_INCLUDED
|
||||
|
||||
|
||||
namespace Catch
|
||||
{
|
||||
class JunitReporter : public SharedImpl<IReporter>
|
||||
|
|
@ -6611,7 +6015,6 @@ namespace Catch
|
|||
}
|
||||
}
|
||||
|
||||
|
||||
///////////////////////////////////////////////////////////////////////////
|
||||
void OutputTestResult( XmlWriter& xml, const TestCaseStats& stats )
|
||||
{
|
||||
|
|
@ -6646,7 +6049,6 @@ namespace Catch
|
|||
|
||||
} // end namespace Catch
|
||||
|
||||
|
||||
#include <fstream>
|
||||
#include <stdlib.h>
|
||||
#include <limits>
|
||||
|
|
@ -6776,20 +6178,6 @@ namespace Catch
|
|||
#ifdef CATCH_CONFIG_MAIN
|
||||
// #included from: internal/catch_default_main.hpp
|
||||
|
||||
/*
|
||||
* catch_default_main.hpp
|
||||
* Catch
|
||||
*
|
||||
* Created by Phil on 20/05/2011.
|
||||
* Copyright 2011 Two Blue Cubes Ltd. All rights reserved.
|
||||
*
|
||||
* 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 TWOBLUECUBES_CATCH_DEFAULT_MAIN_HPP_INCLUDED
|
||||
|
||||
int main (int argc, char * const argv[])
|
||||
{
|
||||
#ifdef __OBJC__
|
||||
|
|
@ -6862,5 +6250,5 @@ int main (int argc, char * const argv[])
|
|||
|
||||
using Catch::Detail::Approx;
|
||||
|
||||
#endif // TWOBLUECUBES_CATCH_HPP_INCLUDED
|
||||
#endif // TWOBLUECUBES_SINGLE_INCLUDE_CATCH_HPP_INCLUDED
|
||||
|
||||
|
|
|
|||
Loading…
Reference in New Issue