Commit Graph

1007 Commits

Author SHA1 Message Date
Malcolm Noyes
a0c5242d8b Fix python print 2014-03-10 12:37:47 +00:00
Malcolm Noyes
7a6a230f74 Merge build 30 2014-03-10 12:02:14 +00:00
Phil Nash
dd2810d60a build 30
- with Clara fix for null deref crash
2014-03-07 06:58:33 +00:00
Phil Nash
04f994a8fc Updated VS2010 project (removed CmdLineTests.cpp) 2014-03-07 06:53:30 +00:00
Phil Nash
9abb27676d Fix problem (hopefully) with single source definitions from Clara
- define CLARA_CONFIG_MAIN in the right place
2014-03-06 21:53:34 +00:00
Phil Nash
9b4c7fa0f7 Updated cmake file with command line test removal 2014-03-06 08:21:47 +00:00
Phil Nash
8cd1b31931 Merge branch 'master' of github.com:philsquared/Catch
# By David Beckley
# Via David Beckley (1) and Phil Nash (1)
* 'master' of github.com:philsquared/Catch:
  Highlight block as C++
2014-03-06 08:18:06 +00:00
Phil Nash
fd879f7e77 Build 28
- new version of Clara
- removed command line tests
2014-03-06 08:17:24 +00:00
Phil Nash
b9fea75109 New version of Clara.
- updated command line setup with new API
- updated STITCH macros
- force embedded Clara to use Catch’s console width (but restore it after)
- remove command line tests (as these have now moved into the Clara project)
2014-03-06 08:16:06 +00:00
Phil Nash
174ada4caf Merge pull request #251 from ThatOtherPerson/patch-1
Highlight block as C++
2014-03-06 07:42:11 +00:00
David Beckley
e6ee29a925 Highlight block as C++
C++ syntax highlighting was not enabled on one of the blocks.
2014-03-05 16:46:20 -08:00
Malcolm Noyes
3abcb2038c Merge build 27 2014-03-05 09:30:33 +00:00
Phil Nash
1f1ee3c63d New version of Clara
- Clara now built with new stitch script (based on generateSingleInclude)
- also fixed python scripts for python 3 (print now a function rather than a keyword)
2014-03-01 10:38:14 +00:00
Malcolm Noyes
0c71bc3eab Add tests for single include 2014-02-21 14:21:55 +00:00
Malcolm Noyes
434f8c9b9f Refactor to fix single include 2014-02-21 13:04:11 +00:00
Malcolm Noyes
04acaebe74 Update to build 26 2014-02-20 15:49:51 +00:00
Phil Nash
1c2fbe146b build 26 2014-02-11 18:12:41 +00:00
Phil Nash
f899552d52 updated single include test project 2014-02-11 18:12:31 +00:00
Phil Nash
d29cbecfa5 Updated single include generator to allow for embedded micro-libraries 2014-02-11 18:11:37 +00:00
Phil Nash
5845ae94aa Added private assignment operator to fix VS2010 issue
- thanks to Kosta (#239)
2014-02-11 18:11:06 +00:00
Phil Nash
b15726beba Added #include for <memory> to Clara
- thanks again, Martin
2014-02-11 17:45:15 +00:00
Phil Nash
160b74d6c7 … and <stdexcept> 2014-02-11 17:41:11 +00:00
Phil Nash
633feaa4a6 Added #include <algorithm> to clara.h
- thanks Martin
2014-02-11 17:40:11 +00:00
Phil Nash
0dc49d1b57 Extracted stand-alone micro-library, tbc_text_format.h, from catch_text.h.
- use this version in clara.h so clara can stand alone.
2014-02-11 06:32:56 +00:00
Phil Nash
b756243935 Fixed some comments 2014-02-10 17:31:31 +00:00
Phil Nash
c98a97cf90 Tweaked Cliche macros/ names 2014-02-10 17:30:12 +00:00
Phil Nash
4554155e3d Made Clara a “Cliche” header, which will be usable independently of Catch.
- This is just a first step. It still has a dependency on catch_text.h, which also needs to be made a Cliche header.
- These then need their own homes on GitHub.
2014-02-10 17:20:30 +00:00
Malcolm Noyes
b6e8d87c75 Generate single include at build 25 2014-01-23 10:59:52 +00:00
Malcolm Noyes
5cddabdc9c Add overload to 'print' void* correctly 2014-01-23 10:36:40 +00:00
Malcolm Noyes
ba3408b2dc merge from upstream 2014-01-09 07:15:11 +00:00
Phil Nash
7eb5acc183 build 25
- fix for #231
2014-01-08 17:17:31 +00:00
Phil Nash
46a1fc7615 Removed unnecessary union name 2014-01-07 17:43:18 +00:00
Phil Nash
be890d0c15 build 24 2014-01-07 17:26:59 +00:00
Phil Nash
e091018514 Fixes toString() for function pointers and added support for member function pointers.
- thanks to Malcolm Noyes for supplying sample code on which the solution here was based
2014-01-07 17:25:27 +00:00
Malcolm Noyes
17099a0e68 Fix makefile 2014-01-07 06:51:30 +00:00
Phil Nash
440a47011f Convert pointers to integrates when printing.
- handles function pointers that way too (otherwise printed as 1 by gcc and clang)
2014-01-04 19:12:05 +00:00
Malcolm Noyes
af18bcdab7 merge from upstream 2013-12-27 13:55:25 +00:00
Phil Nash
e45e3a139a Clara ignores anything after a lone — (double dash)
- this allows use within an environment that appends additional arguments that Clara will otherwise reject
- generated build 23
2013-12-23 10:24:06 +00:00
Phil Nash
91ef5f7d40 build 22 2013-12-20 19:06:26 +00:00
Phil Nash
886d9d397c Reporter command line parser errors more eagerly
- show all “unrecognised option” errors
2013-12-20 19:06:02 +00:00
Phil Nash
f385a0b13d build 21 2013-12-19 18:42:25 +00:00
Phil Nash
1aa60fada9 Changed Approx::toString() to be implemented in terms of toString( double ) (as proposed in #233) 2013-12-19 18:41:55 +00:00
Malcolm Noyes
9641ec7bb1 Fix build for non VS builds 2013-12-19 16:57:06 +00:00
Malcolm Noyes
cbd3113e6b Refactor some common code, use __LINE__ instead of __COUNTER__ where possible 2013-12-19 16:25:50 +00:00
Phil Nash
fb90d38310 Changed stdout/ stderr messages to be less misleading 2013-12-19 08:07:33 +00:00
Malcolm Noyes
a9e0efdcad merge from upstream 2013-12-18 10:57:16 +00:00
Phil Nash
eb760f689b Build 20 2013-12-18 08:38:33 +00:00
Phil Nash
f6d2fef26b Updated project for OCUnit 2013-12-18 08:37:35 +00:00
Phil Nash
9e529853ee Fixes compiler error for some versions of GCC
- Manual application of PR #196 (couldn’t merge)
- See also #226
2013-12-18 08:37:23 +00:00
Malcolm Noyes
185129ed60 Suppress warning (unreferenced type) at W4 for VS native headers 2013-12-17 12:36:11 +00:00