@@ -278,15 +278,11 @@ set (ENV{CI_MODEL} ${MODEL})
278278 ctest_test (BUILD "${CTEST_BINARY_DIRECTORY} " APPEND ${ctest_test_args} RETURN_VALUE res)
279279 else ()
280280 file (STRINGS ${CTEST_BINARY_DIRECTORY} /Testing/TAG TAG_CONTENTS REGEX "^2([0-9]+)[-]([0-9]+)$" )
281- if (LOCAL_BATCH_SCRIPT_COMMAND STREQUAL "raybsub " )
282- execute_process (COMMAND ${CTEST_BINARY_DIRECTORY} /${LOCAL_BATCH_SCRIPT_COMMAND} ${LOCAL_BATCH_SCRIPT_ARGS} ${CTEST_BINARY_DIRECTORY} / ${ LOCAL_BATCH_SCRIPT_NAME} )
281+ if (LOCAL_BATCH_SCRIPT_COMMAND STREQUAL "qsub " )
282+ execute_process (COMMAND ${CTEST_BINARY_DIRECTORY} /${LOCAL_BATCH_SCRIPT_NAME} ctestS.out )
283283 else ()
284- if (LOCAL_BATCH_SCRIPT_COMMAND STREQUAL "qsub" )
285- execute_process (COMMAND ${CTEST_BINARY_DIRECTORY} /${LOCAL_BATCH_SCRIPT_NAME} ctestS.out)
286- else ()
287- execute_process (COMMAND ${LOCAL_BATCH_SCRIPT_COMMAND} ${LOCAL_BATCH_SCRIPT_ARGS} ${CTEST_BINARY_DIRECTORY} /${LOCAL_BATCH_SCRIPT_NAME} )
288- endif ()
289- endif ()
284+ execute_process (COMMAND ${LOCAL_BATCH_SCRIPT_COMMAND} ${LOCAL_BATCH_SCRIPT_ARGS} ${CTEST_BINARY_DIRECTORY} /${LOCAL_BATCH_SCRIPT_NAME} )
285+ endif ()
290286 message (STATUS "Check for existence of ${CTEST_BINARY_DIRECTORY} /ctestS.done" )
291287 execute_process (COMMAND ls ${CTEST_BINARY_DIRECTORY} /ctestS.done RESULT_VARIABLE result OUTPUT_QUIET ERROR_QUIET)
292288 while (result)
@@ -299,14 +295,10 @@ set (ENV{CI_MODEL} ${MODEL})
299295 endif ()
300296 if (LOCAL_BATCH_SCRIPT_PARALLEL_NAME)
301297 unset (result CACHE )
302- if (LOCAL_BATCH_SCRIPT_COMMAND STREQUAL "raybsub " )
303- execute_process (COMMAND ${CTEST_BINARY_DIRECTORY} /${LOCAL_BATCH_SCRIPT_COMMAND} ${LOCAL_BATCH_SCRIPT_ARGS} ${CTEST_BINARY_DIRECTORY} / ${LOCAL_BATCH_SCRIPT_PARALLEL_NAME} )
298+ if (LOCAL_BATCH_SCRIPT_COMMAND STREQUAL "qsub " )
299+ execute_process (COMMAND ${CTEST_BINARY_DIRECTORY} /${LOCAL_BATCH_SCRIPT_NAME} ctestP.out )
304300 else ()
305- if (LOCAL_BATCH_SCRIPT_COMMAND STREQUAL "qsub" )
306- execute_process (COMMAND ${CTEST_BINARY_DIRECTORY} /${LOCAL_BATCH_SCRIPT_NAME} ctestP.out)
307- else ()
308- execute_process (COMMAND ${LOCAL_BATCH_SCRIPT_COMMAND} ${LOCAL_BATCH_SCRIPT_ARGS} ${CTEST_BINARY_DIRECTORY} /${LOCAL_BATCH_SCRIPT_PARALLEL_NAME} )
309- endif ()
301+ execute_process (COMMAND ${LOCAL_BATCH_SCRIPT_COMMAND} ${LOCAL_BATCH_SCRIPT_ARGS} ${CTEST_BINARY_DIRECTORY} /${LOCAL_BATCH_SCRIPT_PARALLEL_NAME} )
310302 endif ()
311303 message (STATUS "Check for existence of ${CTEST_BINARY_DIRECTORY} /ctestP.done" )
312304 execute_process (COMMAND ls ${CTEST_BINARY_DIRECTORY} /ctestP.done RESULT_VARIABLE result OUTPUT_QUIET ERROR_QUIET)
0 commit comments