Revision: 72488
http://sourceforge.net/p/brlcad/code/72488
Author: starseeker
Date: 2019-02-21 15:13:24 +0000 (Thu, 21 Feb 2019)
Log Message:
-----------
Turn on the libged density manipulation test
Modified Paths:
--------------
brlcad/trunk/misc/CMake/BRLCAD_Targets.cmake
brlcad/trunk/src/libged/tests/CMakeLists.txt
brlcad/trunk/src/libged/tests/mater.c
Modified: brlcad/trunk/misc/CMake/BRLCAD_Targets.cmake
===================================================================
--- brlcad/trunk/misc/CMake/BRLCAD_Targets.cmake 2019-02-21 14:40:09 UTC
(rev 72487)
+++ brlcad/trunk/misc/CMake/BRLCAD_Targets.cmake 2019-02-21 15:13:24 UTC
(rev 72488)
@@ -351,7 +351,7 @@
# install lists of CMake
function(BRLCAD_ADDEXEC execname srcslist libslist)
- cmake_parse_arguments(E "TEST;NO_INSTALL;NO_STRICT;NO_STRICT_CXX;GUI"
"FOLDER" "" ${ARGN})
+ cmake_parse_arguments(E
"TEST;TEST_USESDATA;NO_INSTALL;NO_STRICT;NO_STRICT_CXX;GUI" "FOLDER" "" ${ARGN})
# Go all C++ if the settings request it
SET_LANG_CXX("${srcslist}")
@@ -404,7 +404,9 @@
endif(NOT CMAKE_CONFIGURATION_TYPES)
endif(NOT WIN32)
else(E_NO_INSTALL OR E_TEST)
- install(TARGETS ${execname} DESTINATION ${BIN_DIR})
+ if (NOT E_TEST_USESDATA)
+ install(TARGETS ${execname} DESTINATION ${BIN_DIR})
+ endif (NOT E_TEST_USESDATA)
endif(E_NO_INSTALL OR E_TEST)
@@ -416,6 +418,9 @@
if(E_TEST AND NOT E_FOLDER AND NOT SUBFOLDER)
set(SUBFOLDER "/Test Programs")
endif(E_TEST AND NOT E_FOLDER AND NOT SUBFOLDER)
+ if(E_TEST_USESDATA AND NOT E_FOLDER AND NOT SUBFOLDER)
+ set(SUBFOLDER "/Test Programs")
+ endif(E_TEST_USESDATA AND NOT E_FOLDER AND NOT SUBFOLDER)
if(E_FOLDER)
set(SUBFOLDER "/${E_FOLDER}")
endif(E_FOLDER)
Modified: brlcad/trunk/src/libged/tests/CMakeLists.txt
===================================================================
--- brlcad/trunk/src/libged/tests/CMakeLists.txt 2019-02-21 14:40:09 UTC
(rev 72487)
+++ brlcad/trunk/src/libged/tests/CMakeLists.txt 2019-02-21 15:13:24 UTC
(rev 72488)
@@ -1,7 +1,8 @@
BRLCAD_ADDEXEC(ged_test_tops test_tops.c libged TEST)
add_test(NAME ged_test_tops_moss COMMAND ged_test_tops
"${CMAKE_CURRENT_SOURCE_DIR}/ged_tests.g")
-BRLCAD_ADDEXEC(ged_test_mater mater.c libged TEST)
+BRLCAD_ADDEXEC(ged_test_mater mater.c libged TEST_USESDATA)
+add_test(NAME ged_test_mater_density COMMAND ged_test_mater dstd)
# Note: it is particularly important that the lint tests in particular are kept
# in a separate file, since its bad input examples stand an excellent chance of
Modified: brlcad/trunk/src/libged/tests/mater.c
===================================================================
--- brlcad/trunk/src/libged/tests/mater.c 2019-02-21 14:40:09 UTC (rev
72487)
+++ brlcad/trunk/src/libged/tests/mater.c 2019-02-21 15:13:24 UTC (rev
72488)
@@ -98,6 +98,9 @@
const char *mat2 = "2,1.1e-1,Material02";
const char *mat1_reassign = "1,2.0,Material 03";
+ /* Need this for bu_dir to work correctly */
+ bu_setprogname(av[0]);
+
if (ac != 2) {
printf("Usage: %s test_name\n", av[0]);
return 1;
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
_______________________________________________
BRL-CAD Source Commits mailing list
brlcad-commits@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/brlcad-commits
