KWSys 2020-04-17 (54845345)

Code extracted from:

    https://gitlab.kitware.com/utils/kwsys.git

at commit 5484534580e49723f2d5ba094697880deabf9f48 (master).

Upstream Shortlog
-----------------

Ben Boeckel (1):
      39fd4817 testProcess: fix another clang-tidy warning

Brad King (1):
      b8177b56 testProcess: Disable unreliable test case 7

2 files changed, 4 insertions, 7 deletions

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 5de2776..d8f7e57 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -1198,9 +1198,7 @@ if(KWSYS_STANDALONE OR CMake_SOURCE_DIR)
     add_executable(${KWSYS_NAMESPACE}TestProcess testProcess.c)
     set_property(TARGET ${KWSYS_NAMESPACE}TestProcess PROPERTY LABELS ${KWSYS_LABELS_EXE})
     target_link_libraries(${KWSYS_NAMESPACE}TestProcess ${KWSYS_TARGET_C_LINK})
-    if(NOT CYGWIN)
-      set(KWSYS_TEST_PROCESS_7 7)
-    endif()
+    #set(KWSYS_TEST_PROCESS_7 7) # uncomment to run timing-sensitive test locally
     foreach(n 1 2 3 4 5 6 ${KWSYS_TEST_PROCESS_7} 9 10)
       add_test(kwsys.testProcess-${n} ${EXEC_DIR}/${KWSYS_NAMESPACE}TestProcess ${n})
       set_property(TEST kwsys.testProcess-${n} PROPERTY LABELS ${KWSYS_LABELS_TEST})
diff --git a/testProcess.c b/testProcess.c
index 74daa12..5507dfb 100644
--- a/testProcess.c
+++ b/testProcess.c
@@ -722,9 +722,8 @@ int main(int argc, const char* argv[])
     int r =
       runChild(cmd, state, exception, value, 0, 1, 0, timeout, 0, 1, 0, 0, 0);
     return r;
-  } else {
-    /* Improper usage.  */
-    fprintf(stdout, "Usage: %s <test number>\n", argv[0]);
-    return 1;
   }
+  /* Improper usage.  */
+  fprintf(stdout, "Usage: %s <test number>\n", argv[0]);
+  return 1;
 }