|
@@ -114,16 +114,6 @@ START_TEST(test_timer_cyclic)
|
|
mark_point();
|
|
mark_point();
|
|
mg_sleep(100);
|
|
mg_sleep(100);
|
|
|
|
|
|
-#if defined(__MINGW32__)
|
|
|
|
- mg_sleep(10000);
|
|
|
|
- /* Try to find "***Exception: SegFault" that occurs only with MinGW builds
|
|
|
|
- * on AppVeyor/Windows, not with gcc/Linux and not MinGW/local.
|
|
|
|
- https://ci.appveyor.com/project/civetweb/civetweb/build/job/epsqi8perbca1jd6
|
|
|
|
- https://github.com/civetweb/civetweb/issues/366#issuecomment-269383810
|
|
|
|
- */
|
|
|
|
- ck_abort_msg("Abort test_timer_cyclic here (instead of SegFault)");
|
|
|
|
-#endif
|
|
|
|
-
|
|
|
|
#ifdef LOCAL_TEST
|
|
#ifdef LOCAL_TEST
|
|
/* If performed locally (on a physical machine that's not overloaded),
|
|
/* If performed locally (on a physical machine that's not overloaded),
|
|
* timing will be precise to the ~100 ms required here. */
|
|
* timing will be precise to the ~100 ms required here. */
|
|
@@ -136,6 +126,16 @@ START_TEST(test_timer_cyclic)
|
|
* counter with some tolerance. */
|
|
* counter with some tolerance. */
|
|
ck_assert_int_ge(c[0], -1);
|
|
ck_assert_int_ge(c[0], -1);
|
|
ck_assert_int_le(c[0], +1);
|
|
ck_assert_int_le(c[0], +1);
|
|
|
|
+
|
|
|
|
+#if defined(__MINGW32__)
|
|
|
|
+ /* Try to find "***Exception: SegFault" that occurs only with MinGW builds
|
|
|
|
+ * on AppVeyor/Windows, not with gcc/Linux and not MinGW/local.
|
|
|
|
+ https://ci.appveyor.com/project/civetweb/civetweb/build/job/epsqi8perbca1jd6
|
|
|
|
+ https://github.com/civetweb/civetweb/issues/366#issuecomment-269383810
|
|
|
|
+ */
|
|
|
|
+ ck_abort_msg("Abort test_timer_cyclic here (instead of SegFault)");
|
|
|
|
+#endif
|
|
|
|
+
|
|
ck_assert_int_ge(c[1], -1);
|
|
ck_assert_int_ge(c[1], -1);
|
|
ck_assert_int_le(c[1], +1);
|
|
ck_assert_int_le(c[1], +1);
|
|
ck_assert_int_ge(c[2], -1);
|
|
ck_assert_int_ge(c[2], -1);
|
|
@@ -296,8 +296,9 @@ START_TEST(test_timer_mixed)
|
|
mark_point();
|
|
mark_point();
|
|
mg_sleep(100);
|
|
mg_sleep(100);
|
|
|
|
|
|
|
|
+ ck_assert_int_eq(c[0], 2);
|
|
|
|
+
|
|
#if defined(__MINGW32__)
|
|
#if defined(__MINGW32__)
|
|
- mg_sleep(1000);
|
|
|
|
/* Try to find "***Exception: SegFault" that occurs only with MinGW builds
|
|
/* Try to find "***Exception: SegFault" that occurs only with MinGW builds
|
|
* on AppVeyor/Windows, not with gcc/Linux and not MinGW/local.
|
|
* on AppVeyor/Windows, not with gcc/Linux and not MinGW/local.
|
|
https://ci.appveyor.com/project/civetweb/civetweb/build/job/epsqi8perbca1jd6
|
|
https://ci.appveyor.com/project/civetweb/civetweb/build/job/epsqi8perbca1jd6
|
|
@@ -306,7 +307,6 @@ START_TEST(test_timer_mixed)
|
|
ck_abort_msg("Abort test_timer_mixed here (instead of SegFault)");
|
|
ck_abort_msg("Abort test_timer_mixed here (instead of SegFault)");
|
|
#endif
|
|
#endif
|
|
|
|
|
|
- ck_assert_int_eq(c[0], 2);
|
|
|
|
ck_assert_int_eq(c[1], 0);
|
|
ck_assert_int_eq(c[1], 0);
|
|
ck_assert_int_eq(c[2], 1);
|
|
ck_assert_int_eq(c[2], 1);
|
|
ck_assert_int_eq(c[3], 2);
|
|
ck_assert_int_eq(c[3], 2);
|