Phil Nash
dd22431fea
Merge branch 'develop' of github.com:philsquared/Catch into develop
...
# By Andy Sawyer
# Via Andy Sawyer (1) and Phil Nash (1)
* 'develop' of github.com:philsquared/Catch:
catch_tostring: tostring for enum class types
SelfTest: Build as C++11, add EnumToString tests
SelfTest: refresh makefile
2014-09-03 08:40:07 +01:00
Phil Nash
9721296694
Merge pull request #318 from PureAbstract/enum_to_string
...
Enum to string (for #317 )
2014-09-03 08:36:24 +01:00
Phil Nash
3eefa7f537
use nullptr in MSVC from 2005+
...
(based on PR #307 - thanks alex85k)
2014-09-02 08:30:57 +01:00
Andy Sawyer
fdbbb2c9bd
Updated CMakeLists.txt for toString work
2014-09-01 18:27:29 +01:00
Andy Sawyer
abf9ffc982
A bunch of Catch::toString tests
2014-09-01 18:09:37 +01:00
Andy Sawyer
cd2a5aa688
catch_tostring: tostring for enum class types
2014-09-01 17:38:17 +01:00
Andy Sawyer
142f8f4b1e
SelfTest: Build as C++11, add EnumToString tests
...
Note: EnumToString tests currently fail - haven't made the changes to
catch_tostring yet.
2014-09-01 17:24:45 +01:00
Andy Sawyer
000e746415
SelfTest: refresh makefile
2014-09-01 17:21:14 +01:00
Phil Nash
341a9c4443
Merge branch 'master' of github.com:philsquared/Catch into develop
...
# By Andy Balaam
# Via Phil Nash (2) and Andy Balaam (1)
* 'master' of github.com:philsquared/Catch:
Fix a typo (missing "n")
Conflicts:
README.md
include/internal/catch_version.hpp
single_include/catch.hpp
2014-08-22 19:36:53 +01:00
Phil Nash
93b61e1194
v1.1 build 2 (develop branch)
...
- Signal hander support
2014-08-22 19:35:41 +01:00
Phil Nash
05743eeaa1
FatalErrorConditions now full close reporter states
...
- so the console reporter(s) show final summary and the xml reporters close their tags
2014-08-22 19:33:28 +01:00
Phil Nash
85d33e2cbd
Merge pull request #306 from andybalaam/master
...
Fix a typo (missing "n")
2014-08-22 19:21:45 +01:00
Andy Balaam
389f3f5be8
Fix a typo (missing "n")
2014-08-22 15:18:33 +01:00
Phil Nash
cb8fe472b2
Approvals for develop branch
2014-08-22 08:13:47 +01:00
Phil Nash
8edf4bf5d3
Removed signal handler test, for now
...
(to avoid screwing up the approval tests)
2014-08-22 08:13:15 +01:00
Phil Nash
c1a8e1c5dd
Added signal handlers (and placeholder for SEH handlers)
...
- based on PR 232 (https://github.com/philsquared/Catch/pull/232 - thanks Lukasz Forynski)
- Writes to reporter, so gets all the usual context, but then exits directly (since the stack cannot be resumed) so no summary
- On Windows does nothing, as yet.
2014-08-22 08:07:39 +01:00
Phil Nash
4f4b44e3a2
Merge branch 'develop' of github.com:philsquared/Catch
...
Tweaked wording around ability to do BDD
2014-08-21 07:25:27 +01:00
Phil Nash
aa31d1c275
Merge branch 'master' of github.com:philsquared/Catch into develop
...
* 'master' of github.com:philsquared/Catch:
Updated “contributing” docs to reflect new develop branch
2014-08-21 07:23:45 +01:00
Phil Nash
b3ece7e75d
Tweaked wording around ability to do BDD
2014-08-21 07:22:35 +01:00
Phil Nash
b7e432eadc
Updated version for develop branch
2014-08-20 19:07:46 +01:00
Phil Nash
76edbc104c
Updated “contributing” docs to reflect new develop branch
2014-08-20 19:03:31 +01:00
Phil Nash
6e00e5e86f
Merge branch 'master' of github.com:philsquared/Catch
...
# By Martin Moene
# Via Martin Moene
* 'master' of github.com:philsquared/Catch:
Added bundled compact reporter
Fixed link to reference section
2014-08-20 08:11:04 +01:00
Phil Nash
544bf33e73
build 53
...
includes wchar_t toString overloads and SCENARIO_METHOD macros
2014-08-20 08:09:32 +01:00
Phil Nash
8b5a4e9355
Added approvals for new tests
2014-08-20 08:08:13 +01:00
Martin Moene
3e025cc2b6
Added bundled compact reporter
2014-08-19 23:43:51 +02:00
Martin Moene
487dfadcf1
Fixed link to reference section
2014-08-19 09:25:25 +02:00
Phil Nash
4aaf67ff31
const_casts to get rid of warnings in new wchar_t tests
2014-08-19 08:16:44 +01:00
Phil Nash
7bc0b44597
Merge branch 'master' of https://github.com/jbrwilkinson/Catch
...
# By James Wilkinson
# Via James Wilkinson
* 'master' of https://github.com/jbrwilkinson/Catch :
Added SCENARIO_METHOD for BDD testing with fixtures.
2014-08-19 08:13:30 +01:00
Phil Nash
bcbd0cbbc2
Merge pull request #302 from johannesmoene/doc-index
...
Add Readme as documentation entry
2014-08-19 07:44:34 +01:00
Martin Moene
e35f862653
Fixed link to blog post
2014-08-19 07:34:00 +02:00
Martin Moene
d59fd53e7e
Update link in tutorial
2014-08-15 14:30:38 +02:00
Martin Moene
6336bb1b6e
Add Readme as documentation entry
2014-08-15 14:12:53 +02:00
Phil Nash
ee83a6f006
Merge pull request #301 from bena/master
...
toString handles wchar_t raw strings
2014-08-15 08:14:08 +01:00
Ben Arnold
c7cf0a9f8b
Catch's Travis builds are using gcc that doesn't like the auto keyword
2014-08-14 12:53:21 +01:00
Ben Arnold
7b0a84a048
toString handles wchar_t raw strings
2014-08-14 12:28:23 +01:00
Phil Nash
08dc8458c0
Updated docs on slow compiles
2014-07-30 19:06:26 +01:00
Phil Nash
0aae635035
Re-enable warnings disabled for GCC
2014-07-28 07:27:05 +01:00
Fabien Caylus
ae76945eaf
Hide warnings with GCC
2014-07-27 15:16:10 +02:00
Phil Nash
6880a0c909
Added FAQ on slow compiles to docs
2014-07-21 19:00:02 +01:00
Phil Nash
785db43bb2
Fixed issue with single include generator
...
- well, partially. The problem is it is matching /* … */ comments by assuming the intervening lines begin with whitespace followed by a *. This avoids it having to maintain extra state, but makes it brittle.
It was matching *it = " " + *it; as a comment!
It now matches on a single space followed by a * and this seems to work for now - but it probably needs to move to proper stateful comment handling.
2014-07-11 07:45:41 +01:00
James Wilkinson
63005a1d89
Added SCENARIO_METHOD for BDD testing with fixtures.
2014-07-10 10:22:20 +01:00
Phil Nash
ca42b2c585
Manual fix for generation error
2014-07-10 09:18:50 +01:00
Phil Nash
28c2e07879
build 52
2014-07-09 19:22:49 +01:00
Phil Nash
3ff3acf46c
Approvals for last change
2014-07-09 19:21:44 +01:00
Phil Nash
76f80a670b
More summary formatting tweaks
2014-07-09 19:20:24 +01:00
Phil Nash
cab9141eec
Green summary bar is darker if not all passed
...
- and the green part now comes at the end (to emphasise the failures)
2014-07-09 18:24:24 +01:00
Phil Nash
d89e74faff
Format floats like doubles when printing - but add ‘f’ suffix (a lá #291 )
2014-07-09 18:16:40 +01:00
Phil Nash
ce56209250
build 51
2014-07-09 07:40:37 +01:00
Phil Nash
23181eeef0
Section no longer relies on copy-elision for correctness
...
- should address #293
- *may* address #271
2014-07-09 07:39:57 +01:00
Phil Nash
a469d9bc0f
Made Colour copyable to remove warning
2014-07-09 07:36:12 +01:00
