Revision: 75913
http://sourceforge.net/p/brlcad/code/75913
Author: starseeker
Date: 2020-05-24 18:13:38 +0000 (Sun, 24 May 2020)
Log Message:
-----------
Reenable rtwizard tests
Modified Paths:
--------------
brlcad/branches/bioh/regress/CMakeLists.txt
brlcad/branches/bioh/regress/rtwizard/CMakeLists.txt
brlcad/branches/bioh/regress/rtwizard/regress-rtwiz.cmake.in
Modified: brlcad/branches/bioh/regress/CMakeLists.txt
===================================================================
--- brlcad/branches/bioh/regress/CMakeLists.txt 2020-05-24 17:20:13 UTC (rev
75912)
+++ brlcad/branches/bioh/regress/CMakeLists.txt 2020-05-24 18:13:38 UTC (rev
75913)
@@ -30,7 +30,7 @@
add_subdirectory(burst)
# RtWizard Image Generation Regression Tests
-#add_subdirectory(rtwizard)
+add_subdirectory(rtwizard)
# MGED command tests
#add_subdirectory(mged)
Modified: brlcad/branches/bioh/regress/rtwizard/CMakeLists.txt
===================================================================
--- brlcad/branches/bioh/regress/rtwizard/CMakeLists.txt 2020-05-24
17:20:13 UTC (rev 75912)
+++ brlcad/branches/bioh/regress/rtwizard/CMakeLists.txt 2020-05-24
18:13:38 UTC (rev 75913)
@@ -1,111 +1,110 @@
# Tests for image generation via rtwizard
-# For multi-config build tools
-if(CMAKE_CONFIGURATION_TYPES)
- set(cfg_testname "-${CMAKE_CFG_INTDIR}")
-else(CMAKE_CONFIGURATION_TYPES)
- set(cfg_testname "")
-endif(CMAKE_CONFIGURATION_TYPES)
+# Note: we have to set up test dependencies to avoid running multiple rtwizard
+# tests at once. Correct solution is to fix the weaknesses of rtwizard that
+# prevent its being run in parallel, but that will be a lot of work and until
then we
+# make each image test depend on the previous test.
+#
+# This is also why these tests must be STAND_ALONE tests - a parallel distcheck
+# running multiple simultaneous builds may run multiple rtwizards at the same
+# time, since the below dependencies are only valid within a single build -
+# each individual distcheck has no way to know what other distchecks are doing.
-# TODO: Hack to avoid running multiple rtwizard tests at once. Correct
-# solution is to fix this, but until then make new targets depend on old
-# targets. This is also why the Add_Regression_Test command below sets
-# the EXCLUDE_FROM_REGRESS flag - a parallel distcheck may run multiple
-# rtwizards at the same time - each individual distcheck has no way to
-# know what other distchecks are doing.
-set(rtwizard_targets)
-
-macro(Add_RtWiz_Test testname input_file options depends_list)
- CMAKE_PARSE_ARGUMENTS(${testname} "" "CONTROL_IMAGE;TARGET_IMAGE;LOG_FILE"
"" ${ARGN})
- set(TARGET_NAME ${testname})
- set(OPTIONS ${options})
- set(INPUT_FILE ${input_file})
- set(CONTROL_IMAGE ${${testname}_CONTROL_IMAGE})
- set(TARGET_IMAGE ${${testname}_TARGET_IMAGE})
- set(LOG_FILE ${${testname}_LOG_FILE})
- set(TARGET_NAME ${testname})
- set(STAMP_FILE "${CMAKE_CURRENT_BINARY_DIR}/${testname}${cfg_testname}.done")
- configure_file("${CMAKE_CURRENT_SOURCE_DIR}/regress-rtwiz.cmake.in"
"${CMAKE_CURRENT_BINARY_DIR}/regress-${testname}.cmake" @ONLY)
- set (dep_list pixcmp rtwizard ${depends_list})
- add_custom_command(
- OUTPUT ${STAMP_FILE} ${TARGET_IMAGE} ${LOG_FILE}
- COMMAND "${CMAKE_COMMAND}" -P
"${CMAKE_CURRENT_BINARY_DIR}/regress-${testname}.cmake"
- DEPENDS ${dep_list}
- )
-
- add_test(NAME regress-rtwizard-${testname} COMMAND "${CMAKE_COMMAND}" -P
"${CMAKE_CURRENT_BINARY_DIR}/regress-${testname}.cmake")
- add_custom_target(regress-rtwizard-${testname} DEPENDS ${dep_list}
${STAMP_FILE})
- Add_Regression_Test(rtwizard-${testname} "${dep_list}" EXCLUDE_FROM_REGRESS)
- set_target_properties(regress-rtwizard-${testname} PROPERTIES FOLDER
"BRL-CAD Regression Tests/rtwizard")
-
- foreach(tgt ${rtwizard_targets})
- add_dependencies(regress-rtwizard-${testname} ${tgt})
- set_property(TEST regress-rtwizard-${testname} APPEND PROPERTY DEPENDS
${tgt})
- endforeach(tgt ${rtwizard_targets})
-
- set(rtwizard_targets ${rtwizard_targets} regress-rtwizard-${testname})
-
- add_dependencies(regress-rtwizard regress-rtwizard-${testname})
-
- DISTCLEAN(
- ${STAMP_FILE}
- ${LOG_FILE}
- ${TARGET_IMAGE}
- )
-endmacro()
-
+# Since these tests can't currently be part of the main regress target, we
define
+# convenience target to run all of the rtwizard tests:
add_custom_target(regress-rtwizard)
set_target_properties(regress-rtwizard PROPERTIES EXCLUDE_FROM_DEFAULT_BUILD 1)
set_target_properties(regress-rtwizard PROPERTIES FOLDER "BRL-CAD Regression
Tests")
-Add_RtWiz_Test(rtwiz_m35_A "${DATA_DIR}/db/m35.g" "all.g -t A --benchmark -s
512" "m35.g"
- CONTROL_IMAGE "${CMAKE_CURRENT_SOURCE_DIR}/m35_A_ref.pix"
- TARGET_IMAGE "${CMAKE_CURRENT_BINARY_DIR}/m35_A.pix"
- LOG_FILE "${CMAKE_CURRENT_BINARY_DIR}/m35_A.log"
- )
+# All rtwizard tests used the same script
+set(TSCRIPT "${CMAKE_CURRENT_SOURCE_DIR}/regress-rtwiz.cmake.in")
-Add_RtWiz_Test(rtwiz_m35_B "${DATA_DIR}/db/m35.g" "-l component -t B
--benchmark -z 2" "m35.g"
- CONTROL_IMAGE "${CMAKE_CURRENT_SOURCE_DIR}/m35_B_ref.pix"
- TARGET_IMAGE "${CMAKE_CURRENT_BINARY_DIR}/m35_B.pix"
- LOG_FILE "${CMAKE_CURRENT_BINARY_DIR}/m35_B.log"
- )
+set(INPUT_FILE "${DATA_DIR}/db/m35.g")
+set(CONTROL_IMAGE "${CMAKE_CURRENT_SOURCE_DIR}/m35_A_ref.pix")
+set(TARGET_IMAGE "${CMAKE_CURRENT_BINARY_DIR}/m35_A.pix")
+set(LOG_FILE "${CMAKE_CURRENT_BINARY_DIR}/m35_A.log")
+set(OPTIONS "all.g -t A --benchmark -s 512")
+BRLCAD_REGRESSION_TEST(regress-rtwiz_m35_A "rtwizard;pixcmp;m35.g" TEST_SCRIPT
"${TSCRIPT}" EXEC rtwizard STAND_ALONE)
+DISTCLEAN(${LOG_FILE} ${TARGET_IMAGE})
+add_dependencies(regress-rtwizard regress-rtwiz_m35_A)
-Add_RtWiz_Test(rtwiz_m35_C "${DATA_DIR}/db/m35.g" "-c component -l component
-t C --benchmark -z 2" "m35.g"
- CONTROL_IMAGE "${CMAKE_CURRENT_SOURCE_DIR}/m35_C_ref.pix"
- TARGET_IMAGE "${CMAKE_CURRENT_BINARY_DIR}/m35_C.pix"
- LOG_FILE "${CMAKE_CURRENT_BINARY_DIR}/m35_C.log"
- )
+set(INPUT_FILE "${DATA_DIR}/db/m35.g")
+set(CONTROL_IMAGE "${CMAKE_CURRENT_SOURCE_DIR}/m35_B_ref.pix")
+set(TARGET_IMAGE "${CMAKE_CURRENT_BINARY_DIR}/m35_B.pix")
+set(LOG_FILE "${CMAKE_CURRENT_BINARY_DIR}/m35_B.log")
+set(OPTIONS "-l component -t B --benchmark -z 2")
+BRLCAD_REGRESSION_TEST(regress-rtwiz_m35_B "rtwizard;pixcmp;m35.g" TEST_SCRIPT
"${TSCRIPT}" EXEC rtwizard STAND_ALONE)
+DISTCLEAN(${LOG_FILE} ${TARGET_IMAGE})
+set_property(TEST regress-rtwiz_m35_B APPEND PROPERTY DEPENDS
regress-rtwiz_m35_A)
+add_dependencies(regress-rtwiz_m35_B regress-rtwiz_m35_A)
+add_dependencies(regress-rtwizard regress-rtwiz_m35_B)
-Add_RtWiz_Test(rtwiz_m35_D "${DATA_DIR}/db/m35.g" "-l component -c
component/suspension,component/power.train -t D --benchmark -z 2" "m35.g"
- CONTROL_IMAGE "${CMAKE_CURRENT_SOURCE_DIR}/m35_D_ref.pix"
- TARGET_IMAGE "${CMAKE_CURRENT_BINARY_DIR}/m35_D.pix"
- LOG_FILE "${CMAKE_CURRENT_BINARY_DIR}/m35_D.log"
- )
+set(INPUT_FILE "${DATA_DIR}/db/m35.g")
+set(CONTROL_IMAGE "${CMAKE_CURRENT_SOURCE_DIR}/m35_C_ref.pix")
+set(TARGET_IMAGE "${CMAKE_CURRENT_BINARY_DIR}/m35_C.pix")
+set(LOG_FILE "${CMAKE_CURRENT_BINARY_DIR}/m35_C.log")
+set(OPTIONS "-c component -l component -t C --benchmark -z 2")
+BRLCAD_REGRESSION_TEST(regress-rtwiz_m35_C "rtwizard;pixcmp;m35.g" TEST_SCRIPT
"${TSCRIPT}" EXEC rtwizard STAND_ALONE)
+DISTCLEAN(${LOG_FILE} ${TARGET_IMAGE})
+set_property(TEST regress-rtwiz_m35_C APPEND PROPERTY DEPENDS
regress-rtwiz_m35_B)
+add_dependencies(regress-rtwiz_m35_C regress-rtwiz_m35_B)
+add_dependencies(regress-rtwizard regress-rtwiz_m35_C)
-Add_RtWiz_Test(rtwiz_m35_E "${DATA_DIR}/db/m35.g" "-g component -c
component/power.train -t E --benchmark -z 2" "m35.g"
- CONTROL_IMAGE "${CMAKE_CURRENT_SOURCE_DIR}/m35_E_ref.pix"
- TARGET_IMAGE "${CMAKE_CURRENT_BINARY_DIR}/m35_E.pix"
- LOG_FILE "${CMAKE_CURRENT_BINARY_DIR}/m35_E.log"
- )
+set(INPUT_FILE "${DATA_DIR}/db/m35.g")
+set(CONTROL_IMAGE "${CMAKE_CURRENT_SOURCE_DIR}/m35_D_ref.pix")
+set(TARGET_IMAGE "${CMAKE_CURRENT_BINARY_DIR}/m35_D.pix")
+set(LOG_FILE "${CMAKE_CURRENT_BINARY_DIR}/m35_D.log")
+set(OPTIONS "-l component -c component/suspension,component/power.train -t D
--benchmark -z 2")
+BRLCAD_REGRESSION_TEST(regress-rtwiz_m35_D "rtwizard;pixcmp;m35.g" TEST_SCRIPT
"${TSCRIPT}" EXEC rtwizard STAND_ALONE)
+DISTCLEAN(${LOG_FILE} ${TARGET_IMAGE})
+set_property(TEST regress-rtwiz_m35_D APPEND PROPERTY DEPENDS
regress-rtwiz_m35_C)
+add_dependencies(regress-rtwiz_m35_D regress-rtwiz_m35_C)
+add_dependencies(regress-rtwizard regress-rtwiz_m35_D)
-Add_RtWiz_Test(rtwiz_m35_F "${DATA_DIR}/db/m35.g" "-l component -g component
-c component/power.train -t F --benchmark -z 2" "m35.g"
- CONTROL_IMAGE "${CMAKE_CURRENT_SOURCE_DIR}/m35_F_ref.pix"
- TARGET_IMAGE "${CMAKE_CURRENT_BINARY_DIR}/m35_F.pix"
- LOG_FILE "${CMAKE_CURRENT_BINARY_DIR}/m35_F.log"
- )
+set(INPUT_FILE "${DATA_DIR}/db/m35.g")
+set(CONTROL_IMAGE "${CMAKE_CURRENT_SOURCE_DIR}/m35_E_ref.pix")
+set(TARGET_IMAGE "${CMAKE_CURRENT_BINARY_DIR}/m35_E.pix")
+set(LOG_FILE "${CMAKE_CURRENT_BINARY_DIR}/m35_E.log")
+set(OPTIONS "-g component -c component/power.train -t E --benchmark -z 2")
+BRLCAD_REGRESSION_TEST(regress-rtwiz_m35_E "rtwizard;pixcmp;m35.g" TEST_SCRIPT
"${TSCRIPT}" EXEC rtwizard STAND_ALONE)
+DISTCLEAN(${LOG_FILE} ${TARGET_IMAGE})
+set_property(TEST regress-rtwiz_m35_E APPEND PROPERTY DEPENDS
regress-rtwiz_m35_D)
+add_dependencies(regress-rtwiz_m35_E regress-rtwiz_m35_D)
+add_dependencies(regress-rtwizard regress-rtwiz_m35_E)
-Add_RtWiz_Test(rtwiz_m35_edge_only "${DATA_DIR}/db/m35.g" "-l component
--benchmark -z 2" "m35.g"
- CONTROL_IMAGE "${CMAKE_CURRENT_SOURCE_DIR}/m35_edge_only_ref.pix"
- TARGET_IMAGE "${CMAKE_CURRENT_BINARY_DIR}/m35_edge_only.pix"
- LOG_FILE "${CMAKE_CURRENT_BINARY_DIR}/m35_edge_only.log"
- )
+set(INPUT_FILE "${DATA_DIR}/db/m35.g")
+set(CONTROL_IMAGE "${CMAKE_CURRENT_SOURCE_DIR}/m35_F_ref.pix")
+set(TARGET_IMAGE "${CMAKE_CURRENT_BINARY_DIR}/m35_F.pix")
+set(LOG_FILE "${CMAKE_CURRENT_BINARY_DIR}/m35_F.log")
+set(OPTIONS "-l component -g component -c component/power.train -t F
--benchmark -z 2")
+BRLCAD_REGRESSION_TEST(regress-rtwiz_m35_F "rtwizard;pixcmp;m35.g" TEST_SCRIPT
"${TSCRIPT}" EXEC rtwizard STAND_ALONE)
+DISTCLEAN(${LOG_FILE} ${TARGET_IMAGE})
+set_property(TEST regress-rtwiz_m35_F APPEND PROPERTY DEPENDS
regress-rtwiz_m35_E)
+add_dependencies(regress-rtwiz_m35_F regress-rtwiz_m35_E)
+add_dependencies(regress-rtwizard regress-rtwiz_m35_F)
-Add_RtWiz_Test(rtwiz_m35_edge_only_color "${DATA_DIR}/db/m35.g" "-l component
--benchmark -z 2 --line-color 100/200/255 -C 30/30/30" "m35.g"
- CONTROL_IMAGE "${CMAKE_CURRENT_SOURCE_DIR}/m35_edge_only_color_ref.pix"
- TARGET_IMAGE "${CMAKE_CURRENT_BINARY_DIR}/m35_edge_only_color.pix"
- LOG_FILE "${CMAKE_CURRENT_BINARY_DIR}/m35_edge_only_color.log"
- )
+set(INPUT_FILE "${DATA_DIR}/db/m35.g")
+set(CONTROL_IMAGE "${CMAKE_CURRENT_SOURCE_DIR}/m35_edge_only_ref.pix")
+set(TARGET_IMAGE "${CMAKE_CURRENT_BINARY_DIR}/m35_edge_only.pix")
+set(LOG_FILE "${CMAKE_CURRENT_BINARY_DIR}/m35_edge_only.log")
+set(OPTIONS "-l component --benchmark -z 2")
+BRLCAD_REGRESSION_TEST(regress-rtwiz_m35_edge_only "rtwizard;pixcmp;m35.g"
TEST_SCRIPT "${TSCRIPT}" EXEC rtwizard STAND_ALONE)
+DISTCLEAN(${LOG_FILE} ${TARGET_IMAGE})
+set_property(TEST regress-rtwiz_m35_edge_only APPEND PROPERTY DEPENDS
regress-rtwiz_m35_F)
+add_dependencies(regress-rtwiz_m35_edge_only regress-rtwiz_m35_F)
+add_dependencies(regress-rtwizard regress-rtwiz_m35_edge_only)
+set(INPUT_FILE "${DATA_DIR}/db/m35.g")
+set(CONTROL_IMAGE "${CMAKE_CURRENT_SOURCE_DIR}/m35_edge_only_color_ref.pix")
+set(TARGET_IMAGE "${CMAKE_CURRENT_BINARY_DIR}/m35_edge_only_color.pix")
+set(LOG_FILE "${CMAKE_CURRENT_BINARY_DIR}/m35_edge_only_color.log")
+set(OPTIONS "-l component --benchmark -z 2 --line-color 100/200/255 -C
30/30/30")
+BRLCAD_REGRESSION_TEST(regress-rtwiz_m35_edge_only_color
"rtwizard;pixcmp;m35.g" TEST_SCRIPT "${TSCRIPT}" EXEC rtwizard STAND_ALONE)
+DISTCLEAN(${LOG_FILE} ${TARGET_IMAGE})
+set_property(TEST regress-rtwiz_m35_edge_only_color APPEND PROPERTY DEPENDS
regress-rtwiz_m35_edge_only)
+add_dependencies(regress-rtwiz_m35_edge_only_color regress-rtwiz_m35_edge_only)
+add_dependencies(regress-rtwizard regress-rtwiz_m35_edge_only_color)
+
CMAKEFILES(
CMakeLists.txt
m35_A_ref.pix
Modified: brlcad/branches/bioh/regress/rtwizard/regress-rtwiz.cmake.in
===================================================================
--- brlcad/branches/bioh/regress/rtwizard/regress-rtwiz.cmake.in
2020-05-24 17:20:13 UTC (rev 75912)
+++ brlcad/branches/bioh/regress/rtwizard/regress-rtwiz.cmake.in
2020-05-24 18:13:38 UTC (rev 75913)
@@ -1,63 +1,65 @@
+# Values set at CMake configure time
set(CBDIR "@CMAKE_CURRENT_BINARY_DIR@")
set(INPUTFILE "@INPUT_FILE@")
set(CTRLIMG "@CONTROL_IMAGE@")
set(TGTIMG "@TARGET_IMAGE@")
set(LOGFILE "@LOG_FILE@")
-set(TGTNAME "@TARGET_NAME@")
-set(SBDIR "@CMAKE_RUNTIME_OUTPUT_DIRECTORY@")
-set(DBDIR "@CMAKE_RUNTIME_OUTPUT_DIRECTORY_DEBUG@")
-set(RBDIR "@CMAKE_RUNTIME_OUTPUT_DIRECTORY_RELEASE@")
-# Use the mechanism created to allow multiconfig builds to
-# know what the current build type is.
-if(EXISTS "@CMAKE_BINARY_DIR@/CMakeTmp/CURRENT_PATH/Release")
- set(BDIR "${RBDIR}")
- set(test_suffix "-Release")
-elseif(EXISTS "@CMAKE_BINARY_DIR@/CMakeTmp/CURRENT_PATH/Debug")
- set(BDIR "${DBDIR}")
- set(test_suffix "-Debug")
-else(EXISTS "@CMAKE_BINARY_DIR@/CMakeTmp/CURRENT_PATH/Release")
- set(BDIR "${SBDIR}")
- set(test_suffix "")
-endif(EXISTS "@CMAKE_BINARY_DIR@/CMakeTmp/CURRENT_PATH/Release")
+file(WRITE "${LOGFILE}" "Starting rtwizard run\n")
-get_filename_component(EXE "@CMAKE_COMMAND@" EXT)
-set(RWIZ "${BDIR}/rtwizard${EXE}")
-set(PIXCMP "${BDIR}/pixcmp${EXE}")
+# The executable locations aren't know at CMake configure time, so one of them
+# is passed in via the EXEC variable at runtime. De-quote it and assign it to
+# the appropriate variable.
+string(REPLACE "\\" "" RTWIZ "${EXEC}")
+if (NOT EXISTS "${RTWIZ}")
+ file(WRITE "${LOGFILE}" "rtwizard not found at location \"${RTWIZ}\" -
aborting\n")
+ message(FATAL_ERROR "Unable to find rtwizard, aborting.\nSee ${LOGFILE} for
more details.")
+endif (NOT EXISTS "${RTWIZ}")
-# Now that we know where the binary directory is, set the .g input path
+# Use the path passed in from the build target generator expression
+# to ascertain the current binary directory in use, and locate any
+# other necessary programs.
+get_filename_component(BDIR "${RTWIZ}" DIRECTORY)
+set(PIXCMP_EXEC "${BDIR}/pixcmp${CMAKE_EXECUTABLE_SUFFIX}")
+if (NOT EXISTS "${PIXCMP_EXEC}")
+ file(WRITE "${LOGFILE}" "pixcmp not found at location \"${PIXCMP_EXEC}\" -
aborting\n")
+ message(FATAL_ERROR "Unable to find pixcmp, aborting.\nSee ${LOGFILE} for
more details.")
+endif (NOT EXISTS "${PIXCMP_EXEC}")
+
+# TODO - this will break if the binary directory is more than one deep
set(SRCFILE "${BDIR}/../${INPUTFILE}")
# Clean up in case we've run before
-execute_process(COMMAND "@CMAKE_COMMAND@" -E remove "${TGTIMG}")
+execute_process(COMMAND "@CMAKE_COMMAND@" -E remove -f "${TGTIMG}")
# Start with the file using standard UNIX line endings
file(APPEND "${LOGFILE}" "Generating ${TGTIMG}:\n")
execute_process(
- COMMAND "${RWIZ}" --no-gui -i "${SRCFILE}" -o "${TGTIMG}" @OPTIONS@
- OUTPUT_VARIABLE rtwiz_log ERROR_VARIABLE rtwiz_log
+ COMMAND "${RTWIZ}" --no-gui -i "${SRCFILE}" -o "${TGTIMG}" @OPTIONS@
+ RESULT_VARIABLE rtwiz_result OUTPUT_VARIABLE rtwiz_log ERROR_VARIABLE
rtwiz_log
)
file(APPEND "${LOGFILE}" "${rtwiz_log}")
set(rtwiz_log)
if(NOT EXISTS "${TGTIMG}")
- message(FATAL_ERROR "Unable to generate ${TGTIMG} with ${RWIZ},
aborting.\nSee ${LOGFILE} for more details.")
+ file(APPEND "${LOGFILE}" "Failure: ${rtwiz_result}")
+ message(FATAL_ERROR "Unable to generate ${TGTIMG} with ${RTWIZ},
aborting.\nSee ${LOGFILE} for more details.")
endif(NOT EXISTS "${TGTIMG}")
# pixcmp the results with the control image to make sure rtwiz got it right
file(APPEND "${LOGFILE}" "\nComparing ${TGTIMG} to ${CTRLIMG}:\n")
execute_process(
- COMMAND "${PIXCMP}" "${TGTIMG}" "${CTRLIMG}"
- RESULT_VARIABLE pixcmp_val OUTPUT_VARIABLE rtwiz_log ERROR_VARIABLE rtwiz_log
+ COMMAND "${PIXCMP_EXEC}" "${TGTIMG}" "${CTRLIMG}"
+ RESULT_VARIABLE pixcmp_result OUTPUT_VARIABLE rtwiz_log ERROR_VARIABLE
rtwiz_log
)
file(APPEND "${LOGFILE}" "${rtwiz_log}")
-if(${pixcmp_val} GREATER 0)
- message(FATAL_ERROR "Differences found between ${TGTIMG} and ${CTRLIMG} with
${PIXCMP}, aborting.\nSee ${LOGFILE} for more details.")
-else(${pixcmp_val} GREATER 0)
- execute_process(COMMAND "@CMAKE_COMMAND@" -E remove ${TGTIMG})
- execute_process(COMMAND "@CMAKE_COMMAND@" -E touch
"@CMAKE_CURRENT_BINARY_DIR@/${TGTNAME}${test_suffix}.done")
-endif(${pixcmp_val} GREATER 0)
+if(pixcmp_result)
+ file(APPEND "${LOGFILE}" "Failure: ${pixcmp_result}")
+ message(FATAL_ERROR "Differences found between ${TGTIMG} and ${CTRLIMG} with
${PIXCMP_EXEC}, aborting.\nSee ${LOGFILE} for more details.")
+endif(pixcmp_result)
+execute_process(COMMAND "@CMAKE_COMMAND@" -E remove -f ${TGTIMG})
+
# Local Variables:
# tab-width: 8
# mode: cmake
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
_______________________________________________
BRL-CAD Source Commits mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/brlcad-commits
