Cosmetics: rename tests with context factory at the end of the name.

diff --git a/teshsuite/smpi/mpich3-test/coll/CMakeLists.txt b/teshsuite/smpi/mpich3-test/coll/CMakeLists.txt
index e1c5459..ed0b323 100644 (file)
--- a/teshsuite/smpi/mpich3-test/coll/CMakeLists.txt
+++ b/teshsuite/smpi/mpich3-test/coll/CMakeLists.txt
@@ -212,15 +212,15 @@ if(enable_smpi AND enable_smpi_MPICH3_testsuite)
   MACRO(ADD_MPICH3_COLL SELECTOR FACTORY PRIVATIZATION)
     set(NAME "test-smpi-mpich3-coll-${SELECTOR}")
     set(ARGS "-execarg=--cfg=smpi/coll-selector:${SELECTOR}" ${ARGN})
   MACRO(ADD_MPICH3_COLL SELECTOR FACTORY PRIVATIZATION)
     set(NAME "test-smpi-mpich3-coll-${SELECTOR}")
     set(ARGS "-execarg=--cfg=smpi/coll-selector:${SELECTOR}" ${ARGN})

+    if(NOT "${PRIVATIZATION}" STREQUAL "" AND HAVE_PRIVATIZATION)
+      set(NAME "${NAME}-${PRIVATIZATION}")
+      set(ARGS ${ARGS} "-execarg=--cfg=smpi/privatization:${PRIVATIZATION}")
+    endif()

     string(TOUPPER "HAVE_${FACTORY}_CONTEXTS" HAVE_FACTORY)
     if(NOT "${FACTORY}" STREQUAL "" AND ${HAVE_FACTORY})
       set(NAME "${NAME}-${FACTORY}")
       set(ARGS ${ARGS} "-execarg=--cfg=contexts/factory:${FACTORY}")
     endif()
     string(TOUPPER "HAVE_${FACTORY}_CONTEXTS" HAVE_FACTORY)
     if(NOT "${FACTORY}" STREQUAL "" AND ${HAVE_FACTORY})
       set(NAME "${NAME}-${FACTORY}")
       set(ARGS ${ARGS} "-execarg=--cfg=contexts/factory:${FACTORY}")
     endif()

-    if(NOT "${PRIVATIZATION}" STREQUAL "" AND HAVE_PRIVATIZATION)
-      set(NAME "${NAME}-${PRIVATIZATION}")
-      set(ARGS ${ARGS} "-execarg=--cfg=smpi/privatization:${PRIVATIZATION}")
-    endif()

     ADD_TEST(${NAME} ${CMAKE_COMMAND} -E chdir ${CMAKE_BINARY_DIR}/teshsuite/smpi/mpich3-test/coll ${PERL_EXECUTABLE} ${CMAKE_HOME_DIRECTORY}/teshsuite/smpi/mpich3-test/runtests ${TESH_OPTION} -mpiexec=${CMAKE_BINARY_DIR}/smpi_script/bin/smpirun -srcdir=${CMAKE_HOME_DIRECTORY}/teshsuite/smpi/mpich3-test/coll -tests=testlist ${ARGS})
     SET_TESTS_PROPERTIES(${NAME} PROPERTIES PASS_REGULAR_EXPRESSION "tests passed!")
   ENDMACRO()
     ADD_TEST(${NAME} ${CMAKE_COMMAND} -E chdir ${CMAKE_BINARY_DIR}/teshsuite/smpi/mpich3-test/coll ${PERL_EXECUTABLE} ${CMAKE_HOME_DIRECTORY}/teshsuite/smpi/mpich3-test/runtests ${TESH_OPTION} -mpiexec=${CMAKE_BINARY_DIR}/smpi_script/bin/smpirun -srcdir=${CMAKE_HOME_DIRECTORY}/teshsuite/smpi/mpich3-test/coll -tests=testlist ${ARGS})
     SET_TESTS_PROPERTIES(${NAME} PROPERTIES PASS_REGULAR_EXPRESSION "tests passed!")
   ENDMACRO()