Revision ff8f35e0
Added by Pierre-Loïc Garoche almost 5 years ago
| regression_tests/modules/strategies.cmake | ||
|---|---|---|
| 45 | 45 |
file(COPY ${GEN_SRC_DIR}/${L}_${GEN_NODE}_input_values DESTINATION ${LUSTRE_OUTPUT_DIR})
|
| 46 | 46 |
elseif(EXISTS ${GEN_SRC_DIR}/${L}.lusi)
|
| 47 | 47 |
message("generate ${L}_${GEN_NODE}_input_values \n")
|
| 48 |
|
|
| 48 |
# message (" command is ${JAVA_RUNTIME} -cp ${CMAKE_BINARY_DIR}/modules/ Generate_inputs_lusi ${GEN_NODE} ${L}.lusi ${GEN_MAX}" )
|
|
| 49 | 49 |
execute_process(RESULT_VARIABLE res |
| 50 | 50 |
COMMAND ${JAVA_RUNTIME} -cp ${CMAKE_BINARY_DIR}/modules/ Generate_inputs_lusi ${GEN_NODE} ${L}.lusi ${GEN_MAX}
|
| 51 | 51 |
WORKING_DIRECTORY ${GEN_SRC_DIR})
|
| ... | ... | |
| 248 | 248 |
|
| 249 | 249 |
#***********************fourth strategy: compare in case of CEX examples the Zustre trace with lustrec |
| 250 | 250 |
function(Compare_Zustre_and_Lustrec_outputs) |
| 251 |
set(options "")
|
|
| 252 |
set(oneValueArgs NODE LUS_FILE CALL_ID TESTS_PREFIX SRC_DIR DST_DIR) |
|
| 251 |
set(options MYJAVADIFF)
|
|
| 252 |
set(oneValueArgs NODE LUS_FILE CALL_ID TESTS_PREFIX SRC_DIR DST_DIR DIFF_EPSILON)
|
|
| 253 | 253 |
set(multiValueArgs OPTS ) |
| 254 | 254 |
cmake_parse_arguments(GEN "${options}" "${oneValueArgs}" "${multiValueArgs}" ${ARGN})
|
| 255 | 255 |
|
| ... | ... | |
| 313 | 313 |
endif() |
| 314 | 314 |
|
| 315 | 315 |
#************** compare ********************************** |
| 316 |
add_test(NAME ${GEN_TESTS_PREFIX}_COMPARE_OUTPUTS_OF_LUSTREC_ZUSTRE_${L}_${GEN_NODE}_${LUS_OPTS_CUT}_${GEN_CALL_ID}
|
|
| 317 |
COMMAND diff -y ${L}_${GEN_NODE}_outputs ZUSTRE_output_values
|
|
| 318 |
WORKING_DIRECTORY ${ZUSTRE_OUTPUT_DIR}
|
|
| 319 |
) |
|
| 316 |
if (${MYJAVADIFF})
|
|
| 317 |
add_test(NAME ${GEN_TESTS_PREFIX}_COMPARE_OUTPUTS_OF_LUSTREC_ZUSTRE_${L}_${GEN_NODE}_${LUS_OPTS_CUT}_${GEN_CALL_ID}
|
|
| 318 |
COMMAND ${JAVA_RUNTIME} -cp ${CMAKE_BINARY_DIR}/modules/ compare_lustrec_outputs ${L}_${GEN_NODE}_outputs ZUSTRE_output_values ${DIFF_EPSILON}
|
|
| 319 |
WORKING_DIRECTORY ${ZUSTRE_OUTPUT_DIR}
|
|
| 320 |
) |
|
| 321 |
else() |
|
| 322 |
add_test(NAME ${GEN_TESTS_PREFIX}_COMPARE_OUTPUTS_OF_LUSTREC_ZUSTRE_${L}_${GEN_NODE}_${LUS_OPTS_CUT}_${GEN_CALL_ID}
|
|
| 323 |
COMMAND diff -y ${L}_${GEN_NODE}_outputs ZUSTRE_output_values
|
|
| 324 |
WORKING_DIRECTORY ${ZUSTRE_OUTPUT_DIR}
|
|
| 325 |
) |
|
| 326 |
endif() |
|
| 320 | 327 |
SET_TESTS_PROPERTIES ( ${GEN_TESTS_PREFIX}_COMPARE_OUTPUTS_OF_LUSTREC_ZUSTRE_${L}_${GEN_NODE}_${LUS_OPTS_CUT}_${GEN_CALL_ID}
|
| 321 | 328 |
PROPERTIES REQUIRED_FILES ${L}_${GEN_NODE}_outputs
|
| 322 | 329 |
DEPENDS ${GEN_TESTS_PREFIX}_BIN_${L}_${GEN_NODE}_${LUS_OPTS_CUT}_${GEN_CALL_ID} )
|
| ... | ... | |
| 354 | 361 |
|
| 355 | 362 |
|
| 356 | 363 |
function(Lustre_compile_and_compare_to_reference) |
| 357 |
set(options "")
|
|
| 358 |
set(oneValueArgs NODE LUS_FILE CALL_ID TESTS_PREFIX SRC_DIR DST_DIR) |
|
| 364 |
set(options MYJAVADIFF)
|
|
| 365 |
set(oneValueArgs NODE LUS_FILE CALL_ID TESTS_PREFIX SRC_DIR DST_DIR DIFF_EPSILON)
|
|
| 359 | 366 |
set(multiValueArgs OPTS ) |
| 360 | 367 |
cmake_parse_arguments(GEN "${options}" "${oneValueArgs}" "${multiValueArgs}" ${ARGN})
|
| 361 | 368 |
|
| ... | ... | |
| 402 | 409 |
endif() |
| 403 | 410 |
|
| 404 | 411 |
#************** execute C binary ********************************** |
| 405 |
add_test(NAME ${GEN_TESTS_PREFIX}_DIFF_${L}_${GEN_NODE}_${LUS_OPTS_CUT}_${GEN_CALL_ID}
|
|
| 406 |
COMMAND diff -y ${L}_${GEN_NODE}_${LUS_OPTS_CUT}_output_values ../${L}_${GEN_NODE}__output_values
|
|
| 407 |
WORKING_DIRECTORY ${LUSTRE_OUTPUT_DIR_${L}_${GEN_NODE}_${LUS_OPTS_CUT}}
|
|
| 408 |
) |
|
| 412 |
if (${MYJAVADIFF})
|
|
| 413 |
add_test(NAME ${GEN_TESTS_PREFIX}_DIFF_${L}_${GEN_NODE}_${LUS_OPTS_CUT}_${GEN_CALL_ID}
|
|
| 414 |
COMMAND ${JAVA_RUNTIME} -cp ${CMAKE_BINARY_DIR}/modules/ compare_lustrec_outputs ${L}_${GEN_NODE}_${LUS_OPTS_CUT}_output_values ../${L}_${GEN_NODE}__output_values ${DIFF_EPSILON}
|
|
| 415 |
WORKING_DIRECTORY ${LUSTRE_OUTPUT_DIR_${L}_${GEN_NODE}_${LUS_OPTS_CUT}}
|
|
| 416 |
) |
|
| 417 |
else() |
|
| 418 |
add_test(NAME ${GEN_TESTS_PREFIX}_DIFF_${L}_${GEN_NODE}_${LUS_OPTS_CUT}_${GEN_CALL_ID}
|
|
| 419 |
COMMAND diff -y ${L}_${GEN_NODE}_${LUS_OPTS_CUT}_output_values ../${L}_${GEN_NODE}__output_values
|
|
| 420 |
WORKING_DIRECTORY ${LUSTRE_OUTPUT_DIR_${L}_${GEN_NODE}_${LUS_OPTS_CUT}}
|
|
| 421 |
) |
|
| 422 |
endif() |
|
| 409 | 423 |
SET_TESTS_PROPERTIES ( ${GEN_TESTS_PREFIX}_DIFF_${L}_${GEN_NODE}_${LUS_OPTS_CUT}_${GEN_CALL_ID}
|
| 410 | 424 |
PROPERTIES REQUIRED_FILES ${L}_${GEN_NODE}_${LUS_OPTS_CUT}_output_values
|
| 411 | 425 |
DEPENDS ${GEN_TESTS_PREFIX}_BIN_${L}_${GEN_NODE}_${LUS_OPTS_CUT}_${GEN_CALL_ID} )
|
Also available in: Unified diff
Improved the diff tests: a new option allow to use the java test parameterized by epsilon (precision). Default bnehavior is using regular diff on files