Skip to content

Add possibility to run post command with separate arguments #4058

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
wants to merge 1 commit into from
Closed

Add possibility to run post command with separate arguments #4058

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 8 additions & 4 deletions cmake/modules/RootTestDriver.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,9 +51,13 @@ if(PRE)
endif()

if(POST)
string(REPLACE "^" ";" _post ${POST})
set(POST_LIST ${POST})
separate_arguments(${POST_LIST})
string(REPLACE " " ";" _postargs ${POST_LIST})
list(GET _postargs 0 _postcmd)
list(REMOVE_AT _postargs 0)
if(DBG)
message(STATUS "testdriver:POST=${_post}")
message(STATUS "testdriver:POST=${_postcmd}${_postargs}")
endif()
endif()

Expand Down Expand Up @@ -143,7 +147,7 @@ if(CMD)
set(_chkerr ERROR_VARIABLE _errvar2) # Only check out eventually
endif()
endif()

execute_process(COMMAND ${_cmd} ${_input} ${_chkout} ${_chkerr} WORKING_DIRECTORY ${CWD} RESULT_VARIABLE _rc)

string(REGEX REPLACE "([.]*)[;][-][e][;]([^;]+)([.]*)" "\\1;-e '\\2\\3'" res "${_cmd}")
Expand Down Expand Up @@ -243,7 +247,7 @@ endif()

#---Execute post-command-----------------------------------------------------------------------------
if(POST)
execute_process(COMMAND ${_post} ${_cwd} OUTPUT_VARIABLE _outvar ERROR_VARIABLE _outvar RESULT_VARIABLE _rc)
execute_process(COMMAND ${_postcmd} ${_postargs} ${_cwd} OUTPUT_VARIABLE _outvar ERROR_VARIABLE _outvar RESULT_VARIABLE _rc)
if(_outvar)
message("-- BEGIN POST OUTPUT --")
message("${_outvar}")
Expand Down