Merge pull request #1496 from brian-peloton/macro-to-disable-test-timeout

Add a way to disable libzmq's internal test timeout.

Merge pull request #1496 from brian-peloton/macro-to-disable-test-timeout
Add a way to disable libzmq's internal test timeout.
a656b399 · Pieter Hintjens · 94b6fca4 · cb0491ca · a656b399
Commit a656b399 authored Jul 28, 2015 by Pieter Hintjens
Show whitespace changes
Inline Side-by-side

Showing with 2 additions and 0 deletions

testutil.hpp tests/testutil.hpp +2 -0

No files found.
--- a/tests/testutil.hpp
+++ b/tests/testutil.hpp
@@ -282,8 +282,10 @@ void setup_test_environment()
    // abort test after 121 seconds
    alarm(121);
 #else
+#   if !defined ZMQ_DISABLE_TEST_TIMEOUT
    // abort test after 60 seconds
    alarm(60);
+#   endif
 #endif
 #endif
 #if defined __MVS__