Skip to content

Commit 3abb7e8

Browse files
committed
[alien,tests] Add forgotten ARGS_ prefix
1 parent c28f9b6 commit 3abb7e8

File tree

1 file changed

+14
-10
lines changed

1 file changed

+14
-10
lines changed

alien/ArcaneInterface/cmake/LoadAlienTest.cmake

+14-10
Original file line numberDiff line numberDiff line change
@@ -65,14 +65,16 @@ macro(alien_test)
6565
${ARGS_OPTIONS}
6666
)
6767
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 "")
7274
endif()
7375
add_test(
7476
NAME alien.${ARGS_BENCH}.${ARGS_NAME}
75-
COMMAND ${ARGS_COMMAND} ${PARAM_OUTDIR}
77+
COMMAND ${ARGS_COMMAND} ${ALIEN_TEST_PARAM_OUTDIR}
7678
${ARGS_OPTIONS}
7779
WORKING_DIRECTORY ${CMAKE_BINARY_DIR}/${ARGS_WORKING_DIRECTORY}
7880
)
@@ -110,14 +112,16 @@ macro(alien_test)
110112
${ARGS_OPTIONS}
111113
)
112114
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 "")
117121
endif ()
118122
add_test(
119123
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}
121125
${ARGS_OPTIONS}
122126
WORKING_DIRECTORY ${CMAKE_BINARY_DIR}/${ARGS_WORKING_DIRECTORY}
123127
)

0 commit comments

Comments
 (0)