Phil Nash 
							
						 
					 
					
						
						
							
						
						a2bff4877e 
					 
					
						
						
							
							Merge branch 'master' of git://github.com/AIM360/Catch  
						
						 
						
						
						
						
					 
					
						2013-10-21 08:43:40 +01:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Phil Nash 
							
						 
					 
					
						
						
							
						
						cb7b4ecbdc 
					 
					
						
						
							
							Updated VS2010 project  
						
						 
						
						
						
						
					 
					
						2013-10-21 08:31:17 +01:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Phil Nash 
							
						 
					 
					
						
						
							
						
						aafed303bb 
					 
					
						
						
							
							Added an extra tag test  
						
						 
						
						
						
						
					 
					
						2013-10-17 18:02:09 +01:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Phil Nash 
							
						 
					 
					
						
						
							
						
						a35ee200da 
					 
					
						
						
							
							Filter out version number from approval tests  
						
						 
						
						
						
						
					 
					
						2013-09-30 08:05:14 +01:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Phil Nash 
							
						 
					 
					
						
						
							
						
						16c21ee265 
					 
					
						
						
							
							No, really trim paths in approval tests down to just filenames  
						
						 
						
						
						
						
					 
					
						2013-09-30 08:01:10 +01:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Phil Nash 
							
						 
					 
					
						
						
							
						
						1e74938538 
					 
					
						
						
							
							Trim paths in approval tests down to filenames  
						
						 
						
						
						
						
					 
					
						2013-09-30 07:39:06 +01:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Phil Nash 
							
						 
					 
					
						
						
							
						
						2f7a296897 
					 
					
						
						
							
							Split approve file into multiple files  
						
						 
						
						
						
						
					 
					
						2013-09-27 19:01:14 +01:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Phil Nash 
							
						 
					 
					
						
						
							
						
						345a4eab9b 
					 
					
						
						
							
							Removed outdated Xcode 3 project  
						
						 
						
						
						
						
					 
					
						2013-09-26 07:30:49 +01:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Phil Nash 
							
						 
					 
					
						
						
							
						
						41b27af45b 
					 
					
						
						
							
							Fix for comma separated tags on the command line  
						
						 
						
						... 
						
						
						
						- also added more test for tags 
						
						
					 
					
						2013-09-25 18:40:07 +01:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Phil Nash 
							
						 
					 
					
						
						
							
						
						649cd13c4d 
					 
					
						
						
							
							Upgraded project for latest Xcode  
						
						 
						
						
						
						
					 
					
						2013-09-24 07:42:08 +01:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Phil Nash 
							
						 
					 
					
						
						
							
						
						1e2f1d1603 
					 
					
						
						
							
							Fixes toString forward reference issue:  
						
						 
						
						... 
						
						
						
						- as raised in https://github.com/philsquared/Catch/pull/195  
						
						
					 
					
						2013-09-14 19:58:45 +01:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Phil Nash 
							
						 
					 
					
						
						
							
						
						f7378eebb6 
					 
					
						
						
							
							Fixed string indexing bug  
						
						 
						
						
						
						
					 
					
						2013-09-07 12:07:38 +01:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Phil Nash 
							
						 
					 
					
						
						
							
						
						638cf9feb4 
					 
					
						
						
							
							Separated out catch_platform.h  
						
						 
						
						
						
						
					 
					
						2013-08-16 19:08:39 +01:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Phil Nash 
							
						 
					 
					
						
						
							
						
						46118714b1 
					 
					
						
						
							
							Build 8  
						
						 
						
						... 
						
						
						
						- includes command line tweaks and fixes for durations 
						
						
					 
					
						2013-08-16 19:01:32 +01:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Phil Nash 
							
						 
					 
					
						
						
							
						
						1870ca8455 
					 
					
						
						
							
							Some Clara/ command line clean-up and tweaks  
						
						 
						
						
						
						
					 
					
						2013-08-16 18:57:57 +01:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Phil Nash 
							
						 
					 
					
						
						
							
						
						3faa412855 
					 
					
						
						
							
							Removed basic reporter  
						
						 
						
						
						
						
					 
					
						2013-08-15 19:09:07 +01:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Phil Nash 
							
						 
					 
					
						
						
							
						
						11b5179ceb 
					 
					
						
						
							
							Redacted test durations from JUnit reporter output in approval test script  
						
						 
						
						
						
						
					 
					
						2013-08-15 18:50:40 +01:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Phil Nash 
							
						 
					 
					
						
						
							
						
						2ddb9d3802 
					 
					
						
						
							
							Completed CumulativeReporterBase and reimplemented JUnitReporter in terms of it  
						
						 
						
						
						
						
					 
					
						2013-08-15 18:39:55 +01:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Phil Nash 
							
						 
					 
					
						
						
							
						
						29ccaa67ad 
					 
					
						
						
							
							Replaced currentSectionInfo and m_rootSection with m_sectionStack  
						
						 
						
						
						
						
					 
					
						2013-08-08 08:05:19 +01:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Phil Nash 
							
						 
					 
					
						
						
							
						
						6339254cb2 
					 
					
						
						
							
							First cut of Timer class.  
						
						 
						
						... 
						
						
						
						- started integrating with reporters (now (optionally) supported in console reporter).
