Commit graph

170 commits

Author SHA1 Message Date
Patrick Johnmeyer
5b34768df0 Prepare v1.5.1 tag 2016-01-29 23:24:21 -06:00
Patrick Johnmeyer
353d3989d3 Delete straggling .vcproj files. 2016-01-29 23:10:38 -06:00
Patrick Johnmeyer
6bfab53a64 Merge pull request #93 from unittest-cpp/uncrustify
Make formatting more consistent
2016-01-29 23:09:26 -06:00
Patrick Johnmeyer
bb7555c718 Tweak preprocessor blocks. 2016-01-29 22:48:36 -06:00
Patrick Johnmeyer
f82c403768 Change preprocessor indent rules. 2016-01-29 22:22:37 -06:00
Patrick Johnmeyer
b47b4f7e85 Add uncrustify config and run first pass. 2016-01-29 22:15:10 -06:00
Patrick Johnmeyer
6e1d0f48ab Fix comment in TestTestRunner.cpp
"Self-recursive" didn't make much sense.
2016-01-29 20:05:53 -06:00
Patrick Johnmeyer
7186084dd8 Merge pull request #92 from unittest-cpp/issue90
Reduce possible timing test failures
2016-01-29 20:03:48 -06:00
Patrick Johnmeyer
44aa33b02b Reduce possible timing test failures
TestFinishIsCalledWithCorrectTime was reliant on SleepMs(20) waking
up before a certain threshold was hit, which is not reliable. This
change uses the actual time of running tests as the top threshold;
not a great improvement but a good quick fix.

Fixes #90
2016-01-29 19:50:23 -06:00
Patrick Johnmeyer
2fc284af64 Merge pull request #87 from rmpowell77/fix-sign-conversion
Adding an explicit cast for the conversion from int to useconds_t in TimeHelpers:::SleepMS.

Fixes #88
2016-01-29 19:32:41 -06:00
Richard Powell
014d6e48f8 adding an explicit cast for the conversion from int to useconds_t in TimeHelpers::SleepMS. 2015-12-16 06:53:06 -08:00
Patrick Johnmeyer
540f6615fb Merge pull request #85 from grahamreeds/master
Removed conditional compile around FixtureDtorThrows structure. Added…
2015-11-17 00:11:30 -06:00
grahamreeds
4fccb76875 Removed conditional compile around FixtureDtorThrows structure. Added a preprocessor block for _MSC_VER noexcept support. 2015-11-12 12:01:07 +00:00
Patrick Johnmeyer
24061e420c Merge pull request #71 from LocutusOfBorg/add-pkgconfig
Add pkg-config file
2015-11-04 20:18:44 -06:00
Patrick Johnmeyer
c5a3903bf9 Prepare v1.5.0 tag. 2015-11-04 12:04:13 -06:00
Patrick Johnmeyer
dc6b908380 Merge pull request #78 from Microsoft/vs2015Support
Vs2015 support
2015-10-15 22:20:22 -05:00
Anna Gringauze
0a14abb0a5 Added support for VS2015 2015-09-22 07:36:28 -07:00
Gianfranco Costamagna
5e52ae70dc
Add pkg config file (with help from Vicente Adolfo Bolea Sánchez) 2015-09-22 08:34:51 +02:00
Patrick Johnmeyer
dab64862c4 Merge pull request #77 from paxos1977/Issue76
Disable tests in TestTestMacros.cpp which throw exceptions from destructors
2015-09-21 22:54:39 -05:00
Patrick Johnmeyer
8741891f85 Merge pull request #69 from bittwiddler1/master
Adding conditional automake directives to allow Win32 compilation on win...
2015-09-21 22:19:05 -05:00
Austin Gilbert
c4e36176d9 Disable tests in TestTestMacros.cpp which throw exceptions from user
defined destructors.

In accordance with the C++11 standard, Visual Studio 2015 adds an implicit
'noexcept' to all user defined destructors. Any destructor throwing an
exception causes abort() to be called on the process.

This commit fixes #76.
2015-09-17 17:28:44 -05:00
Patrick Johnmeyer
ae24d94242 Add travis and appveyor badges to README.md 2015-07-14 20:58:37 -05:00
Patrick Johnmeyer
67013d4b88 Add tiny comment change to trigger Travis. 2015-07-14 20:49:26 -05:00
Patrick Johnmeyer
ab716658dc Merge pull request #70 from hymerman/continuous-integration
Continuous integration
2015-07-14 20:43:29 -05:00
Ben Hymers
76e9982dd4 Add Travis CI configuration file, .travis.yml
Builds using CMAKE then GCC and Clang, in Debug and Release configurations
2015-04-27 09:09:35 +01:00
Ben Hymers
4b8d3a7418 Add AppVeyor configuration file, appveyor.yml
Builds project files with cmake, then builds those with VS2013.
OS is Windows Server 2012.
Debug and Release configurations are both built.
2015-04-27 08:52:29 +01:00
Patrick Johnmeyer
edf1e370ef Updating docs submodule reference. 2015-04-25 02:30:22 -05:00
Saul Beniquez
2d493d8020 Using the $host variable to detect win32 compilers.
This is a more portable solution for platform detection in autoconf.

