@@ -65,14 +65,16 @@ macro(alien_test)
65
65
${ARGS_OPTIONS}
66
66
)
67
67
else ()
68
- if (UNIQUE_OUTPUT_DIR)
69
- set (OUTDIR ${CMAKE_BINARY_DIR} /${ARGS_WORKING_DIRECTORY} /alien.${ARGS_BENCH} .${ARGS_NAME} )
70
- set (PARAM_OUTDIR -A,OutputDirectory=${OUTDIR} )
71
- file (MAKE_DIRECTORY ${OUTDIR} )
68
+ if (ARGS_UNIQUE_OUTPUT_DIR)
69
+ set (ALIEN_TEST_OUTDIR ${CMAKE_BINARY_DIR} /${ARGS_WORKING_DIRECTORY} /alien.${ARGS_BENCH} .${ARGS_NAME} )
70
+ set (ALIEN_TEST_PARAM_OUTDIR -A,OutputDirectory=${ALIEN_TEST_OUTDIR} )
71
+ file (MAKE_DIRECTORY ${ALIEN_TEST_OUTDIR} )
72
+ else ()
73
+ set (ALIEN_TEST_PARAM_OUTDIR "" )
72
74
endif ()
73
75
add_test (
74
76
NAME alien.${ARGS_BENCH} .${ARGS_NAME}
75
- COMMAND ${ARGS_COMMAND} ${PARAM_OUTDIR }
77
+ COMMAND ${ARGS_COMMAND} ${ALIEN_TEST_PARAM_OUTDIR }
76
78
${ARGS_OPTIONS}
77
79
WORKING_DIRECTORY ${CMAKE_BINARY_DIR} /${ARGS_WORKING_DIRECTORY}
78
80
)
@@ -110,14 +112,16 @@ macro(alien_test)
110
112
${ARGS_OPTIONS}
111
113
)
112
114
else ()
113
- if (UNIQUE_OUTPUT_DIR)
114
- set (OUTDIR ${CMAKE_BINARY_DIR} /${ARGS_WORKING_DIRECTORY} /alien.${ARGS_BENCH} .${ARGS_NAME} .mpi-${mpi} )
115
- set (PARAM_OUTDIR -A,OutputDirectory=${OUTDIR} )
116
- file (MAKE_DIRECTORY ${OUTDIR} )
115
+ if (ARGS_UNIQUE_OUTPUT_DIR)
116
+ set (ALIEN_TEST_OUTDIR ${CMAKE_BINARY_DIR} /${ARGS_WORKING_DIRECTORY} /alien.${ARGS_BENCH} .${ARGS_NAME} .mpi-${mpi} )
117
+ set (ALIEN_TEST_PARAM_OUTDIR -A,OutputDirectory=${ALIEN_TEST_OUTDIR} )
118
+ file (MAKE_DIRECTORY ${ALIEN_TEST_OUTDIR} )
119
+ else ()
120
+ set (ALIEN_TEST_PARAM_OUTDIR "" )
117
121
endif ()
118
122
add_test (
119
123
NAME alien.${ARGS_BENCH} .${ARGS_NAME} .mpi-${mpi}
120
- COMMAND ${MPIEXEC_EXECUTABLE} ${MPIEXEC_NUMPROC_FLAG} ${mpi} ${MPIEXEC_PREFLAGS} $<TARGET_FILE:${ARGS_COMMAND} > ${MPIEXEC_POSTFLAGS} ${PARAM_OUTDIR }
124
+ COMMAND ${MPIEXEC_EXECUTABLE} ${MPIEXEC_NUMPROC_FLAG} ${mpi} ${MPIEXEC_PREFLAGS} $<TARGET_FILE:${ARGS_COMMAND} > ${MPIEXEC_POSTFLAGS} ${ALIEN_TEST_PARAM_OUTDIR }
121
125
${ARGS_OPTIONS}
122
126
WORKING_DIRECTORY ${CMAKE_BINARY_DIR} /${ARGS_WORKING_DIRECTORY}
123
127
)
0 commit comments