summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMartin Sustrik <sustrik@250bpm.cpm>2012-02-16 10:29:05 +0900
committerMartin Sustrik <sustrik@250bpm.com>2012-02-16 10:29:05 +0900
commit908aaf0d92c146400c5125cbbf5edf3dbeb8a4a1 (patch)
treee1e3111547cecaaf340c5e78570ee1e3ff5a7c38
parent23cc05508f906bbb383f0396c00de7115bf9a696 (diff)
MSVC build fixed
Signed-off-by: Martin Sustrik <sustrik@250bpm.cpm>
-rw-r--r--builds/msvc/tests/tests.vcxproj6
-rw-r--r--builds/msvc/tests/tests.vcxproj.filters5
-rw-r--r--tests/tests.cpp12
3 files changed, 15 insertions, 8 deletions
diff --git a/builds/msvc/tests/tests.vcxproj b/builds/msvc/tests/tests.vcxproj
index d62597d..cfa07a8 100644
--- a/builds/msvc/tests/tests.vcxproj
+++ b/builds/msvc/tests/tests.vcxproj
@@ -109,6 +109,10 @@
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
</ClCompile>
+ <ClCompile Include="..\..\..\tests\polltimeo.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>
@@ -158,4 +162,4 @@
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
<ImportGroup Label="ExtensionTargets">
</ImportGroup>
-</Project>
+</Project> \ No newline at end of file
diff --git a/builds/msvc/tests/tests.vcxproj.filters b/builds/msvc/tests/tests.vcxproj.filters
index 01121cb..ce84e6c 100644
--- a/builds/msvc/tests/tests.vcxproj.filters
+++ b/builds/msvc/tests/tests.vcxproj.filters
@@ -53,6 +53,9 @@
<ClCompile Include="..\..\..\tests\emptyctx.cpp">
<Filter>Header Files</Filter>
</ClCompile>
+ <ClCompile Include="..\..\..\tests\polltimeo.cpp">
+ <Filter>Header Files</Filter>
+ </ClCompile>
</ItemGroup>
<ItemGroup>
<Filter Include="Header Files">
@@ -64,4 +67,4 @@
<Filter>Header Files</Filter>
</ClInclude>
</ItemGroup>
-</Project>
+</Project> \ No newline at end of file
diff --git a/tests/tests.cpp b/tests/tests.cpp
index 1d1ebbe..bcccd15 100644
--- a/tests/tests.cpp
+++ b/tests/tests.cpp
@@ -91,14 +91,14 @@
#include "max_sockets.cpp"
#undef XS_TEST_MAIN
-#define XS_TEST_MAIN reentrant
-#include "reentrant.cpp"
-#undef XS_TEST_MAIN
-
#define XS_TEST_MAIN emptyctx
#include "emptyctx.cpp"
#undef XS_TEST_MAIN
+#define XS_TEST_MAIN polltimeo
+#include "polltimeo.cpp"
+#undef XS_TEST_MAIN
+
int main ()
{
int rc;
@@ -133,10 +133,10 @@ int main ()
assert (rc == 0);
rc = max_sockets ();
assert (rc == 0);
- rc = reentrant ();
- assert (rc == 0);
rc = emptyctx ();
assert (rc == 0);
+ rc = polltimeo ();
+ assert (rc == 0);
fprintf (stderr, "SUCCESS\n");
xs_sleep (1);