Tested on Linux, Cygwin and Cygwin-to-Mingw32 cross-compilation.
2015-04-19 18:48:56 -04:00
Saul Beniquez
c0e97bf082 [UnitTest++] Removing a spurrious UnitTest___libUnitTest___la_CPPFLAGS assignment 2015-04-07 12:48:47 -04:00
Saul Beniquez
9257dc7feb Removing duplicated UNITTEST_POSIX #define from cmdline -D flags 2015-04-07 09:34:52 -04:00
Saul Beniquez
7549615b31 Adding conditional automake directives to allow Win32 compilation on win32-mingw/cygwin-mingw systems. 2015-04-07 08:46:20 -04:00
Patrick Johnmeyer
53598bdeb6 Update wiki docs submodule. 2015-04-04 01:58:43 -05:00
Patrick Johnmeyer
2ee151af76 Change unit tests to run as post-build step.
This is how it used to be in most of the old project files. The
CMake conversion required the tests to be run manually after the
build, either by running the binary directly or by calling CTest.
This commit removes the 'dependency' on CTest and restores the
old build process.
2015-04-04 01:31:04 -05:00
Patrick Johnmeyer
bd11339b2d Disable CrashingTests... in debug.
After some consideration I decided to just remove this test in debug
configurations. Many debuggers will behave as XCode does and try to
'catch' this by default. The test still works in release configs.

Fixes #45.
2015-04-04 00:56:40 -05:00
Patrick Johnmeyer
d310c03eea Add missing headers to Makefile.
Closes #42.
2015-04-03 23:27:32 -05:00
Patrick Johnmeyer
db377423a3 Update AUTHORS and configure.ac
AUTHORS now references readme.md for the contributor list
and identifies pjohnmeyer@gmail.com as the maintainer.

configure.ac was modified to version 1.4.1 to differentiate
between 1.4 and HEAD, and to prepare for the upcoming 1.5.

Fixes #55.
2014-12-19 11:51:26 -06:00
Patrick Johnmeyer
59f2f901a3 Merge pull request #61 from pjohnmeyer/remove_project_files
Remove VS and XCode project files.

Resolves #47 and relates to #42.
2014-11-14 22:27:33 -06:00
Patrick Johnmeyer
19fd65743b Remove lurking tests/*.vcproj files. 2014-11-08 00:24:51 -06:00
Patrick Johnmeyer
493c05527e Remove all Visual Studio 6 project files. 2014-11-07 23:49:58 -06:00
Patrick Johnmeyer
719a6e4bf5 Remove vs_projects and xcode_projects 2014-11-07 23:47:37 -06:00
Patrick Johnmeyer
1fe3d72776 Reformatted code from #54. 2014-06-27 22:42:53 -05:00
Patrick Johnmeyer
7459844be1 Merge branch 'novawave-master' 2014-06-27 22:37:25 -05:00
Nathan Lapierre
6ea2db4cb1 keep absolute path 2014-06-05 02:07:49 -03:00
Nathan Lapierre
7b47f1c59a fix broken tests 2014-06-05 02:06:44 -03:00
Patrick Johnmeyer
f250db3376 Merge pull request #53 from warmist/patch-1
Fix crash bug in msvc
2014-01-15 19:58:20 -08:00
warmist
1fdc44246d Fix crash bug in msvc
fprintf had incorrect number of arguments.
2014-01-06 14:02:59 +02:00
Patrick Johnmeyer
311f4df4eb Replace absolute paths with relative paths in Visual Studio project files (untested). 2013-08-23 22:36:50 -05:00
Patrick Johnmeyer
04a6094d63 Merge pull request #48 from magicant/autotools
Fix autotools configuration
2013-07-22 07:13:26 -07:00
Patrick Johnmeyer
4661f377da Merge pull request #46 from lijoantony/master
Integrating test failures into QTCreator IDE build errors
2013-07-22 07:12:57 -07:00
WATANABE Yuki
cda955dee4 Fix autotools configuration
* Add some headers to the list of installed files.
* Specify the "foreign" strictness so that automake does not complain
  about missing files.
* Specify a directory for m4 macros as suggested by libtoolize.
* Add autotools-generated files to gitignore.
2013-07-20 13:27:19 +09:00