Browse Source

Update to not run cycle on Jenkins (causes issues with how fast ports can be made available).

Brian Aker 12 years ago
parent
commit
c7dc202fb0
3 changed files with 20 additions and 1 deletions
  1. 10 0
      libtest/comparison.cc
  2. 3 0
      libtest/comparison.hpp
  3. 7 1
      tests/cycle.cc

+ 10 - 0
libtest/comparison.cc

@@ -39,6 +39,16 @@
 
 namespace libtest {
 
+bool jenkins_is_caller(void)
+{
+  if (bool(getenv("JENKINS_HOME")))
+  {
+    return true;
+  }
+
+  return false;
+}
+
 bool valgrind_is_caller(void)
 {
   if (bool(getenv("TESTS_ENVIRONMENT")) and strstr(getenv("TESTS_ENVIRONMENT"), "valgrind"))

+ 3 - 0
libtest/comparison.hpp

@@ -50,6 +50,9 @@
 
 namespace libtest {
 
+LIBTEST_API
+bool jenkins_is_caller(void);
+
 LIBTEST_API
 bool gdb_is_caller(void);
 

+ 7 - 1
tests/cycle.cc

@@ -176,8 +176,14 @@ collection_st collection[] ={
   {0, 0, 0, 0}
 };
 
-static void *world_create(server_startup_st& servers, test_return_t& )
+static void *world_create(server_startup_st& servers, test_return_t& error)
 {
+  if (jenkins_is_caller())
+  {
+    error= TEST_SKIPPED;
+    return NULL;
+  }
+
   return new cycle_context_st(servers);
 }