diff options
-rw-r--r-- | builds/msvc/tests/tests.vcxproj | 66 | ||||
-rw-r--r-- | builds/msvc/tests/tests.vcxproj.filters | 61 | ||||
-rw-r--r-- | tests/linger.cpp | 8 | ||||
-rw-r--r-- | tests/reconnect.cpp | 9 | ||||
-rw-r--r-- | tests/tests.cpp | 7 |
5 files changed, 151 insertions, 0 deletions
diff --git a/builds/msvc/tests/tests.vcxproj b/builds/msvc/tests/tests.vcxproj index dcbe996..86e9182 100644 --- a/builds/msvc/tests/tests.vcxproj +++ b/builds/msvc/tests/tests.vcxproj @@ -73,7 +73,67 @@ <CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet> </PropertyGroup> <ItemGroup> + <ClCompile Include="..\..\..\tests\hwm.cpp"> + <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild> + <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild> + </ClCompile> + <ClCompile Include="..\..\..\tests\invalid_rep.cpp"> + <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild> + <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild> + </ClCompile> + <ClCompile Include="..\..\..\tests\linger.cpp"> + <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild> + <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild> + </ClCompile> + <ClCompile Include="..\..\..\tests\msg_flags.cpp"> + <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild> + <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild> + </ClCompile> + <ClCompile Include="..\..\..\tests\pair_inproc.cpp"> + <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild> + <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild> + </ClCompile> + <ClCompile Include="..\..\..\tests\pair_ipc.cpp"> + <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild> + <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild> + </ClCompile> + <ClCompile Include="..\..\..\tests\pair_tcp.cpp"> + <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild> + <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild> + </ClCompile> + <ClCompile Include="..\..\..\tests\reconnect.cpp"> + <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild> + <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild> + </ClCompile> + <ClCompile Include="..\..\..\tests\reqrep_device.cpp"> + <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild> + <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild> + </ClCompile> + <ClCompile Include="..\..\..\tests\reqrep_inproc.cpp"> + <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild> + <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild> + </ClCompile> + <ClCompile Include="..\..\..\tests\reqrep_ipc.cpp"> + <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild> + <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild> + </ClCompile> + <ClCompile Include="..\..\..\tests\reqrep_tcp.cpp"> + <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild> + <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild> + </ClCompile> + <ClCompile Include="..\..\..\tests\shutdown_stress.cpp"> + <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild> + <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild> + </ClCompile> + <ClCompile Include="..\..\..\tests\sub_forward.cpp"> + <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild> + <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild> + </ClCompile> <ClCompile Include="..\..\..\tests\tests.cpp" /> + <ClCompile Include="..\..\..\tests\timeo.cpp"> + <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild> + <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild> + </ClCompile> </ItemGroup> <ItemGroup> <ProjectReference Include="..\libxs\libxs.vcxproj"> @@ -81,6 +141,12 @@ <ReferenceOutputAssembly>false</ReferenceOutputAssembly> </ProjectReference> </ItemGroup> + <ItemGroup> + <ClInclude Include="..\..\..\tests\testutil.hpp"> + <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild> + <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild> + </ClInclude> + </ItemGroup> <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" /> <ImportGroup Label="ExtensionTargets"> </ImportGroup> diff --git a/builds/msvc/tests/tests.vcxproj.filters b/builds/msvc/tests/tests.vcxproj.filters new file mode 100644 index 0000000..7490357 --- /dev/null +++ b/builds/msvc/tests/tests.vcxproj.filters @@ -0,0 +1,61 @@ +<?xml version="1.0" encoding="utf-8"?> +<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> + <ItemGroup> + <ClCompile Include="..\..\..\tests\tests.cpp" /> + <ClCompile Include="..\..\..\tests\hwm.cpp"> + <Filter>Header Files</Filter> + </ClCompile> + <ClCompile Include="..\..\..\tests\invalid_rep.cpp"> + <Filter>Header Files</Filter> + </ClCompile> + <ClCompile Include="..\..\..\tests\linger.cpp"> + <Filter>Header Files</Filter> + </ClCompile> + <ClCompile Include="..\..\..\tests\msg_flags.cpp"> + <Filter>Header Files</Filter> + </ClCompile> + <ClCompile Include="..\..\..\tests\pair_inproc.cpp"> + <Filter>Header Files</Filter> + </ClCompile> + <ClCompile Include="..\..\..\tests\pair_ipc.cpp"> + <Filter>Header Files</Filter> + </ClCompile> + <ClCompile Include="..\..\..\tests\pair_tcp.cpp"> + <Filter>Header Files</Filter> + </ClCompile> + <ClCompile Include="..\..\..\tests\reconnect.cpp"> + <Filter>Header Files</Filter> + </ClCompile> + <ClCompile Include="..\..\..\tests\reqrep_device.cpp"> + <Filter>Header Files</Filter> + </ClCompile> + <ClCompile Include="..\..\..\tests\reqrep_inproc.cpp"> + <Filter>Header Files</Filter> + </ClCompile> + <ClCompile Include="..\..\..\tests\reqrep_ipc.cpp"> + <Filter>Header Files</Filter> + </ClCompile> + <ClCompile Include="..\..\..\tests\reqrep_tcp.cpp"> + <Filter>Header Files</Filter> + </ClCompile> + <ClCompile Include="..\..\..\tests\shutdown_stress.cpp"> + <Filter>Header Files</Filter> + </ClCompile> + <ClCompile Include="..\..\..\tests\sub_forward.cpp"> + <Filter>Header Files</Filter> + </ClCompile> + <ClCompile Include="..\..\..\tests\timeo.cpp"> + <Filter>Header Files</Filter> + </ClCompile> + </ItemGroup> + <ItemGroup> + <Filter Include="Header Files"> + <UniqueIdentifier>{dd1661f8-9a37-43b1-ba70-0cd8a6e21b81}</UniqueIdentifier> + </Filter> + </ItemGroup> + <ItemGroup> + <ClInclude Include="..\..\..\tests\testutil.hpp"> + <Filter>Header Files</Filter> + </ClInclude> + </ItemGroup> +</Project>
\ No newline at end of file diff --git a/tests/linger.cpp b/tests/linger.cpp index a9feec3..f76be39 100644 --- a/tests/linger.cpp +++ b/tests/linger.cpp @@ -20,6 +20,13 @@ #include "testutil.hpp" +#if defined XS_HAVE_WINDOWS +int XS_TEST_MAIN () +{ + return 0; +} +#else + int XS_TEST_MAIN () { fprintf (stderr, "linger test running...\n"); @@ -57,3 +64,4 @@ int XS_TEST_MAIN () return 0; } +#endif
\ No newline at end of file diff --git a/tests/reconnect.cpp b/tests/reconnect.cpp index 6442b38..09eefd4 100644 --- a/tests/reconnect.cpp +++ b/tests/reconnect.cpp @@ -20,6 +20,13 @@ #include "testutil.hpp" +#if defined XS_HAVE_WINDOWS +int XS_TEST_MAIN () +{ + return 0; +} +#else + int XS_TEST_MAIN () { fprintf (stderr, "reconnect test running...\n"); @@ -85,3 +92,5 @@ int XS_TEST_MAIN () return 0 ; } + +#endif
\ No newline at end of file diff --git a/tests/tests.cpp b/tests/tests.cpp index dc55e97..1a3a2e0 100644 --- a/tests/tests.cpp +++ b/tests/tests.cpp @@ -21,8 +21,12 @@ // This file is used only in MSVC build. // It gathers all the tests into a single executable. +#include "testutil.hpp" + #include <assert.h> +#undef XS_TEST_MAIN + #define XS_TEST_MAIN hwm #include "hwm.cpp" #undef XS_TEST_MAIN @@ -116,5 +120,8 @@ int main () rc = timeo (); assert (rc == 0); + fprintf (stderr, "SUCCESS\n"); + xs_sleep (1); + return 0; }
\ No newline at end of file |