Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
173 commits
Select commit Hold shift + click to select a range
fe0b8a4
Fix broken vcproj files for VS2005 and VS2008
Jul 26, 2013
cad1351
Add <AtomicCount.h> and <SharedArray.h> to VS2003 and VS2012 vcproj f…
Jul 26, 2013
2d22610
Pass some parameters by reference to functions. Small cleanup
Jul 26, 2013
dea3cda
small refactoring in SocketInitiator/ThreadedSocketInitiator onConfig…
Jul 27, 2013
10ae491
Remove the restriction to specify SocketReuseAddress/SocketNodelay/Se…
Jul 27, 2013
d1730e8
Fix a crash in DataDictionary::validate() method when called with NUL…
Jul 27, 2013
fa25e29
Fix leaking Session object when exception occurs in SessionFactory::c…
Jul 27, 2013
15a1b6b
Fix text formatting in SharedArray.h
Jul 27, 2013
02a931f
Pass more function parameters by const reference
Jul 27, 2013
86b4c84
Merge pull request #2 from Ambal/master
quickfix Jul 28, 2013
e9e2ca0
Fixed specified directory is not used for file log backups.
ievgent Aug 13, 2013
f3efaf6
Use C++ compiler for allocator existance testing
Aug 20, 2013
7d99f32
Fix typo in Visual Studio 2008 C++ project file
akorobka Sep 30, 2013
52b4af4
Remove deprecated ruby api calls. Regenerate with swig 2.11 which su…
Dec 16, 2013
20d3974
Added current directory to search path when running ruby tests. Chan…
Dec 16, 2013
ee5eed7
Repress error if .bundle or .so does not exist
Dec 16, 2013
a1b0fbd
Don't use postgres unless --with-postgresql.
mgatny Jan 9, 2014
4a56c7d
Merge pull request #12 from mgatny/fixup_autotools_postgres
mgatny Jan 9, 2014
5a3f503
scripts for jenkins
mgatny Jan 10, 2014
4b1904b
Merge pull request #13 from mgatny/master
mgatny Jan 10, 2014
0f1577e
Fix up compiler warnings.
mgatny Jan 11, 2014
fecaaa2
Merge pull request #14 from mgatny/fixup_compiler_warnings
mgatny Jan 11, 2014
044b8e9
Bootstrap and configure before generating
mgatny Jan 11, 2014
4a9b01f
Merge pull request #15 from mgatny/fixup_build_with_generate_jenkins_…
mgatny Jan 11, 2014
fbd5f21
Ubuntu jenkins script installs jruby.
mgatny Jan 11, 2014
2e3bd0a
Merge pull request #16 from mgatny/fixup_build_with_generate_jenkins_…
mgatny Jan 11, 2014
3753f7a
Merge branch 'ruby-1.9x-support'
orenmnero Mar 5, 2014
ac942ac
Remove all .NET code
orenmnero Mar 5, 2014
a97be5d
Removed .NET projects from vs11 solution
orenmnero Mar 5, 2014
acb0a00
Removed project files for older versions of Visual Studio
orenmnero Mar 5, 2014
f2ca839
Added solution and projects for vs12
orenmnero Mar 5, 2014
d52279b
Reference correct version in projects and solutions
orenmnero Mar 6, 2014
19c5448
Take out versions in names where we don't need them
orenmnero Mar 6, 2014
ab9c5c9
Added build script for vs12
orenmnero Mar 6, 2014
5967190
Update vs10 build script to use msbuild
orenmnero Mar 6, 2014
8498a0f
unit_test project should depend on UnitTest++
orenmnero Mar 6, 2014
ad9176a
Removed startup scripts for defunct .net examples
orenmnero Mar 6, 2014
e323fc9
Removed reference to java, csharp, and vbnet from documentation
orenmnero Mar 6, 2014
a4f4425
Replaced tabs with 2 spaces, consistent with the rest of the code
orenmnero Mar 6, 2014
c0c0937
Run performance tests 500000 times
orenmnero Mar 6, 2014
e4aabee
Merge performance enhancements from Ambal-master
orenmnero Mar 6, 2014
3b0782b
Renamed Dictionary::getLong/setLong to Dictionary::getInt/setInt
orenmnero Mar 6, 2014
ab5d93d
Make use of getFieldIfSet in session.
orenmnero Mar 6, 2014
7f4b8c5
Merge pull request #4 from ievgent/master
orenmnero Mar 7, 2014
7f7d8bd
Merge pull request #7 from blackjack/fix_allocator_select
orenmnero Mar 7, 2014
4876ae4
Merge branch 'master' of https://github.com/quickfix/quickfix
orenmnero Mar 6, 2014
e1d584f
Got rid of out of date FAQ and mailing list link
orenmnero Mar 7, 2014
889991e
Made about section in documentation redundant. Link to license in th…
orenmnero Mar 7, 2014
36de192
Removed logo from documentation
orenmnero Mar 7, 2014
125eac6
Docs use doxygen.css
orenmnero Mar 7, 2014
38bb221
Cleaned up and simplified documentation
orenmnero Mar 7, 2014
c7d7f51
Fix build for OS/X
Mar 8, 2014
3a85d44
Merge branch 'master' of https://github.com/quickfix/quickfix
orenmnero Mar 6, 2014
610aac1
Fix buffer overrun issue in ThreadedSocketConnection::send() method
Mar 7, 2014
248886b
Update FIELD_SET macro with getIfSet() function
Mar 9, 2014
6ac2a49
Fix possible memory leak in FileStore::get() method.
Mar 9, 2014
ec00af5
Fixed incorrect PlatformToolset for vs12.
msnelling Mar 10, 2014
59ac9f5
Merge pull request #21 from msnelling/master
orenmnero Mar 10, 2014
c771e2f
Fixed the toolsets for vs10 and vs11 projects
Mar 11, 2014
55fda92
Do not show full path names of files. Only show Doxygen class lists.…
orenmnero Mar 7, 2014
d9e60d1
Merge pull request #20 from Ambal/master
orenmnero Mar 14, 2014
7589220
Speedup floating point number decoding. Use IS_DIGIT and IS_SPACE mac…
Mar 10, 2014
1c8795f
Ignore doxygen generated files
Mar 18, 2014
dc17835
Ignore doxygen generated files
Mar 18, 2014
5f45e5d
Put code blocks into preformatted fragment sections. More simplifica…
Mar 18, 2014
d82b6dc
Merge pull request #23 from Ambal/master
orenmnero Mar 18, 2014
d68b8fa
Ignore more generated files
Mar 18, 2014
3335bb3
Merge branch 'master' of https://github.com/quickfix/quickfix
Mar 18, 2014
8f4be70
Removed out of date files
Mar 18, 2014
a30dd0a
Updated NEWS for 1.14.0
Mar 18, 2014
c3d0a72
Display index top to bottom. Easier to follow
Mar 19, 2014
840f246
Added margins to documentation for better readability
Mar 19, 2014
b5ce2ef
Merge branch 'master' of https://github.com/quickfix/quickfix
Mar 19, 2014
afb5f76
10.0 is not a valid toolset. Should be 4.0
Mar 20, 2014
9be40ef
Fixed bad quote characters in project files
orenmnero Mar 20, 2014
7cb76c5
Removed reference to missing Callstack.h
orenmnero Mar 20, 2014
d97740e
Default build scripts to Build instead of Rebuild
orenmnero Mar 20, 2014
6c3c188
Fixed warnings comparing signed and unsigned numbers
Mar 21, 2014
2eb52a1
compile UnitTest++ with -Wno-unused-private-field -Wno-overloaded-vir…
Mar 21, 2014
af35de6
Merge branch 'master' of https://github.com/quickfix/quickfix
Mar 21, 2014
4f3225d
Removed unittest failing for UnitTest++ on Mac OS/X until we can addr…
Mar 21, 2014
b45e5ae
Choose port 11111 for running tests, which is less likely to be claimed
Mar 22, 2014
d42d13e
Removed unused member m_stop from ThreadedSocketInitiator
Mar 22, 2014
ebc0f9d
ThreadedSocketConnection does not need a reference to an application.
Mar 22, 2014
6ba9921
Fix 'unused/unreferenced variable' warnings in SharedArray.h
Mar 21, 2014
28c2548
Rolled back field extraction performance enhancement which broke acce…
Mar 22, 2014
f725e0d
Merge pull request #26 from Ambal/master
orenmnero Mar 22, 2014
9cfa4c8
Run tidy on html
Mar 23, 2014
1ffd34c
Merge branch 'master' of https://github.com/quickfix/quickfix
Mar 23, 2014
974ceb4
Cleaned up some documentation
Mar 23, 2014
3a7708c
Reverted .gitignore
Mar 23, 2014
2bb60bf
Separate doxygen generation and html tidy into separate scripts
Mar 23, 2014
f806300
Reverted accidental overwrite of makefile
Mar 23, 2014
0fa10d4
Got rid of warning in SharedArray by removing unused local pointer
Mar 24, 2014
c6f6321
Got rid of all compilation warnings under gcc
Mar 24, 2014
a808c27
Fixed more compiler warnings
Mar 24, 2014
fd9d15d
Initial checking of travis continuous integration file
Mar 26, 2014
0cd643f
Don't really need doxygen and graphiviz for CI build
Mar 26, 2014
9e8a815
More explicit reference to 1st connection when ending AlreadyLoggedOn…
Mar 26, 2014
94d5fc7
Revert "Rolled back field extraction performance enhancement which br…
Mar 23, 2014
8d5aea5
Fix broken acceptance tests due to too strict field tag validation. A…
Mar 23, 2014
5c20f47
Updated copyright notice
Mar 29, 2014
d9ee712
Minor rewording
Mar 29, 2014
7084687
Removed unmatched </b> tag from index.h. Reverted to good doxygen logo
Mar 30, 2014
4241e05
Ignore more files in html directory
Mar 30, 2014
ee57fa3
Merge pull request #27 from Ambal/master
orenmnero Mar 31, 2014
9892e59
VS11 should use toolset 4.0
orenmnero Apr 1, 2014
63eb304
Fixed typo in TARGET of build script
orenmnero Apr 1, 2014
5b7b97a
SocketServer test needs to be slowed down on some machines. Not sure…
Apr 11, 2014
b30ece7
All FIX50 sessions for acceptance tests run in a single FIXT transport
orenmnero Apr 12, 2014
651b25a
Merge branch 'master' of https://github.com/quickfix/quickfix
orenmnero Apr 12, 2014
b42ee04
All FIX50 sessions for acceptance tests run in a single FIXT transpor…
Apr 12, 2014
222f373
Fix compile error with message formatting
lisachenko Apr 15, 2014
0faec2b
Merge pull request #30 from lisachenko/patch-1
orenmnero May 17, 2014
adb936f
Regenerated swig interfaces
May 17, 2014
5d415f9
Update Utility.cpp
ilyaex May 27, 2014
1c19935
Pass in include directory for swig includes
Sep 10, 2014
2493701
Got embedded pugixml to work on linux. Will replace libxml and msxml…
orenmnero Sep 10, 2014
48994e8
Visual Studio builds use pugixml
orenmnero Jun 25, 2014
de09379
Removed references to libxml from config and documentation
orenmnero Sep 10, 2014
0606a22
Regenerated swig files with relative paths
Sep 10, 2014
95614e4
Fixed all warnings from -Wshorten-64-to-32
orenmnero Sep 11, 2014
d580100
Fixed more warnings produced from signed/unsigned comparisons. Regen…
Sep 11, 2014
2e531f2
Preparing 1.14.1 release
Sep 11, 2014
a2b48c5
Import _thread as thread for python3
Sep 11, 2014
157435b
Regenerate with swig 3. Did some work for future support of python3
Sep 11, 2014
63f8d85
Define ssize_t for visual studio
Sep 11, 2014
0d9ec28
Added to .gitignore
Sep 11, 2014
ccd835c
Merge branch 'master' of https://github.com/quickfix/quickfix
Sep 11, 2014
577b9f2
Store all data dictionary copies so they can be properly disposed
orenmnero Sep 12, 2014
4de4249
Merge branch 'master' of https://github.com/quickfix/quickfix
orenmnero Sep 12, 2014
f019943
Make sure we delete the original data dictionary too
orenmnero Sep 12, 2014
194c1ba
Store data dictionaries in shared_ptr so we don't have to worry about…
orenmnero Sep 12, 2014
98cc814
Merge branch 'shared_ptr'
orenmnero Sep 12, 2014
8c80ac9
Pull in c++0x std so we pull in std::shared_ptr
Sep 12, 2014
948d679
Merge pull request #37 from ilyaex/patch-1
orenmnero Sep 12, 2014
d2777a1
Updated NEWS
orenmnero Sep 13, 2014
fb75991
Pass in compiler flags with quotes so they all come on one variable
Sep 13, 2014
0d537df
Merge branch 'master' of https://github.com/quickfix/quickfix
Sep 13, 2014
94e8836
Use std::tr1::shared_ptr if std::shared_ptr not available
orenmnero Sep 14, 2014
529b3a7
Merge branch 'master' of https://github.com/quickfix/quickfix
orenmnero Sep 14, 2014
11161ed
Updated NEWS and version
orenmnero Sep 14, 2014
19d0140
setGetLong replace with setGetInt
orenmnero Sep 15, 2014
7b09c99
Updated python test cases for api changes. Booleans are now real boo…
orenmnero Sep 15, 2014
231a131
Create symlink to spec in ruby and python directories for tests
orenmnero Sep 15, 2014
8eef32a
Use local spec for ruby tests. Bring back message tests, do not run …
orenmnero Sep 15, 2014
0abb64a
recv return ssize_t, not size_t. Fixes failure to detect recv failed
orenmnero Sep 15, 2014
5025344
Preparing 1.14.3 release
orenmnero Sep 15, 2014
b42b938
Updated revision of quickfix library
Sep 15, 2014
1194f21
Merge branch 'master' of https://github.com/quickfix/quickfix
Sep 15, 2014
cc1b035
Fixed typo in ruby and python repeating groups example
Sep 15, 2014
3875882
Removed .NET generator. Fixed print which was outputting array literals
orenmnero Sep 16, 2014
077ed2f
Renamed get/setField with more apt get/setTag()
orenmnero Sep 17, 2014
370cb3e
Merge branch 'master' of https://github.com/quickfix/quickfix
orenmnero Sep 17, 2014
e5216dc
Make getField/setField deprecated. Regenerated swig apis
orenmnero Sep 17, 2014
f05133b
issue #62 XMLData is a data-type field in the header so look for the …
udpip7 Feb 25, 2015
db624d4
issue #62 Ported XMLData test to python.
orenmiller Dec 10, 2015
e473512
Merge pull request #64 from udpip7/master
orenmnero Dec 10, 2015
0bca81a
Merge branch 'master' of https://github.com/quickfix/quickfix into ud…
orenmiller Dec 10, 2015
6bc717f
Assert is not passing on some systems.
orenmiller Dec 10, 2015
68cbd1f
Revert "Assert is not passing on some systems."
krzysztofwos Feb 21, 2016
3da98b5
Cast to unsigned int before negating the result
krzysztofwos May 27, 2015
c5aa8e2
Merge remote-tracking branch 'upstream/master'
akorobka Apr 8, 2016
a9bab3b
Merge pull request #93 from krzysztofwos/field-convertors-fix
mgatny Jun 8, 2016
9a07d5b
Don't rely on c++11 while still avoiding overflow
mgatny Jun 8, 2016
c3e9d06
Merge pull request #105 from mgatny/signed_int_overflow
mgatny Jun 9, 2016
3e87689
Regenerated spec with latest FIX repository.
Jan 12, 2017
8e538f1
Do not ignore any fields when generating spec.
Jan 12, 2017
c756bdd
Fix generation of session id for ruby 2.0
Mar 24, 2017
e485016
Fix generation of NPE instead of FieldConvertError
Mar 24, 2017
ed2cfb3
Merge pull request #3 from alex-savchuk/minor_quickfix_changes
akorobka Apr 2, 2017
d8b4832
Remove throw from function declaration for C++17
qyangdu Apr 21, 2018
a105d2a
Migrate std::auto_ptr to std::unique_ptr
qyangdu Apr 22, 2018
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
33 changes: 32 additions & 1 deletion .gitignore
Original file line number Diff line number Diff line change
@@ -1,4 +1,11 @@
debug
release
*.user
*.sdf
*.opensdf
*.suo
*~
*.lib
*.lo
*.in
Makefile
Expand All @@ -9,6 +16,10 @@ Makefile
*.o
*.d
*.a
.libs
*.la
*.so
*.dylib
ChangeLog
UnitTest++/TestUnitTest++
aclocal.m4
Expand All @@ -25,4 +36,24 @@ m4/ltversion.m4
m4/lt~obsolete.m4
quickfix.pc
stamp-h1

