Просмотр исходного кода

Tests/BuildDepends: Make 3-second delay more robust

Use "cmake -E sleep 3" instead of execute_process with a TIMEOUT of 3.
This avoids using a busy loop or depending on a timeout to kill it.
Brad King 11 лет назад
Родитель
Сommit
e4114ee9e9
2 измененных файлов с 1 добавлено и 8 удалено
  1. 1 2
      Tests/BuildDepends/CMakeLists.txt
  2. 0 6
      Tests/BuildDepends/Project/bar.cxx

+ 1 - 2
Tests/BuildDepends/CMakeLists.txt

@@ -182,8 +182,7 @@ else()
 endif()
 
 message("Waiting 3 seconds...")
-# any additional argument will cause ${bar} to wait forever
-execute_process(COMMAND ${bar} -infinite TIMEOUT 3 OUTPUT_VARIABLE out)
+execute_process(COMMAND ${CMAKE_COMMAND} -E sleep 3)
 
 message("Modifying Project/foo.cxx")
 write_file(${BuildDepends_BINARY_DIR}/Project/foo.cxx

+ 0 - 6
Tests/BuildDepends/Project/bar.cxx

@@ -15,11 +15,5 @@ int main(int argc, char** argv)
   /* Print out the string that should have been regenerated.  */
   printf("%s\n", regen_string);
   fflush(stdout);
-  // if any argument is used, wait forever
-  if (argc>1)
-    {
-    // wait that we get killed...
-    for(;;);
-    }
   return 0;
 }