- introduced Node<> template to help with cumulative reporting and used it instead of ThreadedSectionInfo. 
						
						
					 
					
						2013-08-07 18:56:35 +01:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Kosta 
							
						 
					 
					
						
						
							
						
						ba24e51306 
					 
					
						
						
							
							cmake: call SelfTest exe instead of approvalTests script  
						
						 
						
						... 
						
						
						
						Just call the SelfTest executable directly for testing, since there seems to be a problem with the approval tests python script right now. 
						
						
					 
					
						2013-08-05 13:44:37 +02:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Kosta 
							
						 
					 
					
						
						
							
						
						c4863842c8 
					 
					
						
						
							
							more approval tests script debugging  
						
						 
						
						
						
						
					 
					
						2013-08-05 13:29:42 +02:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Kosta 
							
						 
					 
					
						
						
							
						
						5553a538c5 
					 
					
						
						
							
							tweak CMakeLists.txt  
						
						 
						
						
						
						
					 
					
						2013-08-05 12:57:29 +02:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Kosta 
							
						 
					 
					
						
						
							
						
						ce441a9ba5 
					 
					
						
						
							
							initial checkin of cmake and travis config files  
						
						 
						
						
						
						
					 
					
						2013-08-05 12:43:51 +02:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Phil Nash 
							
						 
					 
					
						
						
							
						
						b80280f428 
					 
					
						
						
							
							Tidied up reporting of missing assertions in test cases  
						
						 
						
						... 
						
						
						
						- also removed basic reporter from approval test 
						
						
					 
					
						2013-07-26 19:19:44 +01:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Phil Nash 
							
						 
					 
					
						
						
							
						
						28d3881ff9 
					 
					
						
						
							
							Merged TestCaseTracker and SectionTracker and introduced TestCaseTracker::Guard  
						
						 
						
						
						
						
					 
					
						2013-07-25 08:07:55 +01:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Phil Nash 
							
						 
					 
					
						
						
							
						
						ee647f5099 
					 
					
						
						
							
							Removed displaced RunningTest class  
						
						 
						
						
						
						
					 
					
						2013-07-25 07:49:00 +01:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Phil Nash 
							
						 
					 
					
						
						
							
						
						9aff9aa328 
					 
					
						
						
							
							Integrated new section tracker.  
						
						 
						
						... 
						
						
						
						- also pass extra section to reporter - one for each test case - ignore it in headers
  (this is so we know a test case has restarted)
