Revision: 75907
http://sourceforge.net/p/brlcad/code/75907
Author: starseeker
Date: 2020-05-24 02:32:16 +0000 (Sun, 24 May 2020)
Log Message:
-----------
Start working on a BRLCAD_REGRESS_TEST function intended to handle all
regression level test definitions.
Modified Paths:
--------------
brlcad/branches/bioh/misc/CMake/BRLCAD_Targets.cmake
brlcad/branches/bioh/regress/CMakeLists.txt
brlcad/branches/bioh/regress/icv/CMakeLists.txt
Modified: brlcad/branches/bioh/misc/CMake/BRLCAD_Targets.cmake
===================================================================
--- brlcad/branches/bioh/misc/CMake/BRLCAD_Targets.cmake 2020-05-24
00:50:43 UTC (rev 75906)
+++ brlcad/branches/bioh/misc/CMake/BRLCAD_Targets.cmake 2020-05-24
02:32:16 UTC (rev 75907)
@@ -895,6 +895,103 @@
BRLCAD_MANAGE_FILES(${inmanlist} ${man_target_dir})
endfunction(ADD_MAN_PAGES)
+
+
+#-----------------------------------------------------------------------------
+# The default operational mode of Regression tests is to be executed by a
+# parent CMake script, which captures the I/O from the test and stores it in an
+# individual log file named after the test. By default, a custom command and
+# CTest add_test command are set up to run a configured script. If TEST_SCRIPT
+# is provided specifying a particular script file that is used, otherwise the
+# convention of ${testname}.cmake.in in the current source directory is assumed
+# to specify the input test script.
+#
+# To allow for more customized test execution, the option TEST_DEFINED may be
+# passed to the function to instruct it to skip all setup for add_test and
+# custom command definitions. It is the callers responsibility to define an
+# appropriately named test with add_test - BRLCAD_REGRESSION_TEST in this mode
+# will then perform only the specific build target definition and subsequent
+# steps for wiring the test into the higher level commands.
+#
+# Standard actions for all regression targets:
+#
+# 1. A custom build target with the pattern regress-${testname} is defined
+# to allow for individual execution of the regression test with
+# "make regress-${testname}"
+#
+# 2. A label is added identifying the test as a regression test so the top
+# level commands "make check" and "make regress" know this particular
+# tests is one of the tests they are supposed to execute.
+#
+# 3. Any dependencies in ${depends_list} are added as build requirements to
+# the regress and check targets. This ensures that (unlike "make test"
+# and CTest itself, when those targets are built the dependencies of the
+# tests are built first. (A default CTest run prior to building will
+# result in all tests failing.)
+#
+# 4. If the keyword "STAND_ALONE" is passed in, a regress-${testname} target
+# is defined but no other connections are made between that target and the
+# agglomeration targets.
+#
+# 5. If a TIMEOUT argument is passed, a specific timeout tiem is set on the
+# test. Otherwise, a default is assigned so no test runs indefinitely.
+
+function(BRLCAD_REGRESSION_TEST testname depends_list)
+
+ cmake_parse_arguments(${testname} "TEST_DEFINED;STAND_ALONE"
"TEST_SCRIPT;TIMEOUT" "" ${ARGN})
+
+ if (NOT ${testname}_TEST_DEFINED)
+
+ # Test isn't yet defined - do the add_test setup
+ if (${testname}_TEST_SCRIPT)
+ configure_file("${${testname}_TEST_SCRIPT}"
"${CMAKE_CURRENT_BINARY_DIR}/${testname}.cmake" @ONLY)
+ else (${testname}_TEST_SCRIPT)
+ configure_file("${CMAKE_CURRENT_SOURCE_DIR}/${testname}.cmake.in"
"${CMAKE_CURRENT_BINARY_DIR}/${testname}.cmake" @ONLY)
+ endif (${testname}_TEST_SCRIPT)
+
+ add_test(NAME ${testname} COMMAND "${CMAKE_COMMAND}" -P
"${CMAKE_CURRENT_BINARY_DIR}/${testname}.cmake")
+
+ endif (NOT ${testname}_TEST_DEFINED)
+
+
+ # Every regression test gets a build target
+ if (CMAKE_CONFIGURATION_TYPES)
+ add_custom_target(${testname} COMMAND ${CMAKE_CTEST_COMMAND} -C
${CMAKE_CFG_INTDIR} -R ^${testname} --output-on-failure)
+ else (CMAKE_CONFIGURATION_TYPES)
+ add_custom_target(${testname} COMMAND ${CMAKE_CTEST_COMMAND} -R
^${testname} --output-on-failure)
+ endif (CMAKE_CONFIGURATION_TYPES)
+
+ # Make sure we at least get this into the regression test folder - local
+ # subdirectories may override this if they have more specific locations
+ # they want to use.
+ set_target_properties(${testname} PROPERTIES FOLDER "BRL-CAD Regression
Tests/regress")
+
+ # In Visual Studio, none of the regress build targets are added to the
default build.
+ set_target_properties(${testname} PROPERTIES EXCLUDE_FROM_DEFAULT_BUILD 1)
+
+ # Group any test not excluded by the STAND_ALONE flag with the other
regression tests by
+ # assigning a standard label
+ if (NOT ${testname}_STAND_ALONE)
+ set_tests_properties(${testname} PROPERTIES LABELS "Regression")
+ else (NOT ${testname}_STAND_ALONE)
+ set_tests_properties(${testname} PROPERTIES LABELS "STAND_ALONE")
+ endif (NOT ${testname}_STAND_ALONE)
+
+ # Set up dependencies for both regress and check
+ if (NOT "${depends_list}" STREQUAL "")
+ add_dependencies(regress ${depends_list})
+ add_dependencies(check ${depends_list})
+ endif (NOT "${depends_list}" STREQUAL "")
+
+ # Set either the standard timeout or a specified custom timeout
+ if (${testname}_TIMEOUT)
+ set_tests_properties(${testname} PROPERTIES TIMEOUT ${${testname}_TIMEOUT})
+ else (${testname}_TIMEOUT)
+ set_tests_properties(${testname} PROPERTIES TIMEOUT 300) # FIXME: want <60
+ endif (${testname}_TIMEOUT)
+
+endfunction(BRLCAD_REGRESSION_TEST)
+
# Local Variables:
# tab-width: 8
# mode: cmake
Modified: brlcad/branches/bioh/regress/CMakeLists.txt
===================================================================
--- brlcad/branches/bioh/regress/CMakeLists.txt 2020-05-24 00:50:43 UTC (rev
75906)
+++ brlcad/branches/bioh/regress/CMakeLists.txt 2020-05-24 02:32:16 UTC (rev
75907)
@@ -1,40 +1,3 @@
-function(Add_Regression_Test testname depends_list)
-
- cmake_parse_arguments(${testname} "EXCLUDE_FROM_REGRESS" "" "" ${ARGN})
-
- set_target_properties(regress-${testname} PROPERTIES
EXCLUDE_FROM_DEFAULT_BUILD 1)
-
- if (NOT ${testname}_EXCLUDE_FROM_REGRESS)
-
- # Make sure we at least get this into the regression test folder - local
- # subdirectories may override this if they have more specific locations
- # they want to use.
- set_target_properties(regress-${testname} PROPERTIES FOLDER "BRL-CAD
Regression Tests/regress")
-
- set_tests_properties(regress-${testname} PROPERTIES LABELS "Regression")
-
- else (NOT ${testname}_EXCLUDE_FROM_REGRESS)
-
- set_target_properties(regress-${testname} PROPERTIES FOLDER "BRL-CAD
Regression Tests")
-
- set_tests_properties(regress-${testname} PROPERTIES LABELS "NOT_WORKING")
-
- endif (NOT ${testname}_EXCLUDE_FROM_REGRESS)
-
- # Set up dependencies for both regress and check
- if (NOT "${depends_list}" STREQUAL "")
- add_dependencies(regress ${depends_list})
- if (TARGET check)
- add_dependencies(check ${depends_list})
- endif (TARGET check)
- endif (NOT "${depends_list}" STREQUAL "")
-
- if (NOT BRLCAD_DISABLE_REGRESS_TIMEOUT)
- set_tests_properties(regress-${testname} PROPERTIES TIMEOUT 300) # FIXME:
want <60
- endif (NOT BRLCAD_DISABLE_REGRESS_TIMEOUT)
-
-endfunction(Add_Regression_Test)
-
# Define the toplevel regression target - unless specifically excluded
# via a macro argument, this should collect all regression targets.
include(ProcessorCount)
@@ -52,25 +15,25 @@
add_subdirectory(icv)
# Geometry Editing Library Regression Tests
-add_subdirectory(ged)
+#add_subdirectory(ged)
# Geometry Conversion Regression Tests
-add_subdirectory(gcv)
+#add_subdirectory(gcv)
# NURBS Regression Tests
-add_subdirectory(nurbs)
+#add_subdirectory(nurbs)
# libpkg Regression Tests
-add_subdirectory(pkg)
+#add_subdirectory(pkg)
# Burst Regression Tests
-add_subdirectory(burst)
+#add_subdirectory(burst)
# RtWizard Image Generation Regression Tests
-add_subdirectory(rtwizard)
+#add_subdirectory(rtwizard)
# MGED command tests
-add_subdirectory(mged)
+#add_subdirectory(mged)
# Fuzz tests
include(Fuzzer)
@@ -80,56 +43,71 @@
endif (${HAVE_FUZZER})
# gchecker tests
-add_subdirectory(gchecker)
+#add_subdirectory(gchecker)
# License check
-add_subdirectory(licenses)
+#add_subdirectory(licenses)
# Repository check
-add_subdirectory(repository)
+#add_subdirectory(repository)
if(SH_EXEC)
- macro(Sh_Regression_Test testname depends_list)
- CMAKE_PARSE_ARGUMENTS(${testname} "EXCLUDE_FROM_REGRESS" "" "" ${ARGN})
- add_test(NAME regress-${testname} COMMAND ${SH_EXEC}
"${CMAKE_SOURCE_DIR}/regress/${testname}.sh" ${CMAKE_SOURCE_DIR})
- add_custom_target(regress-${testname} COMMAND ${CMAKE_CTEST_COMMAND} -R
^regress-${testname} --output-on-failure)
- set_target_properties(regress-${testname} PROPERTIES FOLDER "BRL-CAD
Regression Tests")
- if(NOT ${testname}_EXCLUDE_FROM_REGRESS)
- set_tests_properties(regress-${testname} PROPERTIES LABELS "Regression")
- else(NOT ${testname}_EXCLUDE_FROM_REGRESS)
- set_tests_properties(regress-${testname} PROPERTIES LABELS "NOT_WORKING")
- endif(NOT ${testname}_EXCLUDE_FROM_REGRESS)
- if(NOT "${depends_list}" STREQUAL "")
- add_dependencies(regress-${testname} ${depends_list})
- add_dependencies(regress ${depends_list})
- if(TARGET check)
- add_dependencies(check ${depends_list})
- endif(TARGET check)
- endif(NOT "${depends_list}" STREQUAL "")
- if(NOT BRLCAD_DISABLE_REGRESS_TIMEOUT)
- set_tests_properties(regress-${testname} PROPERTIES TIMEOUT 300) #
FIXME: want <60
- endif(NOT BRLCAD_DISABLE_REGRESS_TIMEOUT)
- endmacro(Sh_Regression_Test)
- Sh_Regression_Test(moss "rt;asc2g;pixdiff;pix-png;png-pix")
- Sh_Regression_Test(lights "rt;asc2g;pixdiff")
- Sh_Regression_Test(solids "rt;mged;pixdiff;asc2pix;gencolor")
- Sh_Regression_Test(shaders "rt;mged;pixdiff;gencolor")
- Sh_Regression_Test(spdi "rt;mged;pixdiff")
- Sh_Regression_Test(rtedge "rt;rtedge;pixdiff;asc2g")
- Sh_Regression_Test(iges "iges-g;g-iges;mged;asc2g")
- Sh_Regression_Test(weight "rtweight;mged")
- Sh_Regression_Test(gqa "gqa;mged")
- Sh_Regression_Test(bots "mged;pixdiff;rt")
- Sh_Regression_Test(usage "rt" EXCLUDE_FROM_REGRESS)
- Sh_Regression_Test(flawfinder "" EXCLUDE_FROM_REGRESS)
- Sh_Regression_Test(mged mged)
- Sh_Regression_Test(red mged)
- Sh_Regression_Test(nirt "mged;nirt")
- Sh_Regression_Test(comgeom "mged;asc2g;vdeck;comgeom-g")
- Sh_Regression_Test(dsp "mged;cv;asc2pix;rt;pix-bw")
- Sh_Regression_Test(asc2dsp "cv;asc2pix;pix-bw;asc2dsp")
+ add_test(NAME regress-moss COMMAND ${SH_EXEC}
"${CMAKE_SOURCE_DIR}/regress/moss.sh" ${CMAKE_SOURCE_DIR})
+ BRLCAD_REGRESSION_TEST(regress-moss "rt;asc2g;pixdiff;pix-png;png-pix"
TEST_DEFINED)
+ add_test(NAME regress-lights COMMAND ${SH_EXEC}
"${CMAKE_SOURCE_DIR}/regress/lights.sh" ${CMAKE_SOURCE_DIR})
+ BRLCAD_REGRESSION_TEST(regress-lights "rt;asc2g;pixdiff" TEST_DEFINED)
+
+ add_test(NAME regress-solids COMMAND ${SH_EXEC}
"${CMAKE_SOURCE_DIR}/regress/solids.sh" ${CMAKE_SOURCE_DIR})
+ BRLCAD_REGRESSION_TEST(regress-solids "rt;mged;pixdiff;asc2pix;gencolor"
TEST_DEFINED)
+
+ add_test(NAME regress-shaders COMMAND ${SH_EXEC}
"${CMAKE_SOURCE_DIR}/regress/shaders.sh" ${CMAKE_SOURCE_DIR})
+ BRLCAD_REGRESSION_TEST(regress-shaders "rt;mged;pixdiff;gencolor"
TEST_DEFINED)
+
+ add_test(NAME regress-spdi COMMAND ${SH_EXEC}
"${CMAKE_SOURCE_DIR}/regress/spdi.sh" ${CMAKE_SOURCE_DIR})
+ BRLCAD_REGRESSION_TEST(regress-spdi "rt;mged;pixdiff" TEST_DEFINED)
+
+ add_test(NAME regress-rtedge COMMAND ${SH_EXEC}
"${CMAKE_SOURCE_DIR}/regress/rtedge.sh" ${CMAKE_SOURCE_DIR})
+ BRLCAD_REGRESSION_TEST(regress-rtedge "rt;rtedge;pixdiff;asc2g" TEST_DEFINED)
+
+ add_test(NAME regress-iges COMMAND ${SH_EXEC}
"${CMAKE_SOURCE_DIR}/regress/iges.sh" ${CMAKE_SOURCE_DIR})
+ BRLCAD_REGRESSION_TEST(regress-iges "iges-g;g-iges;mged;asc2g" TEST_DEFINED)
+
+ add_test(NAME regress-weight COMMAND ${SH_EXEC}
"${CMAKE_SOURCE_DIR}/regress/weight.sh" ${CMAKE_SOURCE_DIR})
+ BRLCAD_REGRESSION_TEST(regress-weight "rtweight;mged" TEST_DEFINED)
+
+ add_test(NAME regress-gqa COMMAND ${SH_EXEC}
"${CMAKE_SOURCE_DIR}/regress/gqa.sh" ${CMAKE_SOURCE_DIR})
+ BRLCAD_REGRESSION_TEST(regress-gqa "gqa;mged" TEST_DEFINED)
+
+ add_test(NAME regress-bots COMMAND ${SH_EXEC}
"${CMAKE_SOURCE_DIR}/regress/bots.sh" ${CMAKE_SOURCE_DIR})
+ BRLCAD_REGRESSION_TEST(regress-bots "mged;pixdiff;rt" TEST_DEFINED)
+
+ add_test(NAME regress-mged COMMAND ${SH_EXEC}
"${CMAKE_SOURCE_DIR}/regress/mged.sh" ${CMAKE_SOURCE_DIR})
+ BRLCAD_REGRESSION_TEST(regress-mged mged TEST_DEFINED)
+
+ add_test(NAME regress-red COMMAND ${SH_EXEC}
"${CMAKE_SOURCE_DIR}/regress/red.sh" ${CMAKE_SOURCE_DIR})
+ BRLCAD_REGRESSION_TEST(regress-red mged TEST_DEFINED)
+
+ add_test(NAME regress-nirt COMMAND ${SH_EXEC}
"${CMAKE_SOURCE_DIR}/regress/nirt.sh" ${CMAKE_SOURCE_DIR})
+ BRLCAD_REGRESSION_TEST(regress-nirt "mged;nirt" TEST_DEFINED)
+
+ add_test(NAME regress-comgeom COMMAND ${SH_EXEC}
"${CMAKE_SOURCE_DIR}/regress/comgeom.sh" ${CMAKE_SOURCE_DIR})
+ BRLCAD_REGRESSION_TEST(regress-comgeom "mged;asc2g;vdeck;comgeom-g"
TEST_DEFINED)
+
+ add_test(NAME regress-dsp COMMAND ${SH_EXEC}
"${CMAKE_SOURCE_DIR}/regress/dsp.sh" ${CMAKE_SOURCE_DIR})
+ BRLCAD_REGRESSION_TEST(regress-dsp "mged;cv;asc2pix;rt;pix-bw" TEST_DEFINED)
+
+ add_test(NAME regress-asc2dsp COMMAND ${SH_EXEC}
"${CMAKE_SOURCE_DIR}/regress/asc2dsp.sh" ${CMAKE_SOURCE_DIR})
+ BRLCAD_REGRESSION_TEST(regress-asc2dsp "cv;asc2pix;pix-bw;asc2dsp"
TEST_DEFINED)
+
+ add_test(NAME regress-usage COMMAND ${SH_EXEC}
"${CMAKE_SOURCE_DIR}/regress/usage.sh" ${CMAKE_SOURCE_DIR})
+ BRLCAD_REGRESSION_TEST(regress-usage "rt" STAND_ALONE TEST_DEFINED)
+
+ # TODO - test for Python before adding this one
+ add_test(NAME regress-flawfinder COMMAND ${SH_EXEC}
"${CMAKE_SOURCE_DIR}/regress/flawfinder.sh" ${CMAKE_SOURCE_DIR})
+ BRLCAD_REGRESSION_TEST(regress-flawfinder "" STAND_ALONE TEST_DEFINED)
+
endif(SH_EXEC)
CMAKEFILES(
Modified: brlcad/branches/bioh/regress/icv/CMakeLists.txt
===================================================================
--- brlcad/branches/bioh/regress/icv/CMakeLists.txt 2020-05-24 00:50:43 UTC
(rev 75906)
+++ brlcad/branches/bioh/regress/icv/CMakeLists.txt 2020-05-24 02:32:16 UTC
(rev 75907)
@@ -1,108 +1,77 @@
# Tests for the various image format conversions supported
# by BRL-CAD
-macro(Add_Image_Test testname testtype depends_list)
- CMAKE_PARSE_ARGUMENTS(${testname} ""
"INPUT_IMAGE;CONTROL_IMAGE;TARGET_IMAGE;LOG_FILE" "" ${ARGN})
- set(TARGET_NAME ${testname})
- if (NOT "${testtype}" STREQUAL "IMPORT" AND NOT "${testtype}" STREQUAL
"EXPORT")
- message(FATAL_ERROR "Valid image test types are IMPORT and EXPORT: got
${testtype}")
- endif (NOT "${testtype}" STREQUAL "IMPORT" AND NOT "${testtype}" STREQUAL
"EXPORT")
- set(INPUT_IMAGE ${${testname}_INPUT_IMAGE})
- set(CONTROL_IMAGE ${${testname}_CONTROL_IMAGE})
- set(TARGET_IMAGE ${${testname}_TARGET_IMAGE})
- set(LOG_FILE ${${testname}_LOG_FILE})
- set(STAMP_FILE "${CMAKE_CURRENT_BINARY_DIR}/${testname}.done")
- set(deps_list pixcmp icv ${depends_list})
- if ("${testtype}" STREQUAL "IMPORT")
- configure_file("${CMAKE_CURRENT_SOURCE_DIR}/regress-icv_import.cmake.in"
"${CMAKE_CURRENT_BINARY_DIR}/regress-${testname}.cmake" @ONLY)
- endif ("${testtype}" STREQUAL "IMPORT")
- if ("${testtype}" STREQUAL "EXPORT")
- configure_file("${CMAKE_CURRENT_SOURCE_DIR}/regress-icv_export.cmake.in"
"${CMAKE_CURRENT_BINARY_DIR}/regress-${testname}.cmake" @ONLY)
- endif ("${testtype}" STREQUAL "EXPORT")
- add_custom_command(
- OUTPUT ${STAMP_FILE}
- COMMAND "${CMAKE_COMMAND}" -P
"${CMAKE_CURRENT_BINARY_DIR}/regress-${testname}.cmake"
- DEPENDS pixcmp icv ${deps_list}
- )
+# All image conversions with icv use one of two templates - import or export:
+set(TIMPORT "${CMAKE_CURRENT_SOURCE_DIR}/regress-icv_import.cmake.in")
+set(TEXPORT "${CMAKE_CURRENT_SOURCE_DIR}/regress-icv_export.cmake.in")
- add_test(NAME regress-icv-${testname} COMMAND "${CMAKE_COMMAND}" -P
"${CMAKE_CURRENT_BINARY_DIR}/regress-${testname}.cmake")
- add_custom_target(regress-icv-${testname} DEPENDS ${deps_list} ${STAMP_FILE})
- Add_Regression_Test(icv-${testname} "${deps_list}")
- set_target_properties(regress-icv-${testname} PROPERTIES FOLDER "BRL-CAD
Regression Tests/icv")
+# pix-pix
+set(INPUT_IMAGE "${CMAKE_CURRENT_SOURCE_DIR}/../../bench/ref/m35.pix")
+set(CONTROL_IMAGE "${CMAKE_CURRENT_SOURCE_DIR}/../../bench/ref/m35.pix")
+set(TARGET_IMAGE "${CMAKE_CURRENT_BINARY_DIR}/m35_icv.pix")
+set(LOG_FILE "${CMAKE_CURRENT_BINARY_DIR}/pix_pix.log")
+BRLCAD_REGRESSION_TEST(regress-pix_pix "pixcmp;icv" TEST_SCRIPT "${TIMPORT}")
+DISTCLEAN(${LOG_FILE} ${TARGET_IMAGE})
- add_dependencies(regress-icv regress-icv-${testname})
+# png-pix
+set(INPUT_IMAGE "${CMAKE_CURRENT_SOURCE_DIR}/m35.png")
+set(CONTROL_IMAGE "${CMAKE_CURRENT_SOURCE_DIR}/../../bench/ref/m35.pix")
+set(TARGET_IMAGE "${CMAKE_CURRENT_BINARY_DIR}/m35_png.pix")
+set(LOG_FILE "${CMAKE_CURRENT_BINARY_DIR}/png_pix.log")
+BRLCAD_REGRESSION_TEST(regress-png_pix "pixcmp;icv" TEST_SCRIPT "${TIMPORT}")
+DISTCLEAN(${LOG_FILE} ${TARGET_IMAGE})
- DISTCLEAN(
- ${STAMP_FILE}
- ${LOG_FILE}
- ${TARGET_IMAGE}
- )
-endmacro()
+# pix-png
+set(INPUT_IMAGE "${CMAKE_CURRENT_SOURCE_DIR}/../../bench/ref/m35.pix")
+set(CONTROL_IMAGE "${CMAKE_CURRENT_SOURCE_DIR}/m35.png")
+set(TARGET_IMAGE "${CMAKE_CURRENT_BINARY_DIR}/m35_pix.png")
+set(LOG_FILE "${CMAKE_CURRENT_BINARY_DIR}/pix_png.log")
+set(TARGET_NAME pix_png)
+bRLCAD_REGRESSION_TEST(regress-pix_png "pixcmp;icv" TEST_SCRIPT "${TEXPORT}")
+DISTCLEAN(${LOG_FILE} ${TARGET_IMAGE})
-add_custom_target(regress-icv)
-set_target_properties(regress-icv PROPERTIES EXCLUDE_FROM_DEFAULT_BUILD 1)
-set_target_properties(regress-icv PROPERTIES FOLDER "BRL-CAD Regression Tests")
-
-
-Add_Image_Test(pix_pix IMPORT ""
- INPUT_IMAGE "${CMAKE_CURRENT_SOURCE_DIR}/../../bench/ref/m35.pix"
- CONTROL_IMAGE "${CMAKE_CURRENT_SOURCE_DIR}/../../bench/ref/m35.pix"
- TARGET_IMAGE "${CMAKE_CURRENT_BINARY_DIR}/m35_icv.pix"
- LOG_FILE "${CMAKE_CURRENT_BINARY_DIR}/pix_pix.log"
- )
-
-Add_Image_Test(png_pix IMPORT ""
- INPUT_IMAGE "${CMAKE_CURRENT_SOURCE_DIR}/m35.png"
- CONTROL_IMAGE "${CMAKE_CURRENT_SOURCE_DIR}/../../bench/ref/m35.pix"
- TARGET_IMAGE "${CMAKE_CURRENT_BINARY_DIR}/m35_png.pix"
- LOG_FILE "${CMAKE_CURRENT_BINARY_DIR}/png_pix.log"
- )
-
-Add_Image_Test(pix_png EXPORT ""
- INPUT_IMAGE "${CMAKE_CURRENT_SOURCE_DIR}/../../bench/ref/m35.pix"
- CONTROL_IMAGE "${CMAKE_CURRENT_SOURCE_DIR}/m35.png"
- TARGET_IMAGE "${CMAKE_CURRENT_BINARY_DIR}/m35_pix.png"
- LOG_FILE "${CMAKE_CURRENT_BINARY_DIR}/pix_png.log"
- )
-
# Unpack compressed ppm file
execute_process(COMMAND "${CMAKE_COMMAND}" -E tar xjf
"${CMAKE_CURRENT_SOURCE_DIR}/m35.ppm.tbz2" WORKING_DIRECTORY
"${CMAKE_CURRENT_BINARY_DIR}")
DISTCLEAN("${CMAKE_CURRENT_BINARY_DIR}/m35.ppm")
-Add_Image_Test(ppm_pix IMPORT ""
- INPUT_IMAGE "${CMAKE_CURRENT_BINARY_DIR}/m35.ppm"
- CONTROL_IMAGE "${CMAKE_CURRENT_SOURCE_DIR}/../../bench/ref/m35.pix"
- TARGET_IMAGE "${CMAKE_CURRENT_BINARY_DIR}/m35_ppm.pix"
- LOG_FILE "${CMAKE_CURRENT_BINARY_DIR}/ppm_pix.log"
- )
+# ppm_pix
+set(INPUT_IMAGE "${CMAKE_CURRENT_BINARY_DIR}/m35.ppm")
+set(CONTROL_IMAGE "${CMAKE_CURRENT_SOURCE_DIR}/../../bench/ref/m35.pix")
+set(TARGET_IMAGE "${CMAKE_CURRENT_BINARY_DIR}/m35_ppm.pix")
+set(LOG_FILE "${CMAKE_CURRENT_BINARY_DIR}/ppm_pix.log")
+BRLCAD_REGRESSION_TEST(regress-ppm_pix "pixcmp;icv" TEST_SCRIPT "${TIMPORT}")
+DISTCLEAN(${LOG_FILE} ${TARGET_IMAGE})
-Add_Image_Test(pix_ppm EXPORT ""
- INPUT_IMAGE "${CMAKE_CURRENT_SOURCE_DIR}/../../bench/ref/m35.pix"
- CONTROL_IMAGE "${CMAKE_CURRENT_BINARY_DIR}/m35.ppm"
- TARGET_IMAGE "${CMAKE_CURRENT_BINARY_DIR}/m35_pix.ppm"
- LOG_FILE "${CMAKE_CURRENT_BINARY_DIR}/pix_ppm.log"
- )
+# pix_ppm
+set(INPUT_IMAGE "${CMAKE_CURRENT_SOURCE_DIR}/../../bench/ref/m35.pix")
+set(CONTROL_IMAGE "${CMAKE_CURRENT_BINARY_DIR}/m35.ppm")
+set(TARGET_IMAGE "${CMAKE_CURRENT_BINARY_DIR}/m35_pix.ppm")
+set(LOG_FILE "${CMAKE_CURRENT_BINARY_DIR}/pix_ppm.log")
+set(TARGET_NAME pix_ppm)
+BRLCAD_REGRESSION_TEST(regress-pix_ppm "pixcmp;icv" TEST_SCRIPT "${TEXPORT}")
+DISTCLEAN(${LOG_FILE} ${TARGET_IMAGE})
-
# Unpack compressed dpix file
execute_process(COMMAND "${CMAKE_COMMAND}" -E tar xjf
"${CMAKE_CURRENT_SOURCE_DIR}/m35.dpix.tbz2" WORKING_DIRECTORY
"${CMAKE_CURRENT_BINARY_DIR}")
DISTCLEAN("${CMAKE_CURRENT_BINARY_DIR}/m35.dpix")
-Add_Image_Test(dpix_pix IMPORT ""
- INPUT_IMAGE "${CMAKE_CURRENT_BINARY_DIR}/m35.dpix"
- CONTROL_IMAGE "${CMAKE_CURRENT_SOURCE_DIR}/../../bench/ref/m35.pix"
- TARGET_IMAGE "${CMAKE_CURRENT_BINARY_DIR}/m35_dpix.pix"
- LOG_FILE "${CMAKE_CURRENT_BINARY_DIR}/dpix_pix.log"
- )
+# dpix_pix
+set(INPUT_IMAGE "${CMAKE_CURRENT_BINARY_DIR}/m35.dpix")
+set(CONTROL_IMAGE "${CMAKE_CURRENT_SOURCE_DIR}/../../bench/ref/m35.pix")
+set(TARGET_IMAGE "${CMAKE_CURRENT_BINARY_DIR}/m35_dpix.pix")
+set(LOG_FILE "${CMAKE_CURRENT_BINARY_DIR}/dpix_pix.log")
+BRLCAD_REGRESSION_TEST(regress-dpix_pix "pixcmp;icv" TEST_SCRIPT "${TIMPORT}")
+DISTCLEAN(${LOG_FILE} ${TARGET_IMAGE})
-Add_Image_Test(pix_dpix EXPORT ""
- INPUT_IMAGE "${CMAKE_CURRENT_SOURCE_DIR}/../../bench/ref/m35.pix"
- CONTROL_IMAGE "${CMAKE_CURRENT_BINARY_DIR}/m35.dpix"
- TARGET_IMAGE "${CMAKE_CURRENT_BINARY_DIR}/m35_pix.dpix"
- LOG_FILE "${CMAKE_CURRENT_BINARY_DIR}/pix_dpix.log"
- )
+# pix_dpix
+set(INPUT_IMAGE "${CMAKE_CURRENT_SOURCE_DIR}/../../bench/ref/m35.pix")
+set(CONTROL_IMAGE "${CMAKE_CURRENT_BINARY_DIR}/m35.dpix")
+set(TARGET_IMAGE "${CMAKE_CURRENT_BINARY_DIR}/m35_pix.dpix")
+set(LOG_FILE "${CMAKE_CURRENT_BINARY_DIR}/pix_dpix.log")
+set(TARGET_NAME pix_dpix)
+BRLCAD_REGRESSION_TEST(regress-pix_dpix "pixcmp;icv" TEST_SCRIPT "${TEXPORT}")
+DISTCLEAN(${LOG_FILE} ${TARGET_IMAGE})
-
# Unpack compressed bw file and control
execute_process(COMMAND "${CMAKE_COMMAND}" -E tar xjf
"${CMAKE_CURRENT_SOURCE_DIR}/m35.bw.tbz2" WORKING_DIRECTORY
"${CMAKE_CURRENT_BINARY_DIR}")
execute_process(COMMAND "${CMAKE_COMMAND}" -E tar xjf
"${CMAKE_CURRENT_SOURCE_DIR}/m35_bw.pix.tbz2" WORKING_DIRECTORY
"${CMAKE_CURRENT_BINARY_DIR}")
@@ -109,33 +78,41 @@
DISTCLEAN("${CMAKE_CURRENT_BINARY_DIR}/m35.bw")
DISTCLEAN("${CMAKE_CURRENT_BINARY_DIR}/m35_bw.pix")
-Add_Image_Test(bw_pix IMPORT ""
- INPUT_IMAGE "${CMAKE_CURRENT_BINARY_DIR}/m35.bw"
- CONTROL_IMAGE "${CMAKE_CURRENT_BINARY_DIR}/m35_bw.pix"
- TARGET_IMAGE "${CMAKE_CURRENT_BINARY_DIR}/m35_bw-out.pix"
- LOG_FILE "${CMAKE_CURRENT_BINARY_DIR}/bw_pix.log"
- )
+# bw_pix
+set(INPUT_IMAGE "${CMAKE_CURRENT_BINARY_DIR}/m35.bw")
+set(CONTROL_IMAGE "${CMAKE_CURRENT_BINARY_DIR}/m35_bw.pix")
+set(TARGET_IMAGE "${CMAKE_CURRENT_BINARY_DIR}/m35_bw-out.pix")
+set(LOG_FILE "${CMAKE_CURRENT_BINARY_DIR}/bw_pix.log")
+set(TARGET_NAME bw_pix)
+BRLCAD_REGRESSION_TEST(regress-bw_pix "pixcmp;icv" TEST_SCRIPT "${TIMPORT}")
+DISTCLEAN(${LOG_FILE} ${TARGET_IMAGE})
-Add_Image_Test(pix_bw EXPORT ""
- INPUT_IMAGE "${CMAKE_CURRENT_SOURCE_DIR}/../../bench/ref/m35.pix"
- CONTROL_IMAGE "${CMAKE_CURRENT_BINARY_DIR}/m35.bw"
- TARGET_IMAGE "${CMAKE_CURRENT_BINARY_DIR}/m35_pix.bw"
- LOG_FILE "${CMAKE_CURRENT_BINARY_DIR}/pix_bw.log"
- )
+# pix_bw
+set(INPUT_IMAGE "${CMAKE_CURRENT_SOURCE_DIR}/../../bench/ref/m35.pix")
+set(CONTROL_IMAGE "${CMAKE_CURRENT_BINARY_DIR}/m35.bw")
+set(TARGET_IMAGE "${CMAKE_CURRENT_BINARY_DIR}/m35_pix.bw")
+set(LOG_FILE "${CMAKE_CURRENT_BINARY_DIR}/pix_bw.log")
+set(TARGET_NAME pix_bw)
+BRLCAD_REGRESSION_TEST(regress-pix_bw "pixcmp;icv" TEST_SCRIPT "${TEXPORT}")
+DISTCLEAN(${LOG_FILE} ${TARGET_IMAGE})
-Add_Image_Test(bw_png EXPORT ""
- INPUT_IMAGE "${CMAKE_CURRENT_BINARY_DIR}/m35.bw"
- CONTROL_IMAGE "${CMAKE_CURRENT_SOURCE_DIR}/m35_bw.png"
- TARGET_IMAGE "${CMAKE_CURRENT_BINARY_DIR}/m35_bw_png.png"
- LOG_FILE "${CMAKE_CURRENT_BINARY_DIR}/bw_png.log"
- )
+# bw_png
+set(INPUT_IMAGE "${CMAKE_CURRENT_BINARY_DIR}/m35.bw")
+set(CONTROL_IMAGE "${CMAKE_CURRENT_SOURCE_DIR}/m35_bw.png")
+set(TARGET_IMAGE "${CMAKE_CURRENT_BINARY_DIR}/m35_bw_png.png")
+set(LOG_FILE "${CMAKE_CURRENT_BINARY_DIR}/bw_png.log")
+set(TARGET_NAME bw_png)
+BRLCAD_REGRESSION_TEST(regress-bw_png "pixcmp;icv" TEST_SCRIPT "${TEXPORT}")
+DISTCLEAN(${LOG_FILE} ${TARGET_IMAGE})
-Add_Image_Test(png_bw EXPORT ""
- INPUT_IMAGE "${CMAKE_CURRENT_SOURCE_DIR}/m35_bw.png"
- CONTROL_IMAGE "${CMAKE_CURRENT_BINARY_DIR}/m35.bw"
- TARGET_IMAGE "${CMAKE_CURRENT_BINARY_DIR}/m35_png_bw.bw"
- LOG_FILE "${CMAKE_CURRENT_BINARY_DIR}/png_bw.log"
- )
+# png_bw
+set(INPUT_IMAGE "${CMAKE_CURRENT_SOURCE_DIR}/m35_bw.png")
+set(CONTROL_IMAGE "${CMAKE_CURRENT_BINARY_DIR}/m35.bw")
+set(TARGET_IMAGE "${CMAKE_CURRENT_BINARY_DIR}/m35_png_bw.bw")
+set(LOG_FILE "${CMAKE_CURRENT_BINARY_DIR}/png_bw.log")
+set(TARGET_NAME png_bw)
+BRLCAD_REGRESSION_TEST(regress-png_bw "pixcmp;icv" TEST_SCRIPT "${TEXPORT}")
+DISTCLEAN(${LOG_FILE} ${TARGET_IMAGE})
CMAKEFILES(
CMakeLists.txt
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
