Revision: 75947
http://sourceforge.net/p/brlcad/code/75947
Author: starseeker
Date: 2020-05-27 01:28:24 +0000 (Wed, 27 May 2020)
Log Message:
-----------
Tests don't go in the regress subdir unless they are part of the regress target
Modified Paths:
--------------
brlcad/branches/bioh/misc/CMake/BRLCAD_Targets.cmake
brlcad/branches/bioh/regress/rtwizard/CMakeLists.txt
Modified: brlcad/branches/bioh/misc/CMake/BRLCAD_Targets.cmake
===================================================================
--- brlcad/branches/bioh/misc/CMake/BRLCAD_Targets.cmake 2020-05-27
01:21:01 UTC (rev 75946)
+++ brlcad/branches/bioh/misc/CMake/BRLCAD_Targets.cmake 2020-05-27
01:28:24 UTC (rev 75947)
@@ -979,7 +979,11 @@
# 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")
+ if (${testname}_STAND_ALONE)
+ set_target_properties(${testname} PROPERTIES FOLDER "BRL-CAD Regression
Tests")
+ else (${testname}_STAND_ALONE)
+ set_target_properties(${testname} PROPERTIES FOLDER "BRL-CAD Regression
Tests/regress")
+ endif (${testname}_STAND_ALONE)
# 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)
Modified: brlcad/branches/bioh/regress/rtwizard/CMakeLists.txt
===================================================================
--- brlcad/branches/bioh/regress/rtwizard/CMakeLists.txt 2020-05-27
01:21:01 UTC (rev 75946)
+++ brlcad/branches/bioh/regress/rtwizard/CMakeLists.txt 2020-05-27
01:28:24 UTC (rev 75947)
@@ -25,6 +25,7 @@
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)
+set_target_properties(regress-rtwiz_m35_A PROPERTIES FOLDER "BRL-CAD
Regression Tests/rtwizard")
DISTCLEAN(${LOG_FILE} ${TARGET_IMAGE})
add_dependencies(regress-rtwizard regress-rtwiz_m35_A)
@@ -34,6 +35,7 @@
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)
+set_target_properties(regress-rtwiz_m35_B PROPERTIES FOLDER "BRL-CAD
Regression Tests/rtwizard")
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)
@@ -45,6 +47,7 @@
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)
+set_target_properties(regress-rtwiz_m35_C PROPERTIES FOLDER "BRL-CAD
Regression Tests/rtwizard")
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)
@@ -56,6 +59,7 @@
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)
+set_target_properties(regress-rtwiz_m35_D PROPERTIES FOLDER "BRL-CAD
Regression Tests/rtwizard")
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)
@@ -67,6 +71,7 @@
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)
+set_target_properties(regress-rtwiz_m35_E PROPERTIES FOLDER "BRL-CAD
Regression Tests/rtwizard")
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)
@@ -78,6 +83,7 @@
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)
+set_target_properties(regress-rtwiz_m35_F PROPERTIES FOLDER "BRL-CAD
Regression Tests/rtwizard")
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)
@@ -89,6 +95,7 @@
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)
+set_target_properties(regress-rtwiz_m35_edge_only PROPERTIES FOLDER "BRL-CAD
Regression Tests/rtwizard")
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)
@@ -100,6 +107,7 @@
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)
+set_target_properties(regress-rtwiz_m35_edge_only_color PROPERTIES FOLDER
"BRL-CAD Regression Tests/rtwizard")
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)
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