- significant effect on regression test due to change of ordering of sections
- fixes infinite loop issue 
						
						
					 
					
						2013-07-24 19:13:08 +01:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Phil Nash 
							
						 
					 
					
						
						
							
						
						6a484fdb02 
					 
					
						
						
							
							Reworked SectionTracker and moved into own header  
						
						 
						
						
						
						
					 
					
						2013-07-23 18:48:36 +01:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Phil Nash 
							
						 
					 
					
						
						
							
						
						372a6c6fed 
					 
					
						
						
							
							Small fixes and started new section tracking code  
						
						 
						
						
						
						
					 
					
						2013-07-23 08:15:34 +01:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Phil Nash 
							
						 
					 
					
						
						
							
						
						ad7445d33c 
					 
					
						
						
							
							build 5  
						
						 
						
						... 
						
						
						
						- added throw() to streambuf destructor overrides (#182 ) 
						
						
					 
					
						2013-07-02 08:49:29 +01:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Phil Nash 
							
						 
					 
					
						
						
							
						
						3907559896 
					 
					
						
						
							
							build 4  
						
						 
						
						
						
						
					 
					
						2013-07-01 19:02:29 +01:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Phil Nash 
							
						 
					 
					
						
						
							
						
						109f46a48b 
					 
					
						
						
							
							Fixed broken test  
						
						 
						
						
						
						
					 
					
						2013-07-01 19:00:55 +01:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Phil Nash 
							
						 
					 
					
						
						
							
						
						066a6388d6 
					 
					
						
						
							
							Fix for  #179  
						
						 
						
						
						
						
					 
					
						2013-07-01 18:45:19 +01:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Phil Nash 
							
						 
					 
					
						
						
							
						
						4b5e008b20 
					 
					
						
						
							
							guard NOMINMAX definition (windows)  
						
						 
						
						
						
						
					 
					
						2013-06-29 20:31:17 +01:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Phil Nash 
							
						 
					 
					
						
						
							
						
						cd688300b0 
					 
					
						
						
							
							Build 2  
						
						 
						
						
						
						
					 
					
						2013-06-29 12:11:32 +01:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Phil Nash 
							
						 
					 
					
						
						
							
						
						5d26ca1af7 
					 
					
						
						
							
							Static assertion for && and || expressions  
						
						 
						
						
						
						
					 
					
						2013-06-29 12:07:33 +01:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Phil Nash 
							
						 
					 
					
						
						
							
						
						a9b346b14d 
					 
					
						
						
							
							Removed line numbers from approval tests of xml too  
						
						 
						
						
						
						
					 
					
						2013-06-29 12:04:38 +01:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Phil Nash 
							
						 
					 
					
						
						
							
						
						40b8c7794c 
					 
					
						
						
							
							Removed line numbers from approval tests  
						
						 
						
						
						
						
					 
					
						2013-06-29 11:59:49 +01:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Phil Nash 
							
						 
					 
					
						
						
							
						
						b5fd5a6496 
					 
					
						
						
							
							INFO and CAPTURE are now scoped  
						
						 
						
						... 
						
						
						
						- SCOPED_INFO and SCOPED_CAPTURE are now just aliases 
						
						
					 
					
						2013-06-28 17:09:57 +01:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Phil Nash 
							
						 
					 
					
						
						
							
						
						0d357302a0 
					 
					
						
						
							
							INFOs only reset at assertion if consumed  
						
						 
						
						
						
						
					 
					
						2013-06-28 16:25:49 +01:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Phil Nash 
							
						 
					 
					
						
						
							
						
						239fa28e46 
					 
					
						
						
							
							Added run without -s to approvals  
						
						 
						
						
						
						
					 
					
						2013-06-28 16:23:14 +01:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Phil Nash 
							
						 
					 
					
						
						
							
						
						47751e4df3 
					 
					
						
						
							
							Approved [.] change  
						
						 
						
						
						
						
					 
					
						2013-06-28 16:07:42 +01:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Phil Nash 
							
						 
					 
					
						
						
							
						
						9c39a5e8dd 
					 
					
						
						
							
							Support [.] as alias for [hide]  
						
						 
						
						
						
						
					 
					
						2013-06-28 16:05:13 +01:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Phil Nash 
							
						 
					 
					
						
						
							
						
						235204393a 
					 
					
						
						
							
							Big merge from Integration  
						
						 
						
						... 
						
						
						
						- now v1.0 build 1 
						
						
					 
					
						2013-06-28 14:11:28 +01:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Phil Nash 
							
						 
					 
					
						
						
							
						
						5b15c21c9c 
					 
					
						
						
							
							Fixed iTChRunner  
						
						 
						
						
						
						
					 
					
						2013-06-12 19:05:21 +01:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Phil Nash 
							
						 
					 
					
						
						
							
						
						c57ebc84b2 
					 
					
						
						
							
							Approved latest changes  
						
						 
						
						
						
						
					 
					
						2013-06-05 08:20:34 +01:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Phil Nash 
							
						 
					 
					
						
						
							
						
						cb60d130f8 
					 
					
						
						
							
							Runner -> RunContext, Runner2 -> Runner and fixed issue with processName  
						
						 
						
						
						
						
					 
					
						2013-06-05 08:18:52 +01:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Phil Nash 
							
						 
					 
					
						
						
							
						
						2ed56c47a6 
					 
					
						
						
							
							Removed legacy cli parser  
						
						 
						
						
						
						
					 
					
						2013-06-04 08:38:40 +01:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Phil Nash 
							
						 
					 
					
						
						
							
						
						aee9b75e37 
					 
					
						
						
							
							Now fully switched over to Clara-based command line with modified args  
						
						 
						
						
						
						
					 
					
						2013-06-04 08:37:28 +01:00