diff options
| author | Brad King <brad.king@kitware.com> | 2020-04-17 11:05:19 (GMT) |
|---|---|---|
| committer | Brad King <brad.king@kitware.com> | 2020-04-17 11:05:19 (GMT) |
| commit | b6ce851bef023086b1a396ece719c792847b4529 (patch) | |
| tree | 5f17157be04a1a85b5d649262200dd08770425a8 /Source/kwsys | |
| parent | 9a450bcfec5411169007d5ca5f1bd40e6f476ff4 (diff) | |
| parent | 363ec4f585b42c95824a3cec82702c9741623307 (diff) | |
| download | CMake-b6ce851bef023086b1a396ece719c792847b4529.zip CMake-b6ce851bef023086b1a396ece719c792847b4529.tar.gz CMake-b6ce851bef023086b1a396ece719c792847b4529.tar.bz2 | |
Merge branch 'upstream-KWSys' into update-kwsys
# By KWSys Upstream
* upstream-KWSys:
KWSys 2020-04-17 (54845345)
Diffstat (limited to 'Source/kwsys')
| -rw-r--r-- | Source/kwsys/CMakeLists.txt | 4 | ||||
| -rw-r--r-- | Source/kwsys/testProcess.c | 7 |
2 files changed, 4 insertions, 7 deletions
diff --git a/Source/kwsys/CMakeLists.txt b/Source/kwsys/CMakeLists.txt index 5de2776..d8f7e57 100644 --- a/Source/kwsys/CMakeLists.txt +++ b/Source/kwsys/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/Source/kwsys/testProcess.c b/Source/kwsys/testProcess.c index 74daa12..5507dfb 100644 --- a/Source/kwsys/testProcess.c +++ b/Source/kwsys/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; } |