From f408ef5692a5d682f51a355c284f5033e984147e Mon Sep 17 00:00:00 2001 From: "Dmitry Yu. Naumov" Date: Wed, 10 Oct 2018 20:03:33 +0200 Subject: [PATCH] Conversion script in AddTest.cmake with usage. Write the ... 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 {}' --- scripts/cmake/test/AddTest.cmake | 31 +++++++++++++++++++++++++++++++ 1 file changed, 31 insertions(+) diff --git a/scripts/cmake/test/AddTest.cmake b/scripts/cmake/test/AddTest.cmake index 27ffd9416ed..b7ea628435c 100644 --- a/scripts/cmake/test/AddTest.cmake +++ b/scripts/cmake/test/AddTest.cmake @@ -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}) @@ -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("") + if(AddTest_WRAPPER STREQUAL "time") if(TIME_TOOL_PATH) set(WRAPPER_COMMAND time) @@ -194,6 +208,15 @@ 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(" ") + # message(" ${VTK_FILE}") + # message(" ${NAME_B}") + # message(" ${ABS_TOL}") + # message(" ${REL_TOL}") + # message(" ") + # 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} \ @@ -201,6 +224,12 @@ Use six arguments version of AddTest with absolute and relative tolerances") -a ${NAME_A} -b ${NAME_B} \ --abs ${ABS_TOL} --rel ${REL_TOL} \ ${TESTER_ARGS}") + # message(" ") + # message(" ${VTK_FILE}") + # message(" ${NAME_B}") + # message(" ${ABS_TOL}") + # message(" ${REL_TOL}") + # message(" ") endif() endforeach() else () @@ -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("") + # message("###END###") endfunction()