3rd-party/catch2
1
0
Fork 0
mirror of https://github.com/catchorg/Catch2.git synced 2024-11-16 18:52:25 +01:00
Code Issues Packages Projects Releases Wiki Activity

Re-added (unintentionly removed) OBJC main entry point implementation

Browse Source
This commit is contained in:
Lukasz Forynski 2013-12-17 14:54:38 +00:00
parent 2c1e71b6ad
commit 2b5f88496c
4 changed files with 40 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
README.md
View File

@ -1,6 +1,6 @@
![catch logo](catch-logo-small.png) ![catch logo](catch-logo-small.png)
*v1.0 build 24 (master branch)* *v1.0 build 25 (master branch)*
Build status (on Travis CI) [![Build Status](https://travis-ci.org/philsquared/Catch.png)](https://travis-ci.org/philsquared/Catch) Build status (on Travis CI) [![Build Status](https://travis-ci.org/philsquared/Catch.png)](https://travis-ci.org/philsquared/Catch)

18
include/internal/catch_default_main.hpp
View File

@ -147,6 +147,24 @@ int main (int argc, char * const argv[]) {
return ret; return ret;
} }
#else // __OBJC__
// Objective-C entry point
int main (int argc, char * const argv[]) {
#if !CATCH_ARC_ENABLED
NSAutoreleasePool * pool = [[NSAutoreleasePool alloc] init];
#endif
Catch::registerTestMethods();
int result = Catch::Session().run( argc, (char* const*)argv );
#if !CATCH_ARC_ENABLED
[pool drain];
#endif
return result;
#endif // __OBJC__ #endif // __OBJC__
#endif // TWOBLUECUBES_CATCH_DEFAULT_MAIN_HPP_INCLUDED #endif // TWOBLUECUBES_CATCH_DEFAULT_MAIN_HPP_INCLUDED

2
include/internal/catch_version.hpp
View File

@ -13,7 +13,7 @@
namespace Catch { namespace Catch {
// These numbers are maintained by a script // These numbers are maintained by a script
Version libraryVersion( 1, 0, 24, "master" ); Version libraryVersion( 1, 0, 25, "master" );
} }
#endif // TWOBLUECUBES_CATCH_VERSION_HPP_INCLUDED #endif // TWOBLUECUBES_CATCH_VERSION_HPP_INCLUDED

23
single_include/catch.hpp
View File

@ -1,6 +1,6 @@
/* /*
* CATCH v1.0 build 24 (master branch) * CATCH v1.0 build 25 (master branch)
* Generated: 2013-12-17 14:45:19.329049 * Generated: 2013-12-17 14:51:52.643587
* ---------------------------------------------------------- * ----------------------------------------------------------
* This file has been merged from multiple headers. Please don't edit it directly * This file has been merged from multiple headers. Please don't edit it directly
* Copyright (c) 2012 Two Blue Cubes Ltd. All rights reserved. * Copyright (c) 2012 Two Blue Cubes Ltd. All rights reserved.
@ -6166,7 +6166,7 @@ namespace Catch {
namespace Catch { namespace Catch {
// These numbers are maintained by a script // These numbers are maintained by a script
Version libraryVersion( 1, 0, 24, "master" ); Version libraryVersion( 1, 0, 25, "master" );
} }
// #included from: catch_text.hpp // #included from: catch_text.hpp
@ -8041,6 +8041,23 @@ int main (int argc, char * const argv[]) {
return ret; return ret;
} }
#else // __OBJC__
// Objective-C entry point
int main (int argc, char * const argv[]) {
#if !CATCH_ARC_ENABLED
NSAutoreleasePool * pool = [[NSAutoreleasePool alloc] init];
#endif
Catch::registerTestMethods();
int result = Catch::Session().run( argc, (char* const*)argv );
#if !CATCH_ARC_ENABLED
[pool drain];
#endif
return result;
#endif // __OBJC__ #endif // __OBJC__
#endif // CATCH_CONFIG_MAIN #endif // CATCH_CONFIG_MAIN