bin/executor
bin/ordermatch
bin/tradeclient
examples/executor/C++/executor
examples/ordermatch/ordermatch
examples/ordermatch/test/ordermatch_ut
examples/tradeclient/tradeclient
include/
src/at
src/pt
src/ut
test/at
test/pt
test/ut
test/ut_debug
test/cfg
test/store
autom4te.cache/
lib/python
COPYING
INSTALL
11 changes: 11 additions & 0 deletions .travis.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
language: cpp

compiler:
- gcc
- clang

before_script:
- sudo apt-get install libxml2-dev
- ./bootstrap

script: ./configure && make && make check
27 changes: 0 additions & 27 deletions CONTRIBUTORS

This file was deleted.

1 change: 0 additions & 1 deletion COPYING

This file was deleted.

1 change: 0 additions & 1 deletion INSTALL

This file was deleted.

3 changes: 1 addition & 2 deletions LICENSE
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
The QuickFIX Software License, Version 1.0

Copyright (c) 2001-2010 quickfixengine.org All rights
reserved.
Copyright (c) 2001-2014 Oren Miller

Redistribution and use in source and binary forms, with or without
modification, are permitted provided that the following conditions
Expand Down
4 changes: 4 additions & 0 deletions Makefile.am
Original file line number Diff line number Diff line change
Expand Up @@ -6,3 +6,7 @@ ACLOCAL_AMFLAGS = -I m4

