skip timing tests under valgrind

Conflicts:
	tests/TestSuite.c
	tests/TestSuite.h

Author: ajdavis

tests/Makefile.am

@@ -172,7 +172,7 @@ endif
 	done
 
 valgrind: $(TEST_PROGS)
-	$(LIBTOOL) --mode=execute valgrind --leak-check=full --suppressions=$(srcdir)/valgrind.suppressions ./test-libmongoc $(TEST_ARGS)
+	MONGOC_TEST_VALGRIND=on $(LIBTOOL) --mode=execute valgrind --leak-check=full --suppressions=$(srcdir)/valgrind.suppressions ./test-libmongoc $(TEST_ARGS)
 
 if OS_LINUX
 abicheck:

tests/TestSuite.c

@@ -51,12 +51,16 @@
 #include "TestSuite.h"
 
 
+static int test_flags;
+
+
 #define TEST_VERBOSE   (1 << 0)
 #define TEST_NOFORK    (1 << 1)
 #define TEST_HELPONLY  (1 << 2)
 #define TEST_NOTHREADS (1 << 3)
 #define TEST_DEBUGOUTPUT (1 << 4)
 #define TEST_TRACE     (1 << 5)
+#define TEST_VALGRIND  (1 << 6)
 
 
 #define NANOSEC_PER_SEC 1000000000UL
@@ -296,6 +300,13 @@ TestSuite_Init (TestSuite *suite,
          suite->testname = strdup (argv [++i]);
       }
    }
+
+   if (test_framework_getenv_bool ("MONGOC_TEST_VALGRIND")) {
+      suite->flags |= TEST_VALGRIND;
+   }
+
+   /* HACK: copy flags to global var */
+   test_flags = suite->flags;
 }
 
 
@@ -853,3 +864,17 @@ TestSuite_Destroy (TestSuite *suite)
    free (suite->prgname);
    free (suite->testname);
 }
+
+
+int
+test_suite_debug_output (void)
+{
+   return 0 != (test_flags & TEST_DEBUGOUTPUT);
+}
+
+
+int
+test_suite_valgrind (void)
+{
+   return 0 != (test_flags & TEST_VALGRIND);
+}

tests/TestSuite.h

@@ -182,6 +182,15 @@ extern "C" {
       } \
    } while (0)
 
+/* don't check durations when testing with valgrind */
+#define ASSERT_CMPTIME(actual, maxduration) \
+   do { \
+      if (!test_suite_valgrind ()) { \
+         ASSERT_CMPINT (actual, <, maxduration); \
+      }\
+   } while (0)
+
+
 #define MAX_TEST_NAME_LENGTH 500
 
 
@@ -237,6 +246,9 @@ void TestSuite_AddFull (TestSuite *suite,
 int  TestSuite_Run     (TestSuite *suite);
 void TestSuite_Destroy (TestSuite *suite);
 
+int test_suite_debug_output (void);
+int test_suite_valgrind (void);
+
 #ifdef __cplusplus
 }
 #endif

tests/test-mongoc-client.c

@@ -635,7 +635,7 @@ test_seed_list (bool rs,
 
       /* discovery should be quick despite down servers, say < 100ms */
       duration_usec = bson_get_monotonic_time () - start;
-      ASSERT_CMPINT ((int) (duration_usec / 1000), <, 100);
+      ASSERT_CMPTIME ((int) (duration_usec / 1000), 100);
 
       bson_destroy (&reply);
 
@@ -672,8 +672,8 @@ test_seed_list (bool rs,
       /* client waited for min heartbeat to pass before reconnecting, then
        * reconnected quickly despite down servers, say < 100ms later */
       duration_usec = bson_get_monotonic_time () - start;
-      ASSERT_CMPINT ((int) (duration_usec / 1000), <,
-                     MONGOC_TOPOLOGY_MIN_HEARTBEAT_FREQUENCY_MS + 100);
+      ASSERT_CMPTIME ((int) (duration_usec / 1000),
+                      MONGOC_TOPOLOGY_MIN_HEARTBEAT_FREQUENCY_MS + 100);
 
       bson_destroy (&reply);
 

tests/test-mongoc-usleep.c

@@ -12,7 +12,7 @@ test_mongoc_usleep_basic (void)
    _mongoc_usleep (50 * 1000);  /* 50 ms */
    duration = bson_get_monotonic_time () - start;
    ASSERT_CMPINT ((int) duration, >, 0);
-   ASSERT_CMPINT ((int) duration, <, 200 * 1000);
+   ASSERT_CMPTIME ((int) duration, 200 * 1000);
 }
 
 void