489 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
Phil Nash	f0f407fc3e	Manually applied merge #133 from Master	2012-10-31 18:28:21 +00:00
Phil Nash	355b95fda1	Cleaned up ANSI colour code impl a bit	2012-10-31 18:04:22 +00:00
Phil Nash	778f9c4fc7	Removed "no-" from Wno-global-constructors when disabling	2012-10-30 09:09:30 +00:00
Phil Nash	5efa4bcb8a	Regenerated single_include	2012-10-29 20:49:22 +00:00
Phil Nash	108f1937d8	Added terminal colour codes for POSIX ... With thanks to Adam Strzelecki	2012-10-29 20:46:45 +00:00
Phil Nash	8f4cc541d5	Added regression test baselines	2012-10-29 19:55:34 +00:00
Phil Nash	2e203a1834	Fixed remaining reporting regressions	2012-10-29 19:55:13 +00:00
Phil Nash	134e45b3ad	Fixed #132	2012-10-28 20:57:21 +00:00
Phil Nash	2f92db9898	Updated the readme specifically for the Integration branch	2012-10-28 12:15:34 +00:00
Phil Nash	82acc2ca05	Regenerated single include	2012-10-28 12:07:17 +00:00
Phil Nash	fe1d7c1d08	Small fixes and tweaks	2012-10-28 10:27:44 +00:00
Phil Nash	355b5e546d	Some tidy-up	2012-10-26 09:05:36 +01:00
Phil Nash	f847186ebb	AssertionResultBuilder -> ExpressionResultBuilder	2012-10-26 08:45:23 +01:00
Phil Nash	8cca2f1369	ExpressionBuilder ->ExpressionDecomposer ... Expression -> ExpressionLhs	2012-10-24 22:09:01 +01:00
Phil Nash	e04e74f896	More AssertionResult refactoring	2012-10-24 21:59:47 +01:00
Phil Nash	1dd56d4d2b	AssertionResultBuilder can be constructed from result type	2012-10-19 08:01:34 +01:00
Phil Nash	f2d5f1b3e4	Expression has its own result builder - not passed in from expression builder	2012-10-19 08:01:05 +01:00
Phil Nash	e3b111a39a	streamlined acceptResult	2012-10-18 22:59:16 +01:00
Phil Nash	3ad13256e1	Refactored assertion builder stuff out of expression builder	2012-10-18 08:39:44 +01:00
Phil Nash	c96f9330a0	Collect assertion info up front	2012-10-17 08:14:22 +01:00
Phil Nash	a5fa78284d	ResultData -> AssertionResultData	2012-10-16 08:33:13 +01:00
Phil Nash	c597a893fa	ResultInfo -> AssertionResult filenames and variables	2012-10-16 08:31:05 +01:00
Phil Nash	d16955f63a	Renamed ResultInfo -> AssertionResult	2012-10-16 08:27:21 +01:00
Phil Nash	175da3ef64	regen test 3	2012-10-12 18:39:22 +01:00
Phil Nash	190fe09be5	regen test 2	2012-10-12 18:18:14 +01:00
Phil Nash	813a13caed	Regenerated to test branch	2012-10-12 08:05:45 +01:00
Phil Nash	9444bbcb7b	Added AllOf and AnyOf matchers	2012-10-12 07:58:17 +01:00
Phil Nash	9902ac9f1a	Cleaned up ResultInfoBuilder a bit	2012-10-09 20:58:33 +01:00
Phil Nash	71edf8b727	isNot -> isFalse	2012-10-09 11:59:11 +01:00
Phil Nash	6730512afa	Refactoring ResultData out of ResultInfo/ Builder pt2	2012-10-09 11:48:55 +01:00
Phil Nash	86e1915099	Refactoring ResultData out of ResultInfo/ Builder pt1	2012-10-05 18:35:01 +01:00
Phil Nash	47f679ef21	Disabled WIP code	2012-10-04 08:19:09 +01:00
Phil Nash	803f6b7e4b	Added SCOPED_CAPTURE	2012-10-04 08:14:48 +01:00
Phil Nash	36d0da0194	Started refactoring ResultInfo/Builder	2012-10-04 08:09:09 +01:00
Phil Nash	4104fb735e	Random bits of clean-up	2012-10-03 18:12:57 +01:00
Phil Nash	9e7e63c687	Regenerated single include	2012-09-29 20:54:03 +01:00
Phil Nash	e82b564c3a	Merge branch 'master' of github.com:philsquared/Catch	2012-09-29 20:35:14 +01:00
Phil Nash	45c6c1030a	Merge pull request #121 from godlygeek/include-guard-fixes ... Normalize include guards for all *.h and *.hpp	2012-09-29 12:34:40 -07:00
Phil Nash	4b93fb81b5	Added some surrogate cpps ... (and fixed up missing includes they uncovered)	2012-09-28 19:21:14 +01:00
Matt Wozniski	07e20aa706	Merge remote-tracking branch 'phil' into include-guard-fixes ... Conflicts: single_include/catch.hpp	2012-09-26 21:42:44 -04:00
Phil Nash	67ec8709ea	First cut of command line support for tags	2012-09-26 18:38:26 +01:00
Phil Nash	c4160e9ef8	Fixed alternate stream bugs	2012-09-26 18:36:58 +01:00
Phil Nash	60fb60f5e0	Updated help help	2012-09-25 07:43:37 +01:00
Phil Nash	e561eec001	Merge branch 'master' of github.com:philsquared/Catch ... Conflicts: single_include/catch.hpp	2012-09-24 08:40:01 +01:00
Phil Nash	799ecf9604	Regenerated single include	2012-09-24 08:30:13 +01:00
Phil Nash	ec2fccf6b8	Fixed SCOPED_INFO (#123)	2012-09-24 08:28:23 +01:00
Phil Nash	5f66d1d001	Added cleanup as per #125	2012-09-21 18:44:22 +01:00
Phil Nash	85c0e3d42b	Tag command line parsing implementation	2012-09-21 07:48:03 +01:00
Phil Nash	1840929c51	Regenerated header	2012-09-20 08:36:38 +01:00
Phil Nash	9d8570ff80	Removed spurious files	2012-09-20 08:20:06 +01:00