Skip to content

Commit

Permalink
Conversion script in AddTest.cmake with usage.
Browse files Browse the repository at this point in the history
Write the <test_def>...</test_def> into x.xml,
run the script:

cmake . |& \
    awk 'BEGIN{x=0}/###BEGIN###/{f=$2;x=f".xml";print x;print "" > x;next}/###END###/{x=0;next}{if (x != 0) print $0 > x}' | \
    parallel -j1 \
        'xmlstarlet ed -a "//OpenGeoSysProject/linear_solvers" -t elem -n test_definition -v "$(xmlstarlet sel -t -c //test_definition/\* {})" {.} | \
         xmlstarlet unesc | \
         xmlstarlet format -s 4 > {.}.tmp \
         && mv {.}.tmp {.}; \
         rm {}'
  • Loading branch information
endJunction committed Nov 5, 2018
1 parent f0a83a7 commit f408ef5
Showing 1 changed file with 31 additions and 0 deletions.
31 changes: 31 additions & 0 deletions scripts/cmake/test/AddTest.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -61,10 +61,12 @@ function (AddTest)
set (AddTest_REQUIREMENTS TRUE)
endif()

set(X_PRJ_FILE ${AddTest_EXECUTABLE_ARGS}) # For easier retrival later on
if("${AddTest_EXECUTABLE}" STREQUAL "ogs")
set(AddTest_EXECUTABLE_ARGS -o ${AddTest_BINARY_PATH_NATIVE} ${AddTest_EXECUTABLE_ARGS})
endif()


# --- Implement wrappers ---
# check requirements, disable if not met
if(${AddTest_REQUIREMENTS})
Expand All @@ -74,6 +76,18 @@ function (AddTest)
return()
endif()

##### New OgsTest command #####
# if ("${AddTest_EXECUTABLE}" STREQUAL "ogs")
# message("#### OgsTest(PROJECTFILE \"${AddTest_PATH}/${X_PRJ_FILE}\")")
# endif()

##### Conversion of prj files. ######
# if ("${AddTest_EXECUTABLE}" STREQUAL "ogs")
# message("###BEGIN### ${AddTest_SOURCE_PATH}/${X_PRJ_FILE}")
# endif()
# #list(GET AddTest_EXECUTABLE_ARGS 2 X_PRJ_FULL_PATH)
# message("<test_definition>")

if(AddTest_WRAPPER STREQUAL "time")
if(TIME_TOOL_PATH)
set(WRAPPER_COMMAND time)
Expand Down Expand Up @@ -194,13 +208,28 @@ Use six arguments version of AddTest with absolute and relative tolerances")
if("${REFERENCE_VTK_FILE}" STREQUAL "GLOB")
list(APPEND TESTER_COMMAND "${VTK_FILE} ${NAME_A} ${NAME_B} ${ABS_TOL} ${REL_TOL}")
set(GLOB_MODE TRUE)
# message(" <vtkdiff>")
# message(" <file>${VTK_FILE}</file>")
# message(" <field>${NAME_B}</field>")
# message(" <absolute_tolerance>${ABS_TOL}</absolute_tolerance>")
# message(" <relative_tolerance>${REL_TOL}</relative_tolerance>")
# message(" </vtkdiff>")
# message(FATAL_ERROR "GLOBGLOBGLOB")
# file(GLOB FILES RELATIVE ${case_path} ${GLOB})
# FILES = (xx1.vtu;xx2.vtu)
else()
list(APPEND TESTER_COMMAND "${SELECTED_DIFF_TOOL_PATH} \
${AddTest_SOURCE_PATH}/${REFERENCE_VTK_FILE} \
${AddTest_BINARY_PATH}/${VTK_FILE} \
-a ${NAME_A} -b ${NAME_B} \
--abs ${ABS_TOL} --rel ${REL_TOL} \
${TESTER_ARGS}")
# message(" <vtkdiff>")
# message(" <file>${VTK_FILE}</file>")
# message(" <field>${NAME_B}</field>")
# message(" <absolute_tolerance>${ABS_TOL}</absolute_tolerance>")
# message(" <relative_tolerance>${REL_TOL}</relative_tolerance>")
# message(" </vtkdiff>")
endif()
endforeach()
else ()
Expand Down Expand Up @@ -273,4 +302,6 @@ Use six arguments version of AddTest with absolute and relative tolerances")
)
set_tests_properties(${TESTER_NAME} PROPERTIES DEPENDS ${TEST_NAME})

# message("</test_definition>")
# message("###END###")
endfunction()

0 comments on commit f408ef5

Please sign in to comment.