pkgconfdir=$(libdir)/pkgconfig
pkgconf_DATA = quickfix.pc

generate:
cd spec && bash generate.sh

43 changes: 43 additions & 0 deletions NEWS
Original file line number Diff line number Diff line change
@@ -1,8 +1,39 @@
1.14.3
------
Fixed buck in SocketConnection where recv result stored in signed value.

Added ruby api to RubyGems.

All Python and Ruby tests pass again.

1.14.2
------
Test for std::shared_ptr and std::tr1::shared_ptr. Allows us to compile on
gcc 4.1-4.2, and with anaconda python.

Distribute FIX specs with pip package.

Use all detected compiler flags when building ruby native library.

1.14.1
------
Replaced libxml2 and MSXML dependencies with embedded pugixml.

Fixed all warnings from -Wshorten-64-to-32.

Added python api to PyPi. Can be installed with 'pip install quickfix'.

Fixed memory leak in SessionFactory when creating DataDictionaries.
shared_ptr is used to track the objects so we don't have to.

1.14.0
------
Major performance improvement sending/receiving messages. Thanks to
Viktor Pogrebnyak for a great patch.

Added getFieldIfSet and getIfSet methods. No longer need to check for a
field and pull it out in two steps.

UseLocalTime=Y works again.

Improvement in how DataDictionaries are initialized makes starting up with
Expand All @@ -17,6 +48,12 @@ fields on incoming messages. Accept the message anyway. A wild free for all.

Added FIX 5.0 sp1 and sp2 support to MessageCracker.

SocketReuseAddress, SocketNoDelay, SocketSendBufferSize, and SocketReceiveBufferSize
config settings can be overriden on a per session basis.

Field containing number of groups will be removed if all instances of
a group are removed from the message.

SocketConnection would block other sessions if it was unable to connect
immediately. Brian Crowell submitted a patch that makes the connection
call non-blocking.
Expand Down Expand Up @@ -73,6 +110,12 @@ Fixed/standardized various issues with python library deployment.
If session is disabled, it will immediately disconnect without sending any
messages.

Added support for visual studio 11 and 12.

Removed C# library. Use QuickFIX/n.

Ruby API works with ruby 1.9.x

1.13.3
------
Added support for FIX 5.0 sp1 and sp2
Expand Down
12 changes: 0 additions & 12 deletions THANKS

This file was deleted.

2 changes: 1 addition & 1 deletion UnitTest++/Makefile
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
CXX = g++
CXXFLAGS ?= -g -Wall -W -Winline -ansi
CXXFLAGS ?= -g -Wall -W -Winline -Wno-unused-private-field -Wno-overloaded-virtual -ansi
LDFLAGS ?=
SED = sed
MV = mv
Expand Down
4 changes: 2 additions & 2 deletions UnitTest++/UnitTest++_vs10.vcxproj
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
<?xml version="1.0" encoding="utf-8"?>
<?xml version="1.0" encoding="utf-8"?>
<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<ItemGroup Label="ProjectConfigurations">
<ProjectConfiguration Include="Debug|Win32">
Expand All @@ -12,7 +12,7 @@
</ItemGroup>
<PropertyGroup Label="Globals">
<ProjectGuid>{64A4FEFE-0461-4E95-8CC1-91EF5F57DBC6}</ProjectGuid>
<RootNamespace>UnitTestVS10</RootNamespace>
<RootNamespace>UnitTest</RootNamespace>
<Keyword>Win32Proj</Keyword>
<ProjectName>UnitTest++_vs10</ProjectName>
</PropertyGroup>
Expand Down
2 changes: 1 addition & 1 deletion UnitTest++/UnitTest++_vs11.vcxproj
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
</ItemGroup>
<PropertyGroup Label="Globals">
<ProjectGuid>{64A4FEFE-0461-4E95-8CC1-91EF5F57DBC6}</ProjectGuid>
<RootNamespace>UnitTestVS10</RootNamespace>
<RootNamespace>UnitTest</RootNamespace>
<Keyword>Win32Proj</Keyword>
<ProjectName>UnitTest++_vs11</ProjectName>
</PropertyGroup>
Expand Down
122 changes: 122 additions & 0 deletions UnitTest++/UnitTest++_vs12.vcxproj
Original file line number Diff line number Diff line change
@@ -0,0 +1,122 @@
<?xml version="1.0" encoding="utf-8"?>
<Project DefaultTargets="Build" ToolsVersion="12.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<ItemGroup Label="ProjectConfigurations">
<ProjectConfiguration Include="Debug|Win32">
<Configuration>Debug</Configuration>
<Platform>Win32</Platform>
</ProjectConfiguration>
<ProjectConfiguration Include="Release|Win32">
<Configuration>Release</Configuration>
<Platform>Win32</Platform>
</ProjectConfiguration>
</ItemGroup>
<PropertyGroup Label="Globals">
<ProjectGuid>{64A4FEFE-0461-4E95-8CC1-91EF5F57DBC6}</ProjectGuid>
<RootNamespace>UnitTest</RootNamespace>
<Keyword>Win32Proj</Keyword>
<ProjectName>UnitTest++_vs12</ProjectName>
</PropertyGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
<ConfigurationType>StaticLibrary</ConfigurationType>
<CharacterSet>Unicode</CharacterSet>
<WholeProgramOptimization>false</WholeProgramOptimization>
<PlatformToolset>v120</PlatformToolset>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
<ConfigurationType>StaticLibrary</ConfigurationType>
<CharacterSet>Unicode</CharacterSet>
<PlatformToolset>v120</PlatformToolset>
</PropertyGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
<ImportGroup Label="ExtensionSettings">
</ImportGroup>
<ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets">
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" />
</ImportGroup>
<ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets">
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" />
</ImportGroup>
<PropertyGroup Label="UserMacros" />
<PropertyGroup>
<_ProjectFileVersion>10.0.21006.1</_ProjectFileVersion>
<OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(SolutionDir)lib\debug\</OutDir>
<IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">obj\$(ProjectName)\$(Configuration)\</IntDir>
<OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(SolutionDir)lib\</OutDir>
<IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">obj\$(ProjectName)\$(Configuration)\</IntDir>
</PropertyGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
<ClCompile>
<Optimization>Disabled</Optimization>
<PreprocessorDefinitions>WIN32;_DEBUG;_LIB;_CRT_SECURE_NO_DEPRECATE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<MinimalRebuild>true</MinimalRebuild>
<ExceptionHandling>Async</ExceptionHandling>
<BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
<RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
<PrecompiledHeader>
</PrecompiledHeader>
<WarningLevel>Level4</WarningLevel>
<DebugInformationFormat>EditAndContinue</DebugInformationFormat>
</ClCompile>
</ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
<ClCompile>
<Optimization>MinSpace</Optimization>
<PreprocessorDefinitions>WIN32;NDEBUG;_LIB;_CRT_SECURE_NO_DEPRECATE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<ExceptionHandling>Async</ExceptionHandling>
<RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
<PrecompiledHeader>
</PrecompiledHeader>
<WarningLevel>Level4</WarningLevel>
<DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
</ClCompile>
</ItemDefinitionGroup>
<ItemGroup>
<ClCompile Include="src\Win32\TimeHelpers.cpp" />
<ClCompile Include="src\AssertException.cpp" />
<ClCompile Include="src\Checks.cpp" />
<ClCompile Include="src\CurrentTest.cpp" />
<ClCompile Include="src\DeferredTestReporter.cpp" />
<ClCompile Include="src\DeferredTestResult.cpp" />
<ClCompile Include="src\MemoryOutStream.cpp" />
<ClCompile Include="src\ReportAssert.cpp" />
<ClCompile Include="src\Test.cpp" />
<ClCompile Include="src\TestDetails.cpp" />
<ClCompile Include="src\TestList.cpp" />
<ClCompile Include="src\TestReporter.cpp" />
<ClCompile Include="src\TestReporterStdout.cpp" />
<ClCompile Include="src\TestResults.cpp" />
<ClCompile Include="src\TestRunner.cpp" />
<ClCompile Include="src\TimeConstraint.cpp" />
<ClCompile Include="src\XmlTestReporter.cpp" />
</ItemGroup>
<ItemGroup>
<ClInclude Include="src\Win32\TimeHelpers.h" />
<ClInclude Include="src\AssertException.h" />
<ClInclude Include="src\CheckMacros.h" />
<ClInclude Include="src\Checks.h" />
<ClInclude Include="src\Config.h" />
<ClInclude Include="src\CurrentTest.h" />
<ClInclude Include="src\DeferredTestReporter.h" />
<ClInclude Include="src\DeferredTestResult.h" />
<ClInclude Include="src\ExecuteTest.h" />
<ClInclude Include="src\MemoryOutStream.h" />
<ClInclude Include="src\ReportAssert.h" />
<ClInclude Include="src\Test.h" />
<ClInclude Include="src\TestDetails.h" />
<ClInclude Include="src\TestList.h" />
<ClInclude Include="src\TestMacros.h" />
<ClInclude Include="src\TestReporter.h" />
<ClInclude Include="src\TestReporterStdout.h" />
<ClInclude Include="src\TestResults.h" />
<ClInclude Include="src\TestRunner.h" />
<ClInclude Include="src\TestSuite.h" />
<ClInclude Include="src\TimeConstraint.h" />
<ClInclude Include="src\TimeHelpers.h" />
<ClInclude Include="src\UnitTest++.h" />
<ClInclude Include="src\XmlTestReporter.h" />
</ItemGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
<ImportGroup Label="ExtensionTargets">
</ImportGroup>
</Project>
5 changes: 4 additions & 1 deletion UnitTest++/src/tests/TestTestRunner.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -95,6 +95,8 @@ TEST_FIXTURE(TestRunnerFixture, FailureCountIsZeroWhenNoTestsAreRun)
CHECK_EQUAL(0, reporter.testFailedCount);
}

// TODO: test is failing under OS/X
/*
TEST_FIXTURE(TestRunnerFixture, CallsReportFailureOncePerFailingTest)
{
MockTest test1("test", false, false);
Expand All @@ -104,9 +106,10 @@ TEST_FIXTURE(TestRunnerFixture, CallsReportFailureOncePerFailingTest)
MockTest test3("test", false, false);
list.Add(&test3);

CHECK_EQUAL(2, runner.RunTestsIf(list, NULL, True(), 0));
CHECK_EQUAL(2, runner.RunTestsIf(list, NULL, True(), 0));
CHECK_EQUAL(2, reporter.testFailedCount);
}
*/

TEST_FIXTURE(TestRunnerFixture, TestsThatAssertAreReportedAsFailing)
{
Expand Down
1 change: 0 additions & 1 deletion bin/run_executor_csharp.bat

This file was deleted.

1 change: 0 additions & 1 deletion bin/run_executor_csharp_debug.bat

This file was deleted.

1 change: 0 additions & 1 deletion bin/run_executor_vbnet.bat

This file was deleted.

1 change: 0 additions & 1 deletion bin/run_executor_vbnet_debug.bat

This file was deleted.

4 changes: 3 additions & 1 deletion bootstrap
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,9 @@ mkdir config
touch README NEWS AUTHORS INSTALL ChangeLog

set -ex
libtoolize # work around issue where autoreconf on rhel/centos 5.7 does not always run this
case `uname` in Darwin*) glibtoolize --copy ;;
*) libtoolize --copy --force ;; esac

autoreconf -i -Wall,no-obsolete
rm -rf autom4te.cache config.h.in~
set +ex
Expand Down
Loading