echo/CMake
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'upstream-KWSys' into update-kwsys

Browse Source 
# By KWSys Upstream
* upstream-KWSys:
  KWSys 2020-04-17 (54845345)
This commit is contained in:
Brad King 2020-04-17 07:05:19 -04:00
commit b6ce851bef
2 changed files with 4 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Source/kwsys/CMakeLists.txt
View File

@ -1198,9 +1198,7 @@ if(KWSYS_STANDALONE OR CMake_SOURCE_DIR)
add_executable(${KWSYS_NAMESPACE}TestProcess testProcess.c) add_executable(${KWSYS_NAMESPACE}TestProcess testProcess.c)
set_property(TARGET ${KWSYS_NAMESPACE}TestProcess PROPERTY LABELS ${KWSYS_LABELS_EXE}) set_property(TARGET ${KWSYS_NAMESPACE}TestProcess PROPERTY LABELS ${KWSYS_LABELS_EXE})
target_link_libraries(${KWSYS_NAMESPACE}TestProcess ${KWSYS_TARGET_C_LINK}) target_link_libraries(${KWSYS_NAMESPACE}TestProcess ${KWSYS_TARGET_C_LINK})
if(NOT CYGWIN) #set(KWSYS_TEST_PROCESS_7 7) # uncomment to run timing-sensitive test locally
set(KWSYS_TEST_PROCESS_7 7)
endif()
foreach(n 1 2 3 4 5 6 ${KWSYS_TEST_PROCESS_7} 9 10) 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}) add_test(kwsys.testProcess-${n} ${EXEC_DIR}/${KWSYS_NAMESPACE}TestProcess ${n})
set_property(TEST kwsys.testProcess-${n} PROPERTY LABELS ${KWSYS_LABELS_TEST}) set_property(TEST kwsys.testProcess-${n} PROPERTY LABELS ${KWSYS_LABELS_TEST})

3
Source/kwsys/testProcess.c
View File

@ -722,9 +722,8 @@ int main(int argc, const char* argv[])
int r = int r =
runChild(cmd, state, exception, value, 0, 1, 0, timeout, 0, 1, 0, 0, 0); runChild(cmd, state, exception, value, 0, 1, 0, timeout, 0, 1, 0, 0, 0);
return r; return r;
} else { }
/* Improper usage. */ /* Improper usage. */
fprintf(stdout, "Usage: %s <test number>\n", argv[0]); fprintf(stdout, "Usage: %s <test number>\n", argv[0]);
return 1; return 1;
}
} }