@@ -264,15 +264,6 @@ set (ENV{CI_MODEL} ${MODEL})
264264    file  (APPEND  ${CTEST_SCRIPT_DIRECTORY} /FailedCTest.txt "Failed Configure: ${res} \n " )
265265  endif  ()
266266
267-   # On Cray XC40, configuring fails in the Fortran section when using the craype-mic-knl module. 
268-   # When the configure phase is done with the craype-haswell module and the build phase is done 
269-   # with the craype-mic-knl module, configure succeeds and tests pass on the knl compute nodes 
270-   # for Intel, Cray, GCC and Clang compilers.  If the variables aren't set or if not 
271-   # cross compiling, the module switch will not occur. 
272-   if  (CMAKE_CROSSCOMPILING  AND  COMPILENODE_HWCOMPILE_MODULE AND  COMPUTENODE_HWCOMPILE_MODULE)
273-       execute_process  (COMMAND  module switch ${COMPILENODE_HWCOMPILE_MODULE}  ${COMPUTENODE_HWCOMPILE_MODULE} )
274-   endif  ()
275- 
276267  ctest_build  (BUILD  "${CTEST_BINARY_DIRECTORY} "  APPEND  RETURN_VALUE  res NUMBER_ERRORS  errval)
277268  if  (LOCAL_SUBMIT)
278269    ctest_submit  (PARTS  Build )
@@ -287,15 +278,11 @@ set (ENV{CI_MODEL} ${MODEL})
287278        ctest_test  (BUILD  "${CTEST_BINARY_DIRECTORY} "  APPEND  ${ctest_test_args}  RETURN_VALUE  res)
288279      else  ()
289280        file (STRINGS  ${CTEST_BINARY_DIRECTORY} /Testing/TAG TAG_CONTENTS REGEX  "^2([0-9]+)[-]([0-9]+)$" )
290-         if  (LOCAL_BATCH_SCRIPT_COMMAND STREQUAL  "raybsub " )
291-           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 )
292283        else  ()
293-           if  (LOCAL_BATCH_SCRIPT_COMMAND STREQUAL  "qsub" )
294-             execute_process  (COMMAND  ${CTEST_BINARY_DIRECTORY} /${LOCAL_BATCH_SCRIPT_NAME}  ctestS.out)
295-           else  ()
296-             execute_process  (COMMAND  ${LOCAL_BATCH_SCRIPT_COMMAND}  ${LOCAL_BATCH_SCRIPT_ARGS}  ${CTEST_BINARY_DIRECTORY} /${LOCAL_BATCH_SCRIPT_NAME} )
297-           endif ()
298-         endif  ()
284+           execute_process  (COMMAND  ${LOCAL_BATCH_SCRIPT_COMMAND}  ${LOCAL_BATCH_SCRIPT_ARGS}  ${CTEST_BINARY_DIRECTORY} /${LOCAL_BATCH_SCRIPT_NAME} )
285+         endif ()
299286        message (STATUS  "Check for existence of ${CTEST_BINARY_DIRECTORY} /ctestS.done" )
300287        execute_process (COMMAND  ls ${CTEST_BINARY_DIRECTORY} /ctestS.done RESULT_VARIABLE  result OUTPUT_QUIET  ERROR_QUIET)
301288        while (result)
@@ -308,14 +295,10 @@ set (ENV{CI_MODEL} ${MODEL})
308295        endif  ()
309296        if  (LOCAL_BATCH_SCRIPT_PARALLEL_NAME)
310297          unset (result CACHE )
311-           if  (LOCAL_BATCH_SCRIPT_COMMAND STREQUAL  "raybsub " )
312-             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 )
313300          else  ()
314-             if  (LOCAL_BATCH_SCRIPT_COMMAND STREQUAL  "qsub" )
315-               execute_process  (COMMAND  ${CTEST_BINARY_DIRECTORY} /${LOCAL_BATCH_SCRIPT_NAME}  ctestP.out)
316-             else  ()
317-               execute_process  (COMMAND  ${LOCAL_BATCH_SCRIPT_COMMAND}  ${LOCAL_BATCH_SCRIPT_ARGS}  ${CTEST_BINARY_DIRECTORY} /${LOCAL_BATCH_SCRIPT_PARALLEL_NAME} )
318-             endif  ()
301+             execute_process  (COMMAND  ${LOCAL_BATCH_SCRIPT_COMMAND}  ${LOCAL_BATCH_SCRIPT_ARGS}  ${CTEST_BINARY_DIRECTORY} /${LOCAL_BATCH_SCRIPT_PARALLEL_NAME} )
319302          endif  ()
320303          message (STATUS  "Check for existence of ${CTEST_BINARY_DIRECTORY} /ctestP.done" )
321304          execute_process (COMMAND  ls ${CTEST_BINARY_DIRECTORY} /ctestP.done RESULT_VARIABLE  result OUTPUT_QUIET  ERROR_QUIET)
0 commit comments