Commit Graph

1459 Commits

Author SHA1 Message Date
Phil Nash
584032dfa4 dev build 4
- undisturbed background colour (windows), from PR #456
2015-07-06 06:23:13 +01:00
Phil Nash
18acff62d3 Merge branch 'develop' of git://github.com/RandomInEqualities/Catch into RandomInEqualities-develop 2015-07-06 06:13:56 +01:00
Phil Nash
c1ca0fdabe dev build 3 2015-07-03 18:30:25 +01:00
Phil Nash
d6f1446e4e Fixed an issue on some compilers with implicit conversion from nullptr to Ptr
- also cleaned up some warnings to do with CATCH_NULL
2015-07-03 18:27:36 +01:00
Phil Nash
62e517f833 Fixed backslash detection in filenames-as-tags 2015-07-03 18:07:13 +01:00
csa
6160a2b079 Fix for white background in windows powershell when using colour output.
This commit fixes the white background that appears in windows powershell
when catch outputs messages with colour. The previous implementation
ignored the original background colour and defaulted to a white background.
2015-07-03 12:02:40 +02:00
Phil Nash
8f66e3495b dev build 2 2015-07-02 23:03:13 +01:00
Phil Nash
d87e551efa reseeds rng before each test case and provides access to seed through Catch::rngSeed() function 2015-07-02 23:02:35 +01:00
Phil Nash
b971fe785b develop build 1 2015-07-02 08:21:38 +01:00
Phil Nash
088c5bc53e --filenames-as-tags 2015-07-02 08:20:18 +01:00
Phil Nash
680b1a881b Squashed some warnings about local variables shadowing members
- see #444
2015-07-01 07:50:53 +01:00
Phil Nash
805de43a3d Use CATCH_NULL instead of NULL
- expands to nullptr if CATCH_CONFIG_CPP11_NULLPTR is defined (see #444)
2015-07-01 07:33:27 +01:00
Phil Nash
3b18d9e962 build for v1.2.1 2015-06-30 18:26:09 +01:00
Phil Nash
6d5797231c Split imply from TrackedSection class to avoid use of incomplete type
- see #450
2015-06-30 18:25:49 +01:00
Phil Nash
804896cdfa Fixed approval tests script for new version number formatting 2015-06-30 18:24:59 +01:00
Phil Nash
7ab3b5aefb Added compiler feature suppression macros
_NO_ forms to disable detection of features - particularly C++11 features.
Also removed SFINAE detection (and use in tostring)
2015-06-30 08:41:55 +01:00
Phil Nash
21f7ef6fdc Committed to semantic versioning
as prompted by #365, #430, #447 and a thread on the google group.
- split version bumping out of generateSingleHeader script
- separate scripts for bumping each version component
- "build" number only incremented for "develop" builds
2015-06-29 18:06:15 +01:00
Phil Nash
f5fef1ebed Fixed readme to not refer to develop branch 2015-06-29 18:06:14 +01:00
Phil Nash
8cc1108f2b Use <= operator instead of ->* for decomposer
Allows more complex LHS expressions - and works around an Eclipse bug.
See Issues #359, #393 and #247 for details
2015-06-26 06:46:37 +01:00
Phil Nash
c51e86819d build 3 2015-05-21 06:16:15 +01:00
Phil Nash
fc63b020c5 suppressed some more warnings 2015-05-21 06:15:53 +01:00
Phil Nash
6ed74b5cab changed hex threshold on ints to 255
- and print it in *addition* to the decimal form
2015-05-20 18:28:22 +01:00
Phil Nash
bdbfe69e3c Merge branch 'master' of github.com:philsquared/Catch 2015-05-20 18:13:15 +01:00
Phil Nash
605d870384 Updated toString docs with StringMaker 2015-05-20 18:12:40 +01:00
Phil Nash
a55c1cfb97 Merge pull request #380 from socantre/master
s/ran/run
2015-05-20 06:27:00 +01:00
Phil Nash
43470b2606 Removed CATCH_CONFIG_CPP11_NULLPTR for VS2015
- as it was already there for VS2010 on
2015-05-19 22:38:30 +01:00
Phil Nash
318c936712 build 2 2015-05-19 22:31:57 +01:00
Phil Nash
e86daf8bdd Reorganised C+11 feature detection a bit
and added CATCH_CONFIG_CPP11_NULLPTR for VS2015
2015-05-19 22:31:57 +01:00
Phil Nash
bfa3f863d6 Removed some more warnings 2015-05-19 18:23:52 +01:00
Phil Nash
2946c1988c Added comments on multi-file tests to tutorial
Prompted by PR #397 (and a lot of support history!) - added some comments on how to move beyond "everything in a single file"
2015-05-18 18:40:58 +01:00
Phil Nash
797592009e Merge pull request #404 from adzenith/patch-1
Fix typo in tutorial.md
2015-05-18 18:18:33 +01:00
Phil Nash
702cbc191a Merge branch 'BMBurstein-develop' 2015-05-18 18:13:17 +01:00
Phil Nash
2fc9de9370 Updated approvals following merge of develop back to master 2015-05-18 18:11:58 +01:00
Phil Nash
c708570d46 Merge branch 'develop' of git://github.com/BMBurstein/Catch into BMBurstein-develop 2015-05-18 08:38:50 +01:00
Baruch
465454fecc Fix REQUIRE_FALSE so that it aborts test case 2015-04-29 13:54:47 +03:00
Nikolaus Wittenstein
65953871fc Fix typo in tutorial.md 2015-04-20 19:49:40 -04:00
Phil Nash
35f4266d00 Merge branch 'develop' 2015-03-27 20:49:32 +00:00
Phil Nash
4af4405ce1 Fixed a missing ), as per PR #363 and PR #390 2015-03-27 18:23:02 +00:00
Phil Nash
37e556186c v1.1 build 1 (master)
Updated version for master and regenerated single include
2015-03-27 18:02:28 +00:00
Phil Nash
a21fb80edb Ignore *.xccheckout 2015-03-27 17:55:13 +00:00
Phil Nash
d9fbc62093 Merged from develop 2015-03-27 17:54:45 +00:00
socantre
dd460f0085 s/ran/run 2015-03-07 16:09:36 -05:00
Phil Nash
0ae7578028 Restored tag parsing when checking for reserved tags
- had been accidentally deleted in an earlier refactoring.
A bit worrying that this didn't get spotted sooner!
2015-03-04 19:01:25 +00:00
Phil Nash
090c74c420 Use reinterpret_cast to eliminate some warnings
#369
2015-03-04 19:00:29 +00:00
Phil Nash
572911d880 Changed comment to work around header stitching bug 2015-03-04 18:33:31 +00:00
Phil Nash
a806c3e700 Build 14 2015-03-04 08:23:40 +00:00
Phil Nash
856468c8c4 Rebased to include new --force-colour tests 2015-03-04 08:22:32 +00:00
Phil Nash
036265947c Merge branch 'peterhuene-develop' into develop 2015-03-04 08:06:36 +00:00
Phil Nash
6d1da8e8d7 Merge branch 'develop' of git://github.com/peterhuene/Catch into peterhuene-develop 2015-03-04 08:06:04 +00:00
Phil Nash
ce0b170dc2 Suppress warnings correctly for Intel compiler
#376
2015-03-04 07:54:35 +00:00