Revision: 76375
http://sourceforge.net/p/brlcad/code/76375
Author: starseeker
Date: 2020-07-17 20:04:27 +0000 (Fri, 17 Jul 2020)
Log Message:
-----------
Move the remainder of the tests to subdirectories
Modified Paths:
--------------
brlcad/branches/bioh/misc/CMake/CMakeLists.txt
brlcad/branches/bioh/regress/CMakeLists.txt
brlcad/branches/bioh/regress/burst/CMakeLists.txt
brlcad/branches/bioh/regress/fuzz/CMakeLists.txt
brlcad/branches/bioh/regress/mged/CMakeLists.txt
brlcad/branches/bioh/regress/nurbs/CMakeLists.txt
Added Paths:
-----------
brlcad/branches/bioh/regress/bots/
brlcad/branches/bioh/regress/bots/CMakeLists.txt
brlcad/branches/bioh/regress/bots/bots.sh
brlcad/branches/bioh/regress/comgeom/
brlcad/branches/bioh/regress/comgeom/CMakeLists.txt
brlcad/branches/bioh/regress/comgeom/comgeom.cg
brlcad/branches/bioh/regress/comgeom/comgeom.sh
brlcad/branches/bioh/regress/comgeom/comgeom.tgt-1-v4-documented.cg
brlcad/branches/bioh/regress/comgeom/comgeom.tgt-1-v4.cg
brlcad/branches/bioh/regress/comgeom/m35.cg.gz
brlcad/branches/bioh/regress/gqa/
brlcad/branches/bioh/regress/gqa/CMakeLists.txt
brlcad/branches/bioh/regress/gqa/gqa.sh
brlcad/branches/bioh/regress/iges/
brlcad/branches/bioh/regress/iges/CMakeLists.txt
brlcad/branches/bioh/regress/iges/iges.sh
brlcad/branches/bioh/regress/iges/m35.asc.gz
brlcad/branches/bioh/regress/lights/
brlcad/branches/bioh/regress/lights/CMakeLists.txt
brlcad/branches/bioh/regress/lights/lights.cmake
brlcad/branches/bioh/regress/lights/lights.ref.pix
brlcad/branches/bioh/regress/lights/lights.sh
brlcad/branches/bioh/regress/mged/mged.sh
brlcad/branches/bioh/regress/mged/mged_test.sh
brlcad/branches/bioh/regress/nirt/CMakeLists.txt
brlcad/branches/bioh/regress/nirt/nirt.sh
brlcad/branches/bioh/regress/rtedge/
brlcad/branches/bioh/regress/rtedge/CMakeLists.txt
brlcad/branches/bioh/regress/rtedge/havoc.g.gz
brlcad/branches/bioh/regress/rtedge/rtedge.ref.pix.gz
brlcad/branches/bioh/regress/rtedge/rtedge.ref2.pix.gz
brlcad/branches/bioh/regress/rtedge/rtedge.ref3.pix.gz
brlcad/branches/bioh/regress/rtedge/rtedge.ref4.pix.gz
brlcad/branches/bioh/regress/rtedge/rtedge.ref5.pix.gz
brlcad/branches/bioh/regress/rtedge/rtedge.sh
brlcad/branches/bioh/regress/shaders/
brlcad/branches/bioh/regress/shaders/CMakeLists.txt
brlcad/branches/bioh/regress/shaders/shaders.eagleCAD-512x438.pix
brlcad/branches/bioh/regress/shaders/shaders.ref.pix
brlcad/branches/bioh/regress/shaders/shaders.sh
brlcad/branches/bioh/regress/solids/
brlcad/branches/bioh/regress/solids/CMakeLists.txt
brlcad/branches/bioh/regress/solids/solids.dsp.dat
brlcad/branches/bioh/regress/solids/solids.mged
brlcad/branches/bioh/regress/solids/solids.ref.pix
brlcad/branches/bioh/regress/solids/solids.sh
brlcad/branches/bioh/regress/solids/solids.simple.mged
brlcad/branches/bioh/regress/solids/solids.simple.ref.pix
brlcad/branches/bioh/regress/spdi/
brlcad/branches/bioh/regress/spdi/CMakeLists.txt
brlcad/branches/bioh/regress/spdi/spdi.ref.pix
brlcad/branches/bioh/regress/spdi/spdi.sh
Removed Paths:
-------------
brlcad/branches/bioh/misc/CMake/Fuzzer.cmake
brlcad/branches/bioh/regress/bots.sh
brlcad/branches/bioh/regress/comgeom.sh
brlcad/branches/bioh/regress/gqa.sh
brlcad/branches/bioh/regress/iges.sh
brlcad/branches/bioh/regress/lights.cmake
brlcad/branches/bioh/regress/lights.ref.pix
brlcad/branches/bioh/regress/lights.sh
brlcad/branches/bioh/regress/mged.sh
brlcad/branches/bioh/regress/mged_test.sh
brlcad/branches/bioh/regress/nirt.sh
brlcad/branches/bioh/regress/rtedge.ref.pix.gz
brlcad/branches/bioh/regress/rtedge.ref2.pix.gz
brlcad/branches/bioh/regress/rtedge.ref3.pix.gz
brlcad/branches/bioh/regress/rtedge.ref4.pix.gz
brlcad/branches/bioh/regress/rtedge.ref5.pix.gz
brlcad/branches/bioh/regress/rtedge.sh
brlcad/branches/bioh/regress/shaders.eagleCAD-512x438.pix
brlcad/branches/bioh/regress/shaders.ref.pix
brlcad/branches/bioh/regress/shaders.sh
brlcad/branches/bioh/regress/solids.ref.pix
brlcad/branches/bioh/regress/solids.sh
brlcad/branches/bioh/regress/solids.simple.ref.pix
brlcad/branches/bioh/regress/spdi.ref.pix
brlcad/branches/bioh/regress/spdi.sh
brlcad/branches/bioh/regress/tgms/
Modified: brlcad/branches/bioh/misc/CMake/CMakeLists.txt
===================================================================
--- brlcad/branches/bioh/misc/CMake/CMakeLists.txt 2020-07-17 18:50:23 UTC
(rev 76374)
+++ brlcad/branches/bioh/misc/CMake/CMakeLists.txt 2020-07-17 20:04:27 UTC
(rev 76375)
@@ -49,7 +49,6 @@
FindX11.cmake
FindXMLLINT.cmake
FindXSLTPROC.cmake
- Fuzzer.cmake
NSIS.template.in
NSIS_silent.template.in
OpenVDBUtils.cmake
Deleted: brlcad/branches/bioh/misc/CMake/Fuzzer.cmake
===================================================================
--- brlcad/branches/bioh/misc/CMake/Fuzzer.cmake 2020-07-17 18:50:23 UTC
(rev 76374)
+++ brlcad/branches/bioh/misc/CMake/Fuzzer.cmake 2020-07-17 20:04:27 UTC
(rev 76375)
@@ -1,65 +0,0 @@
-# F U Z Z E R . C M A K E
-# BRL-CAD
-#
-# Copyright (c) 2020 United States Government as represented by
-# the U.S. Army Research Laboratory.
-#
-# Redistribution and use in source and binary forms, with or without
-# modification, are permitted provided that the following conditions
-# are met:
-#
-# 1. Redistributions of source code must retain the above copyright
-# notice, this list of conditions and the following disclaimer.
-#
-# 2. Redistributions in binary form must reproduce the above
-# copyright notice, this list of conditions and the following
-# disclaimer in the documentation and/or other materials provided
-# with the distribution.
-#
-# 3. The name of the author may not be used to endorse or promote
-# products derived from this software without specific prior written
-# permission.
-#
-# THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS
-# OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
-# WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-# ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY
-# DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
-# DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE
-# GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-# INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
-# WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
-# NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
-# SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-#
-###
-
-include(CheckCXXCompilerFlag)
-
-
-# check whether fuzzing support is available. sets HAVE_FUZZER.
-function(brlcad_check_fuzzer)
- set(CMAKE_REQUIRED_FLAGS -fsanitize=fuzzer)
- check_cxx_compiler_flag(-fsanitize=fuzzer HAVE_FUZZER)
- set(HAVE_FUZZER ${HAVE_FUZZER} PARENT_SCOPE)
-endfunction(brlcad_check_fuzzer)
-
-
-# add fuzzing flags to the compile and link flags of a given target.
-function(brlcad_add_fuzzer target)
- brlcad_check_fuzzer()
- if (NOT ${HAVE_FUZZER})
- message(SEND_ERROR "Attempting to build fuzz targets with an unsupported
compiler (expecting clang)")
- endif (NOT ${HAVE_FUZZER})
-
- target_compile_options(${target} PRIVATE -fsanitize=fuzzer)
- target_link_options(${target} PRIVATE -fsanitize=fuzzer)
-endfunction(brlcad_add_fuzzer)
-
-
-# Local Variables:
-# tab-width: 8
-# mode: cmake
-# indent-tabs-mode: t
-# End:
-# ex: shiftwidth=2 tabstop=8
Modified: brlcad/branches/bioh/regress/CMakeLists.txt
===================================================================
--- brlcad/branches/bioh/regress/CMakeLists.txt 2020-07-17 18:50:23 UTC (rev
76374)
+++ brlcad/branches/bioh/regress/CMakeLists.txt 2020-07-17 20:04:27 UTC (rev
76375)
@@ -12,6 +12,7 @@
else (CMAKE_CONFIGURATION_TYPES)
add_custom_target(regress COMMAND ${CMAKE_CTEST_COMMAND} -L Regression
--output-on-failure --output-log "${CMAKE_BINARY_DIR}/regress_output.log"
${JFLAG})
endif (CMAKE_CONFIGURATION_TYPES)
+DISTCLEAN(${CMAKE_BINARY_DIR}/regress_output.log)
set_target_properties(regress PROPERTIES EXCLUDE_FROM_DEFAULT_BUILD 1)
set_target_properties(regress PROPERTIES FOLDER "BRL-CAD Regression Tests")
@@ -18,12 +19,27 @@
# ASC file Conversion Tests
add_subdirectory(asc)
+# Bag of Triangles Tests
+add_subdirectory(bots)
+
+# Burst Regression Tests
+add_subdirectory(burst)
+
+# comgeom Conversion Tests
+add_subdirectory(comgeom)
+
# DSP Regression Tests
add_subdirectory(dsp)
+# Fuzz tests (if supported by the compiler)
+add_subdirectory(fuzz)
+
# Image Conversion Regression Tests
add_subdirectory(icv)
+# gchecker tests
+add_subdirectory(gchecker)
+
# Geometry Editing Library Regression Tests
add_subdirectory(ged)
@@ -30,9 +46,27 @@
# Geometry Conversion Regression Tests
add_subdirectory(gcv)
+# GQA Regression Tests
+add_subdirectory(gqa)
+
+# IGES Regression Tests
+add_subdirectory(iges)
+
+# License check
+add_subdirectory(licenses)
+
+# light tests
+add_subdirectory(lights)
+
+# MGED command tests
+add_subdirectory(mged)
+
# moss.g Regression Tests
add_subdirectory(moss)
+# NIRT Regression Tests
+add_subdirectory(nirt)
+
# NURBS Regression Tests
add_subdirectory(nurbs)
@@ -42,76 +76,29 @@
# Region EDit (red) Regression Tests
add_subdirectory(red)
-# Burst Regression Tests
-add_subdirectory(burst)
+# Repository check
+add_subdirectory(repository)
+# rtedge Regression Tests
+add_subdirectory(rtedge)
+
# RtWizard Image Generation Regression Tests
add_subdirectory(rtwizard)
-# MGED command tests
-add_subdirectory(mged)
-
-# rtweight command tests
-add_subdirectory(weight)
-
-# Fuzz tests
-include(Fuzzer)
-brlcad_check_fuzzer()
-if (${HAVE_FUZZER})
- add_subdirectory(fuzz)
-endif (${HAVE_FUZZER})
-
-# gchecker tests
-add_subdirectory(gchecker)
-
-# License check
-add_subdirectory(licenses)
-
-# Repository check
-add_subdirectory(repository)
-
# Simulation of a 3rd party BRL-CAD library client code
add_subdirectory(user)
-if(SH_EXEC)
+# solids Regression Tests
+add_subdirectory(solids)
- if (TARGET mged AND TARGET asc2g)
+# shaders Regression Tests
+add_subdirectory(shaders)
- 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)
+# rtweight command tests
+add_subdirectory(weight)
- 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)
+if(SH_EXEC)
- 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-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-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)
-
- endif (TARGET mged AND TARGET asc2g)
-
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)
@@ -122,165 +109,13 @@
endif(SH_EXEC)
CMAKEFILES(
- bots.sh
- comgeom.sh
flawfinder.sh
- fuzz/CMakeLists.txt
- fuzz/fuzz_ged.cpp
- fuzz/fuzz_test1.cxx
- fuzz/run.sh
g-dot.sh
g-nff.sh
- gqa.sh
- iges.sh
library.sh
- lights.ref.pix
- lights.cmake
- lights.sh
- mged.sh
- mged_test.sh
- nirt.sh
- nirt/ovlps.g
- rtedge.ref.pix.gz
- rtedge.ref2.pix.gz
- rtedge.ref3.pix.gz
- rtedge.ref4.pix.gz
- rtedge.ref5.pix.gz
- rtedge.sh
- shaders.eagleCAD-512x438.pix
- shaders.ref.pix
- shaders.sh
- solids.ref.pix
- solids.sh
- solids.simple.ref.pix
- spdi.ref.pix
- spdi.sh
- tgms/comgeom.cg
- tgms/comgeom.tgt-1-v4-documented.cg
- tgms/comgeom.tgt-1-v4.cg
- tgms/havoc.g.gz
- tgms/m35.asc.gz
- tgms/m35.cg.gz
- tgms/solids.dsp.dat
- tgms/solids.mged
- tgms/solids.simple.mged
usage.sh
)
-# list of temporary files
-set(regress_outfiles
- bots.diff.log
- bots.diff.pix
- bots.g
- bots.lh.pix
- bots.log
- bots.no.pix
- bots.rh.pix
- bots.rl.diff.pix
- bots.rn.diff.pix
- bots.rs.diff.pix
- bots.sph.pix
- bots.sync.pix
- comgeom.log
- comgeom.m35-baseline.cg
- comgeom.m35.asc
- comgeom.m35.cg
- comgeom.m35.g
- comgeom.t-v4.g
- comgeom.t-v5.g
- density_table.txt
- gqa.adj_air.plot3
- gqa.exp_air.plot3
- gqa.g
- gqa.gaps.plot3
- gqa.log
- gqa.mged
- gqa.overlaps.plot3
- gqa.volume.plot3
- iges.export.iges
- iges.export.stdout.iges
- iges.g
- iges.import.export.iges
- iges.import.g
- iges.import2.export.iges
- iges.import2.g
- iges.import3.export.iges
- iges.import3.g
- iges.log
- iges.m35.asc
- iges.m35.g
- iges.m35.r516.iges
- lights.asc
- lights.diff.pix
- lights.g
- lights.log
- lights.pix
- mged.g
- mged.log
- asc.log
- nirt.g
- nirt.log
- nirt.mged
- nirt.out
- nirt.ref
- region_ids
- regions
- rtedge.2.pix
- rtedge.3.pix
- rtedge.4.pix
- rtedge.5.pix
- rtedge.diff.pix
- rtedge.diff2.pix
- rtedge.diff3.pix
- rtedge.diff4.pix
- rtedge.diff5.pix
- rtedge.havoc.g
- rtedge.log
- rtedge.pix
- rtedge.ref.pix
- rtedge.ref2.pix
- rtedge.ref3.pix
- rtedge.ref4.pix
- rtedge.ref5.pix
- shaders.ebm.bw
- shaders.ell_2.prj
- shaders.g
- shaders.half.prj
- shaders.log
- shaders.mged
- shaders.rt
- shaders.rt.diff.pix
- shaders.rt.log
- shaders.rt.pix
- solids
- solids.dsp.pix
- solids.ebm.bw
- solids.g
- solids.log
- solids.pix.diff
- solids.rt
- solids.rt.log
- solids.rt.pix
- solids.simple.g
- solids.simple.pix.diff
- solids.simple.rt
- solids.simple.rt.log
- solids.simple.rt.pix
- spdi.diff.pix
- spdi.g
- spdi.log
- spdi.mged
- spdi.pix
- )
-
-foreach(outfile ${regress_outfiles})
- set(regress_outfiles_fullpaths ${regress_outfiles_fullpaths}
"${CMAKE_CURRENT_BINARY_DIR}/${outfile}")
-endforeach(outfile ${regress_outfiles})
-set(regress_outfiles_fullpaths ${regress_outfiles_fullpaths}
"${CMAKE_BINARY_DIR}/regress_output.log")
-
-set_property(DIRECTORY APPEND PROPERTY ADDITIONAL_MAKE_CLEAN_FILES
"${regress_outfiles_fullpaths}")
-DISTCLEAN(${regress_outfiles_fullpaths})
-
CMAKEFILES(CMakeLists.txt)
# Local Variables:
Added: brlcad/branches/bioh/regress/bots/CMakeLists.txt
===================================================================
--- brlcad/branches/bioh/regress/bots/CMakeLists.txt
(rev 0)
+++ brlcad/branches/bioh/regress/bots/CMakeLists.txt 2020-07-17 20:04:27 UTC
(rev 76375)
@@ -0,0 +1,39 @@
+
+if (SH_EXEC AND TARGET mged)
+
+ add_test(NAME regress-bots COMMAND ${SH_EXEC}
"${CMAKE_CURRENT_SOURCE_DIR}/bots.sh" ${CMAKE_SOURCE_DIR})
+ BRLCAD_REGRESSION_TEST(regress-bots "mged;pixdiff;rt" TEST_DEFINED)
+
+endif (SH_EXEC AND TARGET mged)
+
+CMAKEFILES(
+ bots.sh
+ )
+
+# list of temporary files
+set(bots_outfiles
+ bots.diff.log
+ bots.diff.pix
+ bots.g
+ bots.lh.pix
+ bots.log
+ bots.no.pix
+ bots.rh.pix
+ bots.rl.diff.pix
+ bots.rn.diff.pix
+ bots.rs.diff.pix
+ bots.sph.pix
+ bots.sync.pix
+ )
+
+set_property(DIRECTORY APPEND PROPERTY ADDITIONAL_MAKE_CLEAN_FILES
"${bots_outfiles}")
+DISTCLEAN(${bots_outfiles})
+
+CMAKEFILES(CMakeLists.txt)
+
+# Local Variables:
+# tab-width: 8
+# mode: cmake
+# indent-tabs-mode: t
+# End:
+# ex: shiftwidth=2 tabstop=8
Property changes on: brlcad/branches/bioh/regress/bots/CMakeLists.txt
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: svn:mime-type
## -0,0 +1 ##
+text/plain
\ No newline at end of property
Copied: brlcad/branches/bioh/regress/bots/bots.sh (from rev 76374,
brlcad/branches/bioh/regress/bots.sh)
===================================================================
--- brlcad/branches/bioh/regress/bots/bots.sh (rev 0)
+++ brlcad/branches/bioh/regress/bots/bots.sh 2020-07-17 20:04:27 UTC (rev
76375)
@@ -0,0 +1,244 @@
+#!/bin/sh
+# B O T S . S H
+# BRL-CAD
+#
+# Copyright (c) 2008-2020 United States Government as represented by
+# the U.S. Army Research Laboratory.
+#
+# Redistribution and use in source and binary forms, with or without
+# modification, are permitted provided that the following conditions
+# are met:
+#
+# 1. Redistributions of source code must retain the above copyright
+# notice, this list of conditions and the following disclaimer.
+#
+# 2. Redistributions in binary form must reproduce the above
+# copyright notice, this list of conditions and the following
+# disclaimer in the documentation and/or other materials provided
+# with the distribution.
+#
+# 3. The name of the author may not be used to endorse or promote
+# products derived from this software without specific prior written
+# permission.
+#
+# THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS
+# OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+# WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+# ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY
+# DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+# DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE
+# GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+# INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+# WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
+# NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+# SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+#
+###
+#
+# Basic series of BoT sanity checks
+#
+###
+
+# Ensure /bin/sh
+export PATH || (echo "This isn't sh."; sh $0 $*; kill $$)
+
+# source common library functionality, setting ARGS, NAME_OF_THIS,
+# PATH_TO_THIS, and THIS.
+. "$1/regress/library.sh"
+
+if test "x$LOGFILE" = "x" ; then
+ LOGFILE=`pwd`/bots.log
+ rm -f $LOGFILE
+fi
+log "=== TESTING BoT primitive ==="
+
+MGED="`ensearch mged`"
+if test ! -f "$MGED" ; then
+ log "Unable to find MGED, aborting"
+ exit 1
+fi
+RT="`ensearch rt`"
+if test ! -f "$RT" ; then
+ log "Unable to find RT, aborting"
+ exit 1
+fi
+PIXDIFF="`ensearch pixdiff`"
+if test ! -f "$PIXDIFF" ; then
+ log "Unable to find pixdiff, aborting"
+ exit 1
+fi
+
+log "creating a geometry database (bots.g) with a BoT of each type"
+rm -f bots.g
+$MGED -c >> $LOGFILE 2>&1 <<EOF
+opendb bots.g y
+make sph sph
+facetize sph.volume.rh.bot sph
+cp sph.volume.rh.bot sph.volume.lh.bot
+bot_flip sph.volume.lh.bot
+bot_merge sph.volume.no.bot sph.volume.rh.bot
+bot_vertex_fuse sph.vertex.fused.volume.no.bot sph.volume.no.bot
+bot_face_fuse sph.face.fused.volume.no.bot sph.vertex.fused.volume.no.bot
+cp sph.face.fused.volume.no.bot sph.sync.volume.no.bot
+bot_sync sph.sync.volume.no.bot
+EOF
+
+# begin validation checks
+
+FAILED=0
+
+log "Getting BoT modes"
+
+rh_mode="`$MGED -c bots.g get sph.volume.rh.bot mode 2>&1 | grep -v Using`"
+lh_mode="`$MGED -c bots.g get sph.volume.lh.bot mode 2>&1 | grep -v Using`"
+no_mode="`$MGED -c bots.g get sph.volume.no.bot mode 2>&1 | grep -v Using`"
+sync_mode="`$MGED -c bots.g get sph.sync.volume.no.bot mode 2>&1 | grep -v
Using`"
+
+# the echo is to remove a newline that gets stored in the variable
+if test "x`echo $rh_mode``echo $lh_mode``echo $no_mode``echo $sync_mode`" !=
"xvolumevolumevolumevolume" ; then
+ log "ERROR: volume BoT mode failure"
+ FAILED="`expr $FAILED + 1`"
+fi
+
+log "Getting BoT orientations"
+
+rh="`$MGED -c bots.g get sph.volume.rh.bot orient 2>&1 | grep -v Using`"
+if test "x`echo $rh`" != "xrh" ; then
+ log "ERROR: right-hand BoT orientation (facetize) failure [$rh]"
+ FAILED="`expr $FAILED + 1`"
+fi
+lh="`$MGED -c bots.g get sph.volume.lh.bot orient 2>&1 | grep -v Using`"
+if test "x`echo $lh`" != "xlh" ; then
+ log "ERROR: left-hand BoT orientation (bot_flip) failure [$lh]"
+ FAILED="`expr $FAILED + 1`"
+fi
+no="`$MGED -c bots.g get sph.volume.no.bot orient 2>&1 | grep -v Using`"
+if test "x`echo $no`" != "xno" ; then
+ log "ERROR: merged BoT orientation (bot_merge) failure [$no]"
+ FAILED="`expr $FAILED + 1`"
+fi
+sync="`$MGED -c bots.g get sph.sync.volume.no.bot orient 2>&1 | grep -v Using`"
+if test "x`echo $no`" != "xno" ; then
+ log "ERROR: synced BoT orientation (bot_sync) failure [$no]"
+ FAILED="`expr $FAILED + 1`"
+fi
+
+# see if the merged/fused/synced bot is the same as the
+# original.. this may need to be relaxed if there are floating point
+# sensitivity problems.
+unfused_vertices="`$MGED -c bots.g get sph.volume.rh.bot V 2>&1`"
+refused_vertices="`$MGED -c bots.g get sph.sync.volume.no.bot V 2>&1`"
+if test "x$unfused_vertices" != "x$refused_vertices" ; then
+ log "ERROR: BoT fuse (bot_vertex_fuse+bot_face_fuse) failure"
+ FAILED="`expr $FAILED + 1`"
+fi
+
+# exit early if they fail so we don't attempt to render
+if test $FAILED -ne 0 ; then
+ log "-> BoT check FAILED"
+ exit $FAILED
+fi
+
+# now test each to make sure they render identical
+
+# BASE REFERENCE
+log "... rendering implicit sphere"
+rm -f bots.sph.pix
+run $RT -s128 -o bots.sph.pix bots.g sph
+if [ ! -f bots.sph.pix ] ; then
+ log "ERROR: raytrace failure"
+ exit 1
+fi
+
+# RIGHT-HANDED
+log "Rendering right-handed volume BoT sphere"
+rm -f bots.rh.pix
+run $RT -s128 -o bots.rh.pix bots.g sph.volume.rh.bot
+if [ ! -f bots.rh.pix ] ; then
+ log "ERROR: raytrace failure"
+ exit 1
+fi
+# compare
+rm -f bots.diff.pix
+$PIXDIFF bots.sph.pix bots.rh.pix > bots.diff.pix 2>> bots.diff.log
+NUMBER_WRONG=`tail -n 1 bots.diff.log | tr , '\012' | awk '/many/ {print $1}'`
+if [ $NUMBER_WRONG -eq 0 ] ; then
+ # we expect implicit and BoT sphere to be different
+ log "ERROR: bots.diff.pix $NUMBER_WRONG off by many (this is WRONG)"
+ FAILED="`expr $FAILED + 1`"
+fi
+
+# LEFT-HANDED
+log "Rendering left-handed volume BoT sphere"
+rm -f bots.lh.pix
+run $RT -s128 -o bots.lh.pix bots.g sph.volume.lh.bot
+if [ ! -f bots.lh.pix ] ; then
+ log "ERROR: raytrace failure"
+ exit 1
+fi
+# compare
+rm -f bots.rl.diff.pix
+$PIXDIFF bots.rh.pix bots.lh.pix > bots.rl.diff.pix 2>> bots.diff.log
+NUMBER_WRONG=`tail -n 1 bots.diff.log | tr , '\012' | awk '/many/ {print $1}'`
+if [ $NUMBER_WRONG -eq 0 ] ; then
+ tail -n 1 bots.diff.log
+else
+ log "ERROR: bots.rl.diff.pix $NUMBER_WRONG off by many"
+ FAILED="`expr $FAILED + 1`"
+fi
+
+# UNORIENTED
+log "Rendering unoriented volume BoT sphere"
+rm -f bots.no.pix
+run $RT -s128 -o bots.no.pix bots.g sph.volume.no.bot
+if [ ! -f bots.no.pix ] ; then
+ log "ERROR: raytrace failure"
+ exit 1
+fi
+# compare
+rm -f bots.rn.diff.pix
+$PIXDIFF bots.rh.pix bots.no.pix > bots.rn.diff.pix 2>> bots.diff.log
+NUMBER_WRONG=`tail -n 1 bots.diff.log | tr , '\012' | awk '/many/ {print $1}'`
+if [ $NUMBER_WRONG -eq 0 ] ; then
+ tail -n 1 bots.diff.log
+else
+ log "ERROR: bots.rn.diff.pix $NUMBER_WRONG off by many"
+ FAILED="`expr $FAILED + 1`"
+fi
+
+# SYNC'D UNORIENTED
+log "Rendering synced unoriented volume BoT sphere"
+rm -f bots.sync.pix
+run $RT -s128 -o bots.sync.pix bots.g sph.sync.volume.no.bot
+if [ ! -f bots.sync.pix ] ; then
+ log "ERROR: raytrace failure"
+ exit 1
+fi
+# compare
+rm -f bots.rs.diff.pix
+$PIXDIFF bots.rh.pix bots.sync.pix > bots.rs.diff.pix 2>> bots.diff.log
+NUMBER_WRONG=`tail -n 1 bots.diff.log | tr , '\012' | awk '/many/ {print $1}'`
+if [ $NUMBER_WRONG -eq 0 ] ; then
+ log `tail -n 1 bots.diff.log`
+else
+ log "ERROR: bots.rs.diff.pix $NUMBER_WRONG off by many"
+ FAILED="`expr $FAILED + 1`"
+fi
+
+
+if test $FAILED -eq 0 ; then
+ log "-> BoT check succeeded"
+else
+ log "-> BoT check FAILED, see $LOGFILE"
+fi
+
+exit $FAILED
+
+# Local Variables:
+# tab-width: 8
+# mode: sh
+# sh-indentation: 4
+# sh-basic-offset: 4
+# indent-tabs-mode: t
+# End:
+# ex: shiftwidth=4 tabstop=8
Deleted: brlcad/branches/bioh/regress/bots.sh
===================================================================
--- brlcad/branches/bioh/regress/bots.sh 2020-07-17 18:50:23 UTC (rev
76374)
+++ brlcad/branches/bioh/regress/bots.sh 2020-07-17 20:04:27 UTC (rev
76375)
@@ -1,244 +0,0 @@
-#!/bin/sh
-# B O T S . S H
-# BRL-CAD
-#
-# Copyright (c) 2008-2020 United States Government as represented by
-# the U.S. Army Research Laboratory.
-#
-# Redistribution and use in source and binary forms, with or without
-# modification, are permitted provided that the following conditions
-# are met:
-#
-# 1. Redistributions of source code must retain the above copyright
-# notice, this list of conditions and the following disclaimer.
-#
-# 2. Redistributions in binary form must reproduce the above
-# copyright notice, this list of conditions and the following
-# disclaimer in the documentation and/or other materials provided
-# with the distribution.
-#
-# 3. The name of the author may not be used to endorse or promote
-# products derived from this software without specific prior written
-# permission.
-#
-# THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS
-# OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
-# WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-# ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY
-# DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
-# DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE
-# GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-# INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
-# WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
-# NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
-# SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-#
-###
-#
-# Basic series of BoT sanity checks
-#
-###
-
-# Ensure /bin/sh
-export PATH || (echo "This isn't sh."; sh $0 $*; kill $$)
-
-# source common library functionality, setting ARGS, NAME_OF_THIS,
-# PATH_TO_THIS, and THIS.
-. "$1/regress/library.sh"
-
-if test "x$LOGFILE" = "x" ; then
- LOGFILE=`pwd`/bots.log
- rm -f $LOGFILE
-fi
-log "=== TESTING BoT primitive ==="
-
-MGED="`ensearch mged`"
-if test ! -f "$MGED" ; then
- log "Unable to find MGED, aborting"
- exit 1
-fi
-RT="`ensearch rt`"
-if test ! -f "$RT" ; then
- log "Unable to find RT, aborting"
- exit 1
-fi
-PIXDIFF="`ensearch pixdiff`"
-if test ! -f "$PIXDIFF" ; then
- log "Unable to find pixdiff, aborting"
- exit 1
-fi
-
-log "creating a geometry database (bots.g) with a BoT of each type"
-rm -f bots.g
-$MGED -c >> $LOGFILE 2>&1 <<EOF
-opendb bots.g y
-make sph sph
-facetize sph.volume.rh.bot sph
-cp sph.volume.rh.bot sph.volume.lh.bot
-bot_flip sph.volume.lh.bot
-bot_merge sph.volume.no.bot sph.volume.rh.bot
-bot_vertex_fuse sph.vertex.fused.volume.no.bot sph.volume.no.bot
-bot_face_fuse sph.face.fused.volume.no.bot sph.vertex.fused.volume.no.bot
-cp sph.face.fused.volume.no.bot sph.sync.volume.no.bot
-bot_sync sph.sync.volume.no.bot
-EOF
-
-# begin validation checks
-
-FAILED=0
-
-log "Getting BoT modes"
-
-rh_mode="`$MGED -c bots.g get sph.volume.rh.bot mode 2>&1 | grep -v Using`"
-lh_mode="`$MGED -c bots.g get sph.volume.lh.bot mode 2>&1 | grep -v Using`"
-no_mode="`$MGED -c bots.g get sph.volume.no.bot mode 2>&1 | grep -v Using`"
-sync_mode="`$MGED -c bots.g get sph.sync.volume.no.bot mode 2>&1 | grep -v
Using`"
-
-# the echo is to remove a newline that gets stored in the variable
-if test "x`echo $rh_mode``echo $lh_mode``echo $no_mode``echo $sync_mode`" !=
"xvolumevolumevolumevolume" ; then
- log "ERROR: volume BoT mode failure"
- FAILED="`expr $FAILED + 1`"
-fi
-
-log "Getting BoT orientations"
-
-rh="`$MGED -c bots.g get sph.volume.rh.bot orient 2>&1 | grep -v Using`"
-if test "x`echo $rh`" != "xrh" ; then
- log "ERROR: right-hand BoT orientation (facetize) failure [$rh]"
- FAILED="`expr $FAILED + 1`"
-fi
-lh="`$MGED -c bots.g get sph.volume.lh.bot orient 2>&1 | grep -v Using`"
-if test "x`echo $lh`" != "xlh" ; then
- log "ERROR: left-hand BoT orientation (bot_flip) failure [$lh]"
- FAILED="`expr $FAILED + 1`"
-fi
-no="`$MGED -c bots.g get sph.volume.no.bot orient 2>&1 | grep -v Using`"
-if test "x`echo $no`" != "xno" ; then
- log "ERROR: merged BoT orientation (bot_merge) failure [$no]"
- FAILED="`expr $FAILED + 1`"
-fi
-sync="`$MGED -c bots.g get sph.sync.volume.no.bot orient 2>&1 | grep -v Using`"
-if test "x`echo $no`" != "xno" ; then
- log "ERROR: synced BoT orientation (bot_sync) failure [$no]"
- FAILED="`expr $FAILED + 1`"
-fi
-
-# see if the merged/fused/synced bot is the same as the
-# original.. this may need to be relaxed if there are floating point
-# sensitivity problems.
-unfused_vertices="`$MGED -c bots.g get sph.volume.rh.bot V 2>&1`"
-refused_vertices="`$MGED -c bots.g get sph.sync.volume.no.bot V 2>&1`"
-if test "x$unfused_vertices" != "x$refused_vertices" ; then
- log "ERROR: BoT fuse (bot_vertex_fuse+bot_face_fuse) failure"
- FAILED="`expr $FAILED + 1`"
-fi
-
-# exit early if they fail so we don't attempt to render
-if test $FAILED -ne 0 ; then
- log "-> BoT check FAILED"
- exit $FAILED
-fi
-
-# now test each to make sure they render identical
-
-# BASE REFERENCE
-log "... rendering implicit sphere"
-rm -f bots.sph.pix
-run $RT -s128 -o bots.sph.pix bots.g sph
-if [ ! -f bots.sph.pix ] ; then
- log "ERROR: raytrace failure"
- exit 1
-fi
-
-# RIGHT-HANDED
-log "Rendering right-handed volume BoT sphere"
-rm -f bots.rh.pix
-run $RT -s128 -o bots.rh.pix bots.g sph.volume.rh.bot
-if [ ! -f bots.rh.pix ] ; then
- log "ERROR: raytrace failure"
- exit 1
-fi
-# compare
-rm -f bots.diff.pix
-$PIXDIFF bots.sph.pix bots.rh.pix > bots.diff.pix 2>> bots.diff.log
-NUMBER_WRONG=`tail -n 1 bots.diff.log | tr , '\012' | awk '/many/ {print $1}'`
-if [ $NUMBER_WRONG -eq 0 ] ; then
- # we expect implicit and BoT sphere to be different
- log "ERROR: bots.diff.pix $NUMBER_WRONG off by many (this is WRONG)"
- FAILED="`expr $FAILED + 1`"
-fi
-
-# LEFT-HANDED
-log "Rendering left-handed volume BoT sphere"
-rm -f bots.lh.pix
-run $RT -s128 -o bots.lh.pix bots.g sph.volume.lh.bot
-if [ ! -f bots.lh.pix ] ; then
- log "ERROR: raytrace failure"
- exit 1
-fi
-# compare
-rm -f bots.rl.diff.pix
-$PIXDIFF bots.rh.pix bots.lh.pix > bots.rl.diff.pix 2>> bots.diff.log
-NUMBER_WRONG=`tail -n 1 bots.diff.log | tr , '\012' | awk '/many/ {print $1}'`
-if [ $NUMBER_WRONG -eq 0 ] ; then
- tail -n 1 bots.diff.log
-else
- log "ERROR: bots.rl.diff.pix $NUMBER_WRONG off by many"
- FAILED="`expr $FAILED + 1`"
-fi
-
-# UNORIENTED
-log "Rendering unoriented volume BoT sphere"
-rm -f bots.no.pix
-run $RT -s128 -o bots.no.pix bots.g sph.volume.no.bot
-if [ ! -f bots.no.pix ] ; then
- log "ERROR: raytrace failure"
- exit 1
-fi
-# compare
-rm -f bots.rn.diff.pix
-$PIXDIFF bots.rh.pix bots.no.pix > bots.rn.diff.pix 2>> bots.diff.log
-NUMBER_WRONG=`tail -n 1 bots.diff.log | tr , '\012' | awk '/many/ {print $1}'`
-if [ $NUMBER_WRONG -eq 0 ] ; then
- tail -n 1 bots.diff.log
-else
- log "ERROR: bots.rn.diff.pix $NUMBER_WRONG off by many"
- FAILED="`expr $FAILED + 1`"
-fi
-
-# SYNC'D UNORIENTED
-log "Rendering synced unoriented volume BoT sphere"
-rm -f bots.sync.pix
-run $RT -s128 -o bots.sync.pix bots.g sph.sync.volume.no.bot
-if [ ! -f bots.sync.pix ] ; then
- log "ERROR: raytrace failure"
- exit 1
-fi
-# compare
-rm -f bots.rs.diff.pix
-$PIXDIFF bots.rh.pix bots.sync.pix > bots.rs.diff.pix 2>> bots.diff.log
-NUMBER_WRONG=`tail -n 1 bots.diff.log | tr , '\012' | awk '/many/ {print $1}'`
-if [ $NUMBER_WRONG -eq 0 ] ; then
- log `tail -n 1 bots.diff.log`
-else
- log "ERROR: bots.rs.diff.pix $NUMBER_WRONG off by many"
- FAILED="`expr $FAILED + 1`"
-fi
-
-
-if test $FAILED -eq 0 ; then
- log "-> BoT check succeeded"
-else
- log "-> BoT check FAILED, see $LOGFILE"
-fi
-
-exit $FAILED
-
-# Local Variables:
-# tab-width: 8
-# mode: sh
-# sh-indentation: 4
-# sh-basic-offset: 4
-# indent-tabs-mode: t
-# End:
-# ex: shiftwidth=4 tabstop=8
Modified: brlcad/branches/bioh/regress/burst/CMakeLists.txt
===================================================================
--- brlcad/branches/bioh/regress/burst/CMakeLists.txt 2020-07-17 18:50:23 UTC
(rev 76374)
+++ brlcad/branches/bioh/regress/burst/CMakeLists.txt 2020-07-17 20:04:27 UTC
(rev 76375)
@@ -7,7 +7,7 @@
)
if (TARGET ktank.g)
- BRLCAD_REGRESSION_TEST(regress-burst "nburst;ktank.g" EXEC burst)
+ BRLCAD_REGRESSION_TEST(regress-burst "nburst;ktank.g" EXEC nburst)
set(BURST_CLEAN_FILES
ktank_burst.plot
Added: brlcad/branches/bioh/regress/comgeom/CMakeLists.txt
===================================================================
--- brlcad/branches/bioh/regress/comgeom/CMakeLists.txt
(rev 0)
+++ brlcad/branches/bioh/regress/comgeom/CMakeLists.txt 2020-07-17 20:04:27 UTC
(rev 76375)
@@ -0,0 +1,41 @@
+
+if (SH_EXEC AND TARGET mged AND TARGET asc2g)
+
+ add_test(NAME regress-comgeom COMMAND ${SH_EXEC}
"${CMAKE_CURRENT_SOURCE_DIR}/comgeom.sh" ${CMAKE_SOURCE_DIR})
+ BRLCAD_REGRESSION_TEST(regress-comgeom "mged;asc2g;vdeck;comgeom-g"
TEST_DEFINED)
+
+endif (SH_EXEC AND TARGET mged AND TARGET asc2g)
+
+CMAKEFILES(
+ comgeom.cg
+ comgeom.sh
+ comgeom.tgt-1-v4-documented.cg
+ comgeom.tgt-1-v4.cg
+ m35.cg.gz
+ )
+
+# list of temporary files
+set(comgeom_outfiles
+ comgeom.log
+ comgeom.m35-baseline.cg
+ comgeom.m35.asc
+ comgeom.m35.cg
+ comgeom.m35.g
+ comgeom.t-v4.g
+ comgeom.t-v5.g
+ region_ids
+ regions
+ solids
+ )
+
+set_property(DIRECTORY APPEND PROPERTY ADDITIONAL_MAKE_CLEAN_FILES
"${comgeom_outfiles}")
+DISTCLEAN(${comgeom_outfiles})
+
+CMAKEFILES(CMakeLists.txt)
+
+# Local Variables:
+# tab-width: 8
+# mode: cmake
+# indent-tabs-mode: t
+# End:
+# ex: shiftwidth=2 tabstop=8
Property changes on: brlcad/branches/bioh/regress/comgeom/CMakeLists.txt
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: svn:mime-type
## -0,0 +1 ##
+text/plain
\ No newline at end of property
Copied: brlcad/branches/bioh/regress/comgeom/comgeom.cg (from rev 76374,
brlcad/branches/bioh/regress/tgms/comgeom.cg)
===================================================================
--- brlcad/branches/bioh/regress/comgeom/comgeom.cg
(rev 0)
+++ brlcad/branches/bioh/regress/comgeom/comgeom.cg 2020-07-17 20:04:27 UTC
(rev 76375)
@@ -0,0 +1,96 @@
+mm comgeom-g test TGM
+ 19 19
+ 1arb4 3.0000 .0000 -3.0000 3.0000 .0000 .0000arb4.s
+ 1 3.0000 -3.0000 -3.0000 .0000 .0000 -3.0000arb4.s
+ 2arb5 1.0000 .0000 .0000 1.0000 2.0000 .0000arb5.s
+ 2 3.0000 2.0000 .0000 3.0000 .0000 .0000arb5.s
+ 2 1.5000 1.5000 5.0000 arb5.s
+ 3arb6 2.0000 -.5000 -.5000 2.0000 .0000 -.5000arb6.s
+ 3 2.0000 .0000 .0000 2.0000 -.5000 .0000arb6.s
+ 3 2.5000 -.3000 -.5000 2.5000 -.3000 .0000arb6.s
+ 4arb7 3.2500 -1.2500 -.7500 3.2500 -.2500 -.7500arb7.s
+ 4 3.2500 -.2500 .2500 3.2500 -1.2500 -.2500arb7.s
+ 4 2.2500 -1.2500 -.7500 2.2500 -.2500 -.7500arb7.s
+ 4 2.2500 -.2500 -.2500 arb7.s
+ 5arb8 10.0000 -9.0000 -8.0000 10.0000 -1.0000 -8.0000arb8.s
+ 5 10.0000 -1.0000 .0000 10.0000 -9.0000 .0000arb8.s
+ 5 3.0000 -9.0000 -8.0000 3.0000 -1.0000 -8.0000arb8.s
+ 5 3.0000 -1.0000 .0000 3.0000 -9.0000 .0000arb8.s
+ 6ars 3 3 ars.s
+ 6 .0000 .0000 .0000 .0000 .0000 .0000curve 0
+ 6 .0000 .0000 .0000 curve 0
+ 6 .0000 .0000 100.0000 100.0000 .0000 100.0000curve 1
+ 6 100.0000 100.0000 100.0000 curve 1
+ 6 .0000 .0000 200.0000 .0000 .0000 200.0000curve 2
+ 6 .0000 .0000 200.0000 curve 2
+ 7arb8 .0000 .0000 .0000 1.0000 .0000 .0000box.s
+ 7 1.0000 .0000 1.0000 .0000 .0000 1.0000box.s
+ 7 .0000 1.0000 .0000 1.0000 1.0000 .0000box.s
+ 7 1.0000 1.0000 1.0000 .0000 1.0000 1.0000box.s
+ 8ellg 10.0000 .0000 .0000 -12.0000 .0000 .0000ell.s
+ 8 .0000 -3.0000 .0000 .0000 .0000 5.0000ell.s
+ 9ell1 3.0000 2.0000 8.0000 3.0000 -1.0000 8.0000ell1.s
+ 9 4.0000 ell1.s
+ 10ell1 .0000 .0000 .5000 .0000 .0000 3.0000ellg.s
+ 10 2.9580 ellg.s
+ 11haf .5774 .5774 .5774 -5.0000 half.s
+ 12rcc .0000 .0000 .0000 3.0000 3.0000 30.0000rcc.s
+ 12 7.0000 rcc.s
+ 13tec .0000 .0000 .0000 3.0000 3.0000 10.0000rec.s
+ 13 10.0000 .0000 .0000 .0000 3.0000 .0000rec.s
+ 13 1.0000 rec.s
+ 14arb8 30.0000 -3.0000 -1.0000 30.0000 12.0000 -1.0000rpp.s
+ 14 30.0000 12.0000 22.0000 30.0000 -3.0000 22.0000rpp.s
+ 14 .0000 -3.0000 -1.0000 .0000 12.0000 -1.0000rpp.s
+ 14 .0000 12.0000 22.0000 .0000 -3.0000 22.0000rpp.s
+ 15sph 42.0000 42.0000 42.0000 42.0000 sph.s
+ 16tec .0000 .0000 .0000 .0000 .0000 10.0000tec.s
+ 16 5.0000 .0000 .0000 .0000 3.0000 .0000tec.s
+ 16 .6000 tec.s
+ 17tgc .0000 .0000 .0000 .0000 .0000 10.0000tgc.s
+ 17 5.0000 .0000 .0000 .0000 8.0000 .0000tgc.s
+ 17 2.0000 9.0000 tgc.s
+ 18tor .0000 .0000 .0000 .3015 .3015 .9045tor.s
+ 18 5.0000 2.0000 tor.s
+ 19trc .0000 .0000 .0000 .0000 .0000 10.0000trc.s
+ 19 4.0000 7.0000 trc.s
+ 1 1 arb4.r
+ 2 2 arb5.r
+ 3 3 arb6.r
+ 4 4 arb7.r
+ 5 5 arb8.r
+ 6 6 ars.r
+ 7 7 box.r
+ 8 8 ell.r
+ 9 9 ell1.r
+ 10 10 ellg.r
+ 11 11 half.r
+ 12 12 rcc.r
+ 13 13 rec.r
+ 14 14 rpp.r
+ 15 15 sph.r
+ 16 16 tec.r
+ 17 17 tgc.r
+ 18 18 tor.r
+ 19 19 trc.r
+ -1
+ 1 1000 0 1 100 all/arb4.r
+ 2 1001 0 1 100 all/arb5.r
+ 3 1002 0 1 100 all/arb6.r
+ 4 1003 0 1 100 all/arb7.r
+ 5 1004 0 1 100 all/arb8.r
+ 6 1005 0 1 100 all/ars.r
+ 7 1006 0 1 100 all/box.r
+ 8 1007 0 1 100 all/ell.r
+ 9 1008 0 1 100 all/ell1.r
+ 10 1009 0 1 100 all/ellg.r
+ 11 1010 0 1 100 all/half.r
+ 12 1011 0 1 100 all/rcc.r
+ 13 1012 0 1 100 all/rec.r
+ 14 1013 0 1 100 all/rpp.r
+ 15 1014 0 1 100 all/sph.r
+ 16 1015 0 1 100 all/tec.r
+ 17 1016 0 1 100 all/tgc.r
+ 18 1017 0 1 100 all/tor.r
+ 19 1018 0 1 100 all/trc.r
+
Copied: brlcad/branches/bioh/regress/comgeom/comgeom.sh (from rev 76374,
brlcad/branches/bioh/regress/comgeom.sh)
===================================================================
--- brlcad/branches/bioh/regress/comgeom/comgeom.sh
(rev 0)
+++ brlcad/branches/bioh/regress/comgeom/comgeom.sh 2020-07-17 20:04:27 UTC
(rev 76375)
@@ -0,0 +1,173 @@
+#!/bin/sh
+# C O M G E O M . S H
+# BRL-CAD
+#
+# Copyright (c) 2008-2020 United States Government as represented by
+# the U.S. Army Research Laboratory.
+#
+# Redistribution and use in source and binary forms, with or without
+# modification, are permitted provided that the following conditions
+# are met:
+#
+# 1. Redistributions of source code must retain the above copyright
+# notice, this list of conditions and the following disclaimer.
+#
+# 2. Redistributions in binary form must reproduce the above
+# copyright notice, this list of conditions and the following
+# disclaimer in the documentation and/or other materials provided
+# with the distribution.
+#
+# 3. The name of the author may not be used to endorse or promote
+# products derived from this software without specific prior written
+# permission.
+#
+# THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS
+# OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+# WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+# ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY
+# DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+# DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE
+# GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+# INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+# WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
+# NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+# SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+#
+###
+#
+# Test conversion from .g to GIFT (v5) and back.
+#
+###
+
+# Ensure /bin/sh
+export PATH || (echo "This isn't sh."; sh $0 $*; kill $$)
+
+# source common library functionality, setting ARGS, NAME_OF_THIS,
+# PATH_TO_THIS, and THIS.
+. "$1/regress/library.sh"
+
+if test "x$LOGFILE" = "x" ; then
+ LOGFILE=`pwd`/comgeom.log
+ rm -f $LOGFILE
+fi
+log "=== TESTING 'comgeom-g' and 'vdeck' ==="
+
+ASC2G="`ensearch asc2g`"
+if test ! -f "$ASC2G" ; then
+ log "Unable to find asc2g, aborting"
+ exit 1
+fi
+VDECK="`ensearch vdeck`"
+if test ! -f "$VDECK" ; then
+ log "Unable to find vdeck, aborting"
+ exit 1
+fi
+COMGEOM="`ensearch comgeom-g`"
+if test ! -f "$COMGEOM" ; then
+ log "Unable to find comgeom-g, aborting"
+ exit 1
+fi
+GZIP="`which gzip`"
+if test ! -f "$GZIP" ; then
+ log "Unable to find gzip, aborting"
+ exit 1
+fi
+
+FAILURES=0
+
+# make our starting database
+rm -f comgeom.m35.asc
+log "... running gzip decompress"
+$GZIP -d -c "$PATH_TO_THIS/m35.asc.gz" > comgeom.m35.asc
+rm -f comgeom.m35.g
+run $ASC2G comgeom.m35.asc comgeom.m35.g
+
+# get our
+# using vdeck interactively to convert .g to GIFT
+#(following example in red.sh and mged test)
+rm -f solids regions region_ids
+log "... running $VDECK comgeom.m35.g"
+$VDECK comgeom.m35.g >> $LOGFILE 2>&1 <<EOF
+i all.g
+d
+q
+EOF
+
+# assemble pieces to compare with test version
+rm -f comgeom.m35.cg
+cat solids > comgeom.m35.cg
+cat regions >> comgeom.m35.cg
+cat region_ids >> comgeom.m35.cg
+
+# get test version
+rm -f comgeom.m35-baseline.cg
+log "... running gzip decompress"
+$GZIP -d -c "$PATH_TO_THIS/m35.cg.gz" > comgeom.m35-baseline.cg
+
+cmp comgeom.m35.cg comgeom.m35-baseline.cg
+STATUS=$?
+
+if [ X$STATUS != X0 ] ; then
+ log "vdeck results differ $STATUS"
+ FAILURES="`expr $FAILURES + 1`"
+else
+ log "vdeck test succeeded (1 of 3)"
+fi
+
+# the part 2 test checks for a known (but corrected) failures to
+# convert ars solids, it also checks all solid types recognized
+# by vdeck
+log "...testing 'comgeom-g' command (GIFT v5)..."
+rm -f comgeom.t-v5.g
+run $COMGEOM "$PATH_TO_THIS/comgeom.cg" comgeom.t-v5.g
+STATUS=$?
+
+if [ X$STATUS != X0 ] ; then
+ log "comgeom-g conversion errors: $STATUS"
+ FAILURES="`expr $FAILURES + 1`"
+else
+ ERR=`grep error comgeom-g.log`
+ if test "x$ERR" = "x" ; then
+ log "comgeom-g v5 test succeeded (2 of 3)"
+ else
+ log "comgeom-g v5 errors, see 'comgeom-g.log'"
+ FAILURES="`expr $FAILURES + 1`"
+ fi
+fi
+
+# the part 3 test checks comgeom-g against a GIFT v4 tgm
+log "...testing 'comgeom-g' command (GIFT v4)..."
+rm -f comgeom.t-v4.g
+run $COMGEOM -v4 "$PATH_TO_THIS/comgeom.tgt-1-v4.cg" comgeom.t-v4.g
+STATUS=$?
+
+if [ X$STATUS != X0 ] ; then
+ log "comgeom-g conversion errors: $STATUS"
+ FAILURES="`expr $FAILURES + 1`"
+else
+ ERR=`grep error comgeom-g.log`
+ if test "x$ERR" = "x" ; then
+ log "comgeom-g v4 test succeeded (3 of 3)"
+ else
+ log "comgeom-g v4 errors, see 'comgeom-g.log'"
+ FAILURES="`expr $FAILURES + 1`"
+ fi
+fi
+
+if test $FAILURES -eq 0 ; then
+ log "-> vdeck/comgeom-g check succeeded"
+else
+ log "-> vdeck/comgeom-g check FAILED, see $LOGFILE"
+fi
+
+exit $FAILED
+
+
+# Local Variables:
+# tab-width: 8
+# mode: sh
+# sh-indentation: 4
+# sh-basic-offset: 4
+# indent-tabs-mode: t
+# End:
+# ex: shiftwidth=4 tabstop=8
Copied: brlcad/branches/bioh/regress/comgeom/comgeom.tgt-1-v4-documented.cg
(from rev 76374,
brlcad/branches/bioh/regress/tgms/comgeom.tgt-1-v4-documented.cg)
===================================================================
--- brlcad/branches/bioh/regress/comgeom/comgeom.tgt-1-v4-documented.cg
(rev 0)
+++ brlcad/branches/bioh/regress/comgeom/comgeom.tgt-1-v4-documented.cg
2020-07-17 20:04:27 UTC (rev 76375)
@@ -0,0 +1,139 @@
+# sample target from BRL Report No. 1802, "The GIFT Code User Manual;
+# Volume I. Introduction and Input Requirements," Lawrence W. Bain
+# Jr., Mathew J. Reisinger, July 1975
+#
+# Modified to fit GIFT v4 as interpreted by BRL-CAD's comgeom-g
+
+# units and title card
+#
+#><-------------------------------------------------------->
+# 1 2 3 4 5 6
+#23456789012345678901234567890123456789012345678901234567890
+in SAMPLE TARGET INPUT FOR GIFT CODE (V4)
+
+# target specification card
+#
+#--------><--------><-------->
+# 1 2 3
+#23456789012345678901234567890
+ 20 20
+
+# solid table
+#
+#-><-->**<--------><--------><--------><--------><--------><--------><-------->
+# 1 2 3 4 5 6 7
8
+#2345678901234567890123456789012345678901234567890123456789012345678901234567890
+1 TOR 21.5 0. 37. 1. 0. 0. STEERING
+1 8.0 1.0 WHEEL
+2 ARB4 21.5 -6. 33.5 21.5 6. 33.5 CENTER
+2 21.5 0. 44. 40.0 0. 37. STEERING
+3 ARB5 75. -36. 12. 75. 36. 12. FRONT
+3 75. 36. 48. 75. -36. 48. 3-2
+3 100. 0. 12. 3-3
+4 ARB8 -75. -36. 12. -75. 36. 12. REAR
+4 -75. 36. 48. -75. -36. 48. 4-2
+4 -100. -24. 12. -100. 24. 12. 4-3
+4 -100. 24. 20. -100. -24. 20. 4-4
+5 ELL 20. 0. 48. -20. 0. 48. BUBBLE
+5 50.
+6 RPP -75. 75. -36. 36. 12. 48. BODY
+7 RCC 60. -36. 12. 0. 8. 0. WHEEL
+7 12.
+8 RCC 60. 36. 12. 0. -8. 0. WHEEL
+8 12.
+9 RCC -60. -36. 12. 0. 8. 0. WHEEL
+9 12.
+10 RCC -60. 36. 12. 0. -8. 0. WHEEL
+10 12.
+11 ARS 6 5 ENGINE
+11 -30. -10. 15. -30. -10. 15. 11-2
+11 -30. -10. 15. -30. -10. 15. 11-3
+11 -30. -10. 15. . 11-4
+11 -30. -10. 15. -70. -10. 15. 11-5
+11 -70. 10. 15. -30. 10. 15. 11-6
+11 -30. -10. 15. 11-7
+11 -30. -10. 25. -70. -10. 25. 11-8
+11 -70. 10. 25. -30. 10. 25. 11-9
+11 -30. -10. 25. 11-10
+11 -30. -20. 35. -70. -20. 35. 11-11
+11 -70. 20. 35. -30. 20. 35. 11-12
+11 -30. -20. 35. 11-13
+11 -30. -10. 45. -70. -10. 45. 11-14
+11 -70. 10. 45. -30. 10. 45. 11-15
+11 -30. -10. 45. 11-16
+11 -30. -10. 45. -30. -10. 45. 11-17
+11 -30. -10. 45. -30. -10. 45. 11-18
+11 -30. -10. 45. 11-19
+12 RAW -70. 0. 35. 0. -11. 11. (ENGINE)
+12 0. 11. 11. 40. 0. 0.
+13 REC 0. 0. 24. 0. 0. 28. TRUNK
+13 0. 7.5 0. 5. 0. 0.
+14 SPH 0. 0. 52. 5. HEAD
+15 TEC 0. -7.5 49. 20. 0. -12. ARM
+15 0. 0. 3. 0. 2. 0. 15-2
+15 2. 15-3
+16 TEC 0. 7.5 49. 20. 0. -12. ARM
+16 0. 0. 3. 0. 2. 0. 16-2
+16 2. 16-3
+17 TRC -2. -4.5 27. 32. 0. -12. LEG
+17 3. 2.
+18 TRC -2. 4.5 27. 32. 0. -12. LEG
+18 3. 2.
+19 ELL1 0. 0. 48. 24. 0. 0. (1.0)
+19 14.
+20 BOX -74. -35. 13. 148. 0. 0. (1.0)
+20 0. 70. 0. 0. 0. 34.
+
+# region table
+#
+#--->*<><---><><---><><---><><---><><---><><---><><---><><---><><---><--------->
+# 1 2 3 4 5 6 7
8
+#2345678901234567890123456789012345678901234567890123456789012345678901234567890
+ 1 1 -2
+ 2 2
+ 3 3
+ 4 4
+ 5 5 -6 -19
+ 6 6 -20 -19 -7 -8 -9 -10
+ 7 7
+ 8 8
+ 9 9
+ 10 10
+ 11 11 -12
+ 12 12
+ 13 13 -15 -16 -17 -18
+ 14 14 -13
+ 15 15
+ 16 16
+ 17 17
+ 18 18
+ 19 19
+ 20 20
+ -1
+
+
+# region identification table
+#
+#--------><--------><--------><--------><-------------------------------------->
+# 1 2 3 4 5 6 7
8
+#2345678901234567890123456789012345678901234567890123456789012345678901234567890
+ 1 40 STEERING WHEEL 1-2 TOR
+ 2 41 STEERING SHAFT 2
ARB4
+ 3 100 BODY-FRONT 3
ARB5
+ 4 100 BODY-REAR 4
ARB8
+ 5 101 BUBBLE 5-6-19 ELL
+ 6 100 BODY-CENTER 6-20-19-7-8-9-10 RPP
+ 7 651 WHEEL RIGHT FRONT 7 RCC
+ 8 652 WHEEL LEFT FRONT 8 RCC
+ 9 653 WHEEL RIGHT REAR 9 RCC
+ 10 654 WHEEL LEFT REAR 10 RCC
+ 11 701 ENGINE 11-12 ARS
+ 12 111 DUMMY REGION 0 RAW
+ 13 31 MAN-TORSO 13-15-16-17-18 REC
+ 14 31 MAN-HEAD 14-13 SPH
+ 15 31 MAN-ARM 15 TEC
+ 16 31 MAN-ARM 16 TEC
+ 17 31 MAN-LEG 17 TRC
+ 18 31 MAN-LEG 18 TRC
+ 19 02 INSIDE AIR (BUBBLE)19
ELL1
+ 20 02 INSIDE AIR (BODY) 20 BOX
Copied: brlcad/branches/bioh/regress/comgeom/comgeom.tgt-1-v4.cg (from rev
76374, brlcad/branches/bioh/regress/tgms/comgeom.tgt-1-v4.cg)
===================================================================
--- brlcad/branches/bioh/regress/comgeom/comgeom.tgt-1-v4.cg
(rev 0)
+++ brlcad/branches/bioh/regress/comgeom/comgeom.tgt-1-v4.cg 2020-07-17
20:04:27 UTC (rev 76375)
@@ -0,0 +1,104 @@
+in SAMPLE TARGET INPUT FOR GIFT CODE (V4)
+ 20 20
+1 TOR 21.5 0. 37. 1. 0. 0. STEERING
+1 8.0 1.0 WHEEL
+2 ARB4 21.5 -6. 33.5 21.5 6. 33.5 CENTER
+2 21.5 0. 44. 40.0 0. 37. STEERING
+3 ARB5 75. -36. 12. 75. 36. 12. FRONT
+3 75. 36. 48. 75. -36. 48. 3-2
+3 100. 0. 12. 3-3
+4 ARB8 -75. -36. 12. -75. 36. 12. REAR
+4 -75. 36. 48. -75. -36. 48. 4-2
+4 -100. -24. 12. -100. 24. 12. 4-3
+4 -100. 24. 20. -100. -24. 20. 4-4
+5 ELL 20. 0. 48. -20. 0. 48. BUBBLE
+5 50.
+6 RPP -75. 75. -36. 36. 12. 48. BODY
+7 RCC 60. -36. 12. 0. 8. 0. WHEEL
+7 12.
+8 RCC 60. 36. 12. 0. -8. 0. WHEEL
+8 12.
+9 RCC -60. -36. 12. 0. 8. 0. WHEEL
+9 12.
+10 RCC -60. 36. 12. 0. -8. 0. WHEEL
+10 12.
+11 ARS 6 5 ENGINE
+11 -30. -10. 15. -30. -10. 15. 11-2
+11 -30. -10. 15. -30. -10. 15. 11-3
+11 -30. -10. 15. . 11-4
+11 -30. -10. 15. -70. -10. 15. 11-5
+11 -70. 10. 15. -30. 10. 15. 11-6
+11 -30. -10. 15. 11-7
+11 -30. -10. 25. -70. -10. 25. 11-8
+11 -70. 10. 25. -30. 10. 25. 11-9
+11 -30. -10. 25. 11-10
+11 -30. -20. 35. -70. -20. 35. 11-11
+11 -70. 20. 35. -30. 20. 35. 11-12
+11 -30. -20. 35. 11-13
+11 -30. -10. 45. -70. -10. 45. 11-14
+11 -70. 10. 45. -30. 10. 45. 11-15
+11 -30. -10. 45. 11-16
+11 -30. -10. 45. -30. -10. 45. 11-17
+11 -30. -10. 45. -30. -10. 45. 11-18
+11 -30. -10. 45. 11-19
+12 RAW -70. 0. 35. 0. -11. 11. (ENGINE)
+12 0. 11. 11. 40. 0. 0.
+13 REC 0. 0. 24. 0. 0. 28. TRUNK
+13 0. 7.5 0. 5. 0. 0.
+14 SPH 0. 0. 52. 5. HEAD
+15 TEC 0. -7.5 49. 20. 0. -12. ARM
+15 0. 0. 3. 0. 2. 0. 15-2
+15 2. 15-3
+16 TEC 0. 7.5 49. 20. 0. -12. ARM
+16 0. 0. 3. 0. 2. 0. 16-2
+16 2. 16-3
+17 TRC -2. -4.5 27. 32. 0. -12. LEG
+17 3. 2.
+18 TRC -2. 4.5 27. 32. 0. -12. LEG
+18 3. 2.
+19 ELL1 0. 0. 48. 24. 0. 0. (1.0)
+19 14.
+20 BOX -74. -35. 13. 148. 0. 0. (1.0)
+20 0. 70. 0. 0. 0. 34.
+ 1 1 -2
+ 2 2
+ 3 3
+ 4 4
+ 5 5 -6 -19
+ 6 6 -20 -19 -7 -8 -9 -10
+ 7 7
+ 8 8
+ 9 9
+ 10 10
+ 11 11 -12
+ 12 12
+ 13 13 -15 -16 -17 -18
+ 14 14 -13
+ 15 15
+ 16 16
+ 17 17
+ 18 18
+ 19 19
+ 20 20
+-1
+
+ 1 40 STEERING WHEEL 1-2 TOR
+ 2 41 STEERING SHAFT 2
ARB4
+ 3 100 BODY-FRONT 3
ARB5
+ 4 100 BODY-REAR 4
ARB8
+ 5 101 BUBBLE 5-6-19 ELL
+ 6 100 BODY-CENTER 6-20-19-7-8-9-10 RPP
+ 7 651 WHEEL RIGHT FRONT 7 RCC
+ 8 652 WHEEL LEFT FRONT 8 RCC
+ 9 653 WHEEL RIGHT REAR 9 RCC
+ 10 654 WHEEL LEFT REAR 10 RCC
+ 11 701 ENGINE 11-12 ARS
+ 12 111 DUMMY REGION 0 RAW
+ 13 31 MAN-TORSO 13-15-16-17-18 REC
+ 14 31 MAN-HEAD 14-13 SPH
+ 15 31 MAN-ARM 15 TEC
+ 16 31 MAN-ARM 16 TEC
+ 17 31 MAN-LEG 17 TRC
+ 18 31 MAN-LEG 18 TRC
+ 19 02 INSIDE AIR (BUBBLE)19
ELL1
+ 20 02 INSIDE AIR (BODY) 20 BOX
Copied: brlcad/branches/bioh/regress/comgeom/m35.cg.gz (from rev 76374,
brlcad/branches/bioh/regress/tgms/m35.cg.gz)
===================================================================
(Binary files differ)
Deleted: brlcad/branches/bioh/regress/comgeom.sh
===================================================================
--- brlcad/branches/bioh/regress/comgeom.sh 2020-07-17 18:50:23 UTC (rev
76374)
+++ brlcad/branches/bioh/regress/comgeom.sh 2020-07-17 20:04:27 UTC (rev
76375)
@@ -1,173 +0,0 @@
-#!/bin/sh
-# C O M G E O M . S H
-# BRL-CAD
-#
-# Copyright (c) 2008-2020 United States Government as represented by
-# the U.S. Army Research Laboratory.
-#
-# Redistribution and use in source and binary forms, with or without
-# modification, are permitted provided that the following conditions
-# are met:
-#
-# 1. Redistributions of source code must retain the above copyright
-# notice, this list of conditions and the following disclaimer.
-#
-# 2. Redistributions in binary form must reproduce the above
-# copyright notice, this list of conditions and the following
-# disclaimer in the documentation and/or other materials provided
-# with the distribution.
-#
-# 3. The name of the author may not be used to endorse or promote
-# products derived from this software without specific prior written
-# permission.
-#
-# THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS
-# OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
-# WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-# ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY
-# DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
-# DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE
-# GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-# INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
-# WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
-# NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
-# SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-#
-###
-#
-# Test conversion from .g to GIFT (v5) and back.
-#
-###
-
-# Ensure /bin/sh
-export PATH || (echo "This isn't sh."; sh $0 $*; kill $$)
-
-# source common library functionality, setting ARGS, NAME_OF_THIS,
-# PATH_TO_THIS, and THIS.
-. "$1/regress/library.sh"
-
-if test "x$LOGFILE" = "x" ; then
- LOGFILE=`pwd`/comgeom.log
- rm -f $LOGFILE
-fi
-log "=== TESTING 'comgeom-g' and 'vdeck' ==="
-
-ASC2G="`ensearch asc2g`"
-if test ! -f "$ASC2G" ; then
- log "Unable to find asc2g, aborting"
- exit 1
-fi
-VDECK="`ensearch vdeck`"
-if test ! -f "$VDECK" ; then
- log "Unable to find vdeck, aborting"
- exit 1
-fi
-COMGEOM="`ensearch comgeom-g`"
-if test ! -f "$COMGEOM" ; then
- log "Unable to find comgeom-g, aborting"
- exit 1
-fi
-GZIP="`which gzip`"
-if test ! -f "$GZIP" ; then
- log "Unable to find gzip, aborting"
- exit 1
-fi
-
-FAILURES=0
-
-# make our starting database
-rm -f comgeom.m35.asc
-log "... running gzip decompress"
-$GZIP -d -c "$PATH_TO_THIS/tgms/m35.asc.gz" > comgeom.m35.asc
-rm -f comgeom.m35.g
-run $ASC2G comgeom.m35.asc comgeom.m35.g
-
-# get our
-# using vdeck interactively to convert .g to GIFT
-#(following example in red.sh and mged test)
-rm -f solids regions region_ids
-log "... running $VDECK comgeom.m35.g"
-$VDECK comgeom.m35.g >> $LOGFILE 2>&1 <<EOF
-i all.g
-d
-q
-EOF
-
-# assemble pieces to compare with test version
-rm -f comgeom.m35.cg
-cat solids > comgeom.m35.cg
-cat regions >> comgeom.m35.cg
-cat region_ids >> comgeom.m35.cg
-
-# get test version
-rm -f comgeom.m35-baseline.cg
-log "... running gzip decompress"
-$GZIP -d -c "$PATH_TO_THIS/tgms/m35.cg.gz" > comgeom.m35-baseline.cg
-
-cmp comgeom.m35.cg comgeom.m35-baseline.cg
-STATUS=$?
-
-if [ X$STATUS != X0 ] ; then
- log "vdeck results differ $STATUS"
- FAILURES="`expr $FAILURES + 1`"
-else
- log "vdeck test succeeded (1 of 3)"
-fi
-
-# the part 2 test checks for a known (but corrected) failures to
-# convert ars solids, it also checks all solid types recognized
-# by vdeck
-log "...testing 'comgeom-g' command (GIFT v5)..."
-rm -f comgeom.t-v5.g
-run $COMGEOM "$PATH_TO_THIS/tgms/comgeom.cg" comgeom.t-v5.g
-STATUS=$?
-
-if [ X$STATUS != X0 ] ; then
- log "comgeom-g conversion errors: $STATUS"
- FAILURES="`expr $FAILURES + 1`"
-else
- ERR=`grep error comgeom-g.log`
- if test "x$ERR" = "x" ; then
- log "comgeom-g v5 test succeeded (2 of 3)"
- else
- log "comgeom-g v5 errors, see 'comgeom-g.log'"
- FAILURES="`expr $FAILURES + 1`"
- fi
-fi
-
-# the part 3 test checks comgeom-g against a GIFT v4 tgm
-log "...testing 'comgeom-g' command (GIFT v4)..."
-rm -f comgeom.t-v4.g
-run $COMGEOM -v4 "$PATH_TO_THIS/tgms/comgeom.tgt-1-v4.cg" comgeom.t-v4.g
-STATUS=$?
-
-if [ X$STATUS != X0 ] ; then
- log "comgeom-g conversion errors: $STATUS"
- FAILURES="`expr $FAILURES + 1`"
-else
- ERR=`grep error comgeom-g.log`
- if test "x$ERR" = "x" ; then
- log "comgeom-g v4 test succeeded (3 of 3)"
- else
- log "comgeom-g v4 errors, see 'comgeom-g.log'"
- FAILURES="`expr $FAILURES + 1`"
- fi
-fi
-
-if test $FAILURES -eq 0 ; then
- log "-> vdeck/comgeom-g check succeeded"
-else
- log "-> vdeck/comgeom-g check FAILED, see $LOGFILE"
-fi
-
-exit $FAILED
-
-
-# Local Variables:
-# tab-width: 8
-# mode: sh
-# sh-indentation: 4
-# sh-basic-offset: 4
-# indent-tabs-mode: t
-# End:
-# ex: shiftwidth=4 tabstop=8
Modified: brlcad/branches/bioh/regress/fuzz/CMakeLists.txt
===================================================================
--- brlcad/branches/bioh/regress/fuzz/CMakeLists.txt 2020-07-17 18:50:23 UTC
(rev 76374)
+++ brlcad/branches/bioh/regress/fuzz/CMakeLists.txt 2020-07-17 20:04:27 UTC
(rev 76375)
@@ -4,26 +4,35 @@
${GED_INCLUDE_DIRS}
)
-project(fuzz)
+# First check whether fuzzing support is available.
+include(CheckCXXCompilerFlag)
+check_cxx_compiler_flag(-fsanitize=fuzzer HAVE_FUZZER)
-add_executable(fuzz_test fuzz_ged.cpp)
-target_link_libraries(fuzz_test PUBLIC libbu librt libged)
-brlcad_add_fuzzer(fuzz_test)
+if (HAVE_FUZZER)
-configure_file(run.sh "${CMAKE_CURRENT_BINARY_DIR}/fuzz" COPYONLY)
-install(PROGRAMS "${CMAKE_CURRENT_BINARY_DIR}/fuzz" DESTINATION ${BIN_DIR})
-configure_file(run.sh ${CMAKE_BINARY_DIR}/bin/fuzz COPYONLY)
+ add_executable(fuzz_test fuzz_ged.cpp)
+ target_link_libraries(fuzz_test PUBLIC libbu librt libged)
+ target_compile_options(fuzz_test PRIVATE -fsanitize=fuzzer)
+ target_link_options(fuzz_test PRIVATE -fsanitize=fuzzer)
-#add_test(NAME fuzz COMMAND ${SH_EXEC} ${CMAKE_BINARY_DIR}/bin/fuzz run)
+ configure_file(run.sh "${CMAKE_CURRENT_BINARY_DIR}/fuzz" COPYONLY)
+ install(PROGRAMS "${CMAKE_CURRENT_BINARY_DIR}/fuzz" DESTINATION ${BIN_DIR})
+ configure_file(run.sh ${CMAKE_BINARY_DIR}/bin/fuzz COPYONLY)
-add_custom_target(fuzz
- COMMAND ${SH_EXEC} ${CMAKE_BINARY_DIR}/bin/fuzz run
- )
+ #add_test(NAME fuzz COMMAND ${SH_EXEC} ${CMAKE_BINARY_DIR}/bin/fuzz run)
+ add_custom_target(fuzz
+ COMMAND ${SH_EXEC} ${CMAKE_BINARY_DIR}/bin/fuzz run
+ )
-#Not sure what this is for
-#CMAKEFILES(CMakeLists.txt)
+endif (HAVE_FUZZER)
+CMAKEFILES(
+ CMakeLists.txt
+ fuzz_ged.cpp
+ fuzz_test1.cxx
+ run.sh
+ )
# Local Variables:
# tab-width: 8
Added: brlcad/branches/bioh/regress/gqa/CMakeLists.txt
===================================================================
--- brlcad/branches/bioh/regress/gqa/CMakeLists.txt
(rev 0)
+++ brlcad/branches/bioh/regress/gqa/CMakeLists.txt 2020-07-17 20:04:27 UTC
(rev 76375)
@@ -0,0 +1,36 @@
+
+if (SH_EXEC AND TARGET mged AND TARGET gqa)
+
+ add_test(NAME regress-gqa COMMAND ${SH_EXEC}
"${CMAKE_CURRENT_SOURCE_DIR}/gqa.sh" ${CMAKE_SOURCE_DIR})
+ BRLCAD_REGRESSION_TEST(regress-gqa "gqa;mged" TEST_DEFINED)
+
+endif (SH_EXEC AND TARGET mged AND TARGET gqa)
+
+CMAKEFILES(
+ gqa.sh
+ )
+
+# list of temporary files
+set(gqa_outfiles
+ density_table.txt
+ gqa.adj_air.plot3
+ gqa.exp_air.plot3
+ gqa.g
+ gqa.gaps.plot3
+ gqa.log
+ gqa.mged
+ gqa.overlaps.plot3
+ gqa.volume.plot3
+ )
+
+set_property(DIRECTORY APPEND PROPERTY ADDITIONAL_MAKE_CLEAN_FILES
"${gqa_outfiles}")
+DISTCLEAN(${gqa_outfiles})
+
+CMAKEFILES(CMakeLists.txt)
+
+# Local Variables:
+# tab-width: 8
+# mode: cmake
+# indent-tabs-mode: t
+# End:
+# ex: shiftwidth=2 tabstop=8
Property changes on: brlcad/branches/bioh/regress/gqa/CMakeLists.txt
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: svn:mime-type
## -0,0 +1 ##
+text/plain
\ No newline at end of property
Copied: brlcad/branches/bioh/regress/gqa/gqa.sh (from rev 76374,
brlcad/branches/bioh/regress/gqa.sh)
===================================================================
--- brlcad/branches/bioh/regress/gqa/gqa.sh (rev 0)
+++ brlcad/branches/bioh/regress/gqa/gqa.sh 2020-07-17 20:04:27 UTC (rev
76375)
@@ -0,0 +1,185 @@
+#!/bin/sh
+# G Q A . S H
+# BRL-CAD
+#
+# Copyright (c) 2010-2020 United States Government as represented by
+# the U.S. Army Research Laboratory.
+#
+# Redistribution and use in source and binary forms, with or without
+# modification, are permitted provided that the following conditions
+# are met:
+#
+# 1. Redistributions of source code must retain the above copyright
+# notice, this list of conditions and the following disclaimer.
+#
+# 2. Redistributions in binary form must reproduce the above
+# copyright notice, this list of conditions and the following
+# disclaimer in the documentation and/or other materials provided
+# with the distribution.
+#
+# 3. The name of the author may not be used to endorse or promote
+# products derived from this software without specific prior written
+# permission.
+#
+# THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS
+# OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+# WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+# ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY
+# DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+# DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE
+# GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+# INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+# WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
+# NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+# SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+#
+###
+
+# Ensure /bin/sh
+export PATH || (echo "This isn't sh."; sh $0 $*; kill $$)
+
+# source common library functionality, setting ARGS, NAME_OF_THIS,
+# PATH_TO_THIS, and THIS.
+. "$1/regress/library.sh"
+
+if test "x$LOGFILE" = "x" ; then
+ LOGFILE=`pwd`/gqa.log
+ rm -f $LOGFILE
+fi
+log "=== TESTING 'gqa' ==="
+
+MGED="`ensearch mged`"
+if test ! -f "$MGED" ; then
+ log "Unable to find mged, aborting"
+ exit 1
+fi
+
+GQABIN="`ensearch gqa`"
+if test ! -f "$GQABIN" ; then
+ log "Unable to find gqa, aborting"
+ exit 1
+fi
+
+rm -f density_table.txt
+echo "5 1 stuff" > density_table.txt
+echo "2 1 gas" >> density_table.txt
+
+rm -f gqa.mged
+cat > gqa.mged <<EOF
+units m
+bo -i u c _DENSITIES density_table.txt
+
+in box1.s rpp 0 10 0 10 0 10
+in box2.s rpp 1 9 1 9 1 9
+in box3.s rpp 1 10 1 9 1 9
+in box4.s rpp 0.5 9.5 0.5 5 0.5 9.5
+
+r solid_box.r u box1.s
+adjust solid_box.r GIFTmater 5
+mater solid_box.r "plastic tr=0.5 di=0.5 sp=0.5" 128 128 128 0
+
+r closed_box.r u box1.s - box2.s
+adjust closed_box.r GIFTmater 5
+mater closed_box.r "plastic tr=0.5 di=0.5 sp=0.5" 128 128 128 0
+
+r open_box.r u box1.s - box3.s
+mater open_box.r "plastic tr=0.5 di=0.5 sp=0.5" 128 128 128 0
+
+r exposed_air.r u box3.s
+adjust exposed_air.r air 2
+mater exposed_air.r "plastic tr=0.8 di=0.1 sp=0.1" 255 255 128 0
+g exposed_air.g exposed_air.r open_box.r
+
+r adj_air1.r u box2.s + box4.s
+r adj_air2.r u box2.s - box4.s
+
+adjust adj_air1.r air 3
+adjust adj_air1.r GIFTmater 2
+
+adjust adj_air2.r air 4
+adjust adj_air2.r GIFTmater 2
+
+mater adj_air1.r "plastic tr=0.5 di=0.1 sp=0.1" 255 128 128 0
+mater adj_air2.r "plastic tr=0.5 di=0.1 sp=0.1" 128 128 255 0
+
+g adj_air.g closed_box.r adj_air1.r adj_air2.r
+
+g gap.g closed_box.r adj_air2.r
+
+r overlap_obj.r u box3.s
+adjust overlap_obj.r GIFTMater 5
+g overlaps closed_box.r overlap_obj.r
+
+q
+EOF
+
+
+log "... running mged to create a geometry database (gqa.g)"
+rm -f gqa.g
+$MGED -c gqa.g <<EOF >> $LOGFILE 2>&1
+`cat gqa.mged`
+EOF
+
+GQA="$GQABIN -u m,m^3,kg -g 250mm-50mm -p gqa."
+STATUS=0
+
+#
+# now that the inputs have been built, run the tests
+#
+# box1.s = 10x10x10 = 1000 m^3
+# box2.s = 8x8x8 = 512 m^3
+# box3.s = 8x8x9 = 576 m^3
+# adj_air1.r = 512-256 = 256 m^3
+# adj_air2.r = 512-256 = 256 m^3
+# closed_box.r =1000-512= 488 m^3
+# exposed_air.r = 576 m^3
+# open_box.r = 1000-576 = 424 m^3
+
+rm -f gqa.overlaps.plot3
+run $GQA -Ao gqa.g overlaps
+
+rm -f gqa.exp_air.plot3
+run $GQA -Ae gqa.g exposed_air.g
+
+rm -f gqa.adj_air.plot3
+run $GQA -Aa gqa.g adj_air.g
+
+rm -f gqa.gaps.plot3
+run $GQA -Ag gqa.g gap.g
+
+rm -f gqa.volume.plot3
+run $GQA -Av -v gqa.g closed_box.r
+
+run $GQA -r -Aw -v gqa.g closed_box.r
+
+rm -f gqa.volume.plot3
+run $GQA -r -Avw gqa.g solid_box.r
+
+rm -f gqa.volume.plot3
+run $GQA -r -Avw gqa.g adj_air.g
+
+rm -f gqa.overlaps.plot3
+run $GQA -r -v -g 0.25m-25mm -Awo gqa.g closed_box.r
+
+rm -f gqa.overlaps.plot3
+run $GQA -g 50mm -Ao gqa.g closed_box.r
+
+run $GQA -Am gqa.g closed_box.r
+
+
+if [ $STATUS = 0 ] ; then
+ log "-> gqa.sh succeeded"
+else
+ log "-> gqa.sh FAILED, see $LOGFILE"
+fi
+
+exit $STATUS
+
+# Local Variables:
+# mode: sh
+# tab-width: 8
+# sh-indentation: 4
+# sh-basic-offset: 4
+# indent-tabs-mode: t
+# End:
+# ex: shiftwidth=4 tabstop=8
Deleted: brlcad/branches/bioh/regress/gqa.sh
===================================================================
--- brlcad/branches/bioh/regress/gqa.sh 2020-07-17 18:50:23 UTC (rev 76374)
+++ brlcad/branches/bioh/regress/gqa.sh 2020-07-17 20:04:27 UTC (rev 76375)
@@ -1,185 +0,0 @@
-#!/bin/sh
-# G Q A . S H
-# BRL-CAD
-#
-# Copyright (c) 2010-2020 United States Government as represented by
-# the U.S. Army Research Laboratory.
-#
-# Redistribution and use in source and binary forms, with or without
-# modification, are permitted provided that the following conditions
-# are met:
-#
-# 1. Redistributions of source code must retain the above copyright
-# notice, this list of conditions and the following disclaimer.
-#
-# 2. Redistributions in binary form must reproduce the above
-# copyright notice, this list of conditions and the following
-# disclaimer in the documentation and/or other materials provided
-# with the distribution.
-#
-# 3. The name of the author may not be used to endorse or promote
-# products derived from this software without specific prior written
-# permission.
-#
-# THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS
-# OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
-# WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-# ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY
-# DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
-# DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE
-# GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-# INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
-# WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
-# NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
-# SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-#
-###
-
-# Ensure /bin/sh
-export PATH || (echo "This isn't sh."; sh $0 $*; kill $$)
-
-# source common library functionality, setting ARGS, NAME_OF_THIS,
-# PATH_TO_THIS, and THIS.
-. "$1/regress/library.sh"
-
-if test "x$LOGFILE" = "x" ; then
- LOGFILE=`pwd`/gqa.log
- rm -f $LOGFILE
-fi
-log "=== TESTING 'gqa' ==="
-
-MGED="`ensearch mged`"
-if test ! -f "$MGED" ; then
- log "Unable to find mged, aborting"
- exit 1
-fi
-
-GQABIN="`ensearch gqa`"
-if test ! -f "$GQABIN" ; then
- log "Unable to find gqa, aborting"
- exit 1
-fi
-
-rm -f density_table.txt
-echo "5 1 stuff" > density_table.txt
-echo "2 1 gas" >> density_table.txt
-
-rm -f gqa.mged
-cat > gqa.mged <<EOF
-units m
-bo -i u c _DENSITIES density_table.txt
-
-in box1.s rpp 0 10 0 10 0 10
-in box2.s rpp 1 9 1 9 1 9
-in box3.s rpp 1 10 1 9 1 9
-in box4.s rpp 0.5 9.5 0.5 5 0.5 9.5
-
-r solid_box.r u box1.s
-adjust solid_box.r GIFTmater 5
-mater solid_box.r "plastic tr=0.5 di=0.5 sp=0.5" 128 128 128 0
-
-r closed_box.r u box1.s - box2.s
-adjust closed_box.r GIFTmater 5
-mater closed_box.r "plastic tr=0.5 di=0.5 sp=0.5" 128 128 128 0
-
-r open_box.r u box1.s - box3.s
-mater open_box.r "plastic tr=0.5 di=0.5 sp=0.5" 128 128 128 0
-
-r exposed_air.r u box3.s
-adjust exposed_air.r air 2
-mater exposed_air.r "plastic tr=0.8 di=0.1 sp=0.1" 255 255 128 0
-g exposed_air.g exposed_air.r open_box.r
-
-r adj_air1.r u box2.s + box4.s
-r adj_air2.r u box2.s - box4.s
-
-adjust adj_air1.r air 3
-adjust adj_air1.r GIFTmater 2
-
-adjust adj_air2.r air 4
-adjust adj_air2.r GIFTmater 2
-
-mater adj_air1.r "plastic tr=0.5 di=0.1 sp=0.1" 255 128 128 0
-mater adj_air2.r "plastic tr=0.5 di=0.1 sp=0.1" 128 128 255 0
-
-g adj_air.g closed_box.r adj_air1.r adj_air2.r
-
-g gap.g closed_box.r adj_air2.r
-
-r overlap_obj.r u box3.s
-adjust overlap_obj.r GIFTMater 5
-g overlaps closed_box.r overlap_obj.r
-
-q
-EOF
-
-
-log "... running mged to create a geometry database (gqa.g)"
-rm -f gqa.g
-$MGED -c gqa.g <<EOF >> $LOGFILE 2>&1
-`cat gqa.mged`
-EOF
-
-GQA="$GQABIN -u m,m^3,kg -g 250mm-50mm -p gqa."
-STATUS=0
-
-#
-# now that the inputs have been built, run the tests
-#
-# box1.s = 10x10x10 = 1000 m^3
-# box2.s = 8x8x8 = 512 m^3
-# box3.s = 8x8x9 = 576 m^3
-# adj_air1.r = 512-256 = 256 m^3
-# adj_air2.r = 512-256 = 256 m^3
-# closed_box.r =1000-512= 488 m^3
-# exposed_air.r = 576 m^3
-# open_box.r = 1000-576 = 424 m^3
-
-rm -f gqa.overlaps.plot3
-run $GQA -Ao gqa.g overlaps
-
-rm -f gqa.exp_air.plot3
-run $GQA -Ae gqa.g exposed_air.g
-
-rm -f gqa.adj_air.plot3
-run $GQA -Aa gqa.g adj_air.g
-
-rm -f gqa.gaps.plot3
-run $GQA -Ag gqa.g gap.g
-
-rm -f gqa.volume.plot3
-run $GQA -Av -v gqa.g closed_box.r
-
-run $GQA -r -Aw -v gqa.g closed_box.r
-
-rm -f gqa.volume.plot3
-run $GQA -r -Avw gqa.g solid_box.r
-
-rm -f gqa.volume.plot3
-run $GQA -r -Avw gqa.g adj_air.g
-
-rm -f gqa.overlaps.plot3
-run $GQA -r -v -g 0.25m-25mm -Awo gqa.g closed_box.r
-
-rm -f gqa.overlaps.plot3
-run $GQA -g 50mm -Ao gqa.g closed_box.r
-
-run $GQA -Am gqa.g closed_box.r
-
-
-if [ $STATUS = 0 ] ; then
- log "-> gqa.sh succeeded"
-else
- log "-> gqa.sh FAILED, see $LOGFILE"
-fi
-
-exit $STATUS
-
-# Local Variables:
-# mode: sh
-# tab-width: 8
-# sh-indentation: 4
-# sh-basic-offset: 4
-# indent-tabs-mode: t
-# End:
-# ex: shiftwidth=4 tabstop=8
Added: brlcad/branches/bioh/regress/iges/CMakeLists.txt
===================================================================
--- brlcad/branches/bioh/regress/iges/CMakeLists.txt
(rev 0)
+++ brlcad/branches/bioh/regress/iges/CMakeLists.txt 2020-07-17 20:04:27 UTC
(rev 76375)
@@ -0,0 +1,41 @@
+
+if (SH_EXEC AND TARGET mged AND TARGET asc2g)
+
+ add_test(NAME regress-iges COMMAND ${SH_EXEC}
"${CMAKE_CURRENT_SOURCE_DIR}/iges.sh" ${CMAKE_SOURCE_DIR})
+ BRLCAD_REGRESSION_TEST(regress-iges "iges-g;g-iges;mged;asc2g" TEST_DEFINED)
+
+endif (SH_EXEC AND TARGET mged AND TARGET asc2g)
+
+CMAKEFILES(
+ m35.asc.gz
+ iges.sh
+ )
+
+# list of temporary files
+set(iges_outfiles
+ iges.export.iges
+ iges.export.stdout.iges
+ iges.g
+ iges.import.export.iges
+ iges.import.g
+ iges.import2.export.iges
+ iges.import2.g
+ iges.import3.export.iges
+ iges.import3.g
+ iges.log
+ iges.m35.asc
+ iges.m35.g
+ iges.m35.r516.iges
+ )
+
+set_property(DIRECTORY APPEND PROPERTY ADDITIONAL_MAKE_CLEAN_FILES
"${iges_outfiles}")
+DISTCLEAN(${iges_outfiles})
+
+CMAKEFILES(CMakeLists.txt)
+
+# Local Variables:
+# tab-width: 8
+# mode: cmake
+# indent-tabs-mode: t
+# End:
+# ex: shiftwidth=2 tabstop=8
Property changes on: brlcad/branches/bioh/regress/iges/CMakeLists.txt
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: svn:mime-type
## -0,0 +1 ##
+text/plain
\ No newline at end of property
Copied: brlcad/branches/bioh/regress/iges/iges.sh (from rev 76374,
brlcad/branches/bioh/regress/iges.sh)
===================================================================
--- brlcad/branches/bioh/regress/iges/iges.sh (rev 0)
+++ brlcad/branches/bioh/regress/iges/iges.sh 2020-07-17 20:04:27 UTC (rev
76375)
@@ -0,0 +1,282 @@
+#!/bin/sh
+# I G E S . S H
+# BRL-CAD
+#
+# Copyright (c) 2010-2020 United States Government as represented by
+# the U.S. Army Research Laboratory.
+#
+# Redistribution and use in source and binary forms, with or without
+# modification, are permitted provided that the following conditions
+# are met:
+#
+# 1. Redistributions of source code must retain the above copyright
+# notice, this list of conditions and the following disclaimer.
+#
+# 2. Redistributions in binary form must reproduce the above
+# copyright notice, this list of conditions and the following
+# disclaimer in the documentation and/or other materials provided
+# with the distribution.
+#
+# 3. The name of the author may not be used to endorse or promote
+# products derived from this software without specific prior written
+# permission.
+#
+# THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS
+# OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+# WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+# ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY
+# DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+# DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE
+# GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+# INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+# WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
+# NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+# SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+#
+###
+
+# Ensure /bin/sh
+export PATH || (echo "This isn't sh."; sh $0 $*; kill $$)
+
+# source common library functionality, setting ARGS, NAME_OF_THIS,
+# PATH_TO_THIS, and THIS.
+. "$1/regress/library.sh"
+
+if test "x$LOGFILE" = "x" ; then
+ LOGFILE=`pwd`/iges.log
+ rm -f "$LOGFILE"
+fi
+log "=== TESTING iges conversion ==="
+
+MGED="`ensearch mged`"
+if test ! -f "$MGED" ; then
+ log "Unable to find mged, aborting"
+ exit 1
+fi
+
+GIGES="`ensearch g-iges`"
+if test ! -f "$MGED" ; then
+ log "Unable to find g-iges, aborting"
+ exit 1
+fi
+
+IGESG="`ensearch iges-g`"
+if test ! -f "$MGED" ; then
+ log "Unable to find iges-g, aborting"
+ exit 1
+fi
+
+
+STATUS=0
+
+# CREATE G
+
+output=iges.g
+rm -f "$output"
+log "... running mged to create facetized geometry ($output)"
+$MGED -c >> "$LOGFILE" 2>&1 <<EOF
+opendb $output y
+
+units mm
+size 1000
+make box.s arb8
+facetize -n box.nmg box.s
+kill box.s
+q
+EOF
+if [ ! -f "$output" ] ; then
+ log "ERROR: mged failed to create $output"
+ log "-> iges.sh FAILED, see $LOGFILE"
+ exit 1
+fi
+
+# G TO IGES
+
+# test G -> IGES via -o
+output="iges.export.iges"
+rm -f "$output"
+run $GIGES -o "$output" iges.g box.nmg
+if [ ! -f "$output" ] ; then
+ log "ERROR: g-iges failed to create $output"
+ log "-> iges.sh FAILED, see $LOGFILE"
+ exit 1
+fi
+
+# test G -> IGES via stdout (can't use 'run')
+output="iges.export.stdout.iges"
+rm -f "$output"
+log "... running $GIGES iges.g box.nmg > $output"
+$GIGES iges.g box.nmg > $output 2>> "$LOGFILE"
+if [ ! -f "$output" ] ; then
+ log "ERROR: g-iges failed to create $output"
+ log "-> iges.sh FAILED, see $LOGFILE"
+ exit 1
+fi
+
+# test that the first g-iges -o output matches the stdout output
+files_match iges.export.iges iges.export.stdout.iges -I 'G'
+if test $? -ne 0 ; then
+ STATUS="`expr $STATUS + 1`"
+ export STATUS
+fi
+
+# G TO IGES TO G
+
+# test IGES -> G
+output="iges.import.g"
+rm -f "$output"
+run $IGESG -o "$output" iges.export.iges
+if [ ! -f "$output" ] ; then
+ log "ERROR: iges-g failed to create $output"
+ log "-> iges.sh FAILED, see $LOGFILE"
+ exit 1
+fi
+
+# test IGES -> G (with -p)
+output="iges.import2.g"
+rm -f "$output"
+run $IGESG -o "$output" -p iges.export.iges
+if [ ! -f "$output" ] ; then
+ log "ERROR: iges-g failed to create $output"
+ log "-> iges.sh FAILED, see $LOGFILE"
+ exit 1
+fi
+
+# test IGES -> G (with -p -N name)
+output="iges.import3.g"
+rm -f "$output"
+run $IGESG -o "$output" -p -N box.nmg iges.export.iges
+if [ ! -f "$output" ] ; then
+ log "ERROR: iges-g failed to create $output"
+ log "-> iges.sh FAILED, see $LOGFILE"
+ exit 1
+fi
+
+# test that these produced different output
+files_differ iges.import.g iges.import2.g
+if test $? -ne 0 ; then
+ STATUS="`expr $STATUS + 1`"
+ export STATUS
+fi
+# FIXME: these should match but -N is creating 'box.nmgA'
+# files_match iges.import2.g iges.import3.g
+# if test $? -ne 0 ; then
+# STATUS="`expr $STATUS + 1`"
+# export STATUS
+# fi
+# FIXME: these should match but -N is creating 'box.nmgA'
+# files_match iges.import.g iges.import3.g
+# if test $? -ne 0 ; then
+# STATUS="`expr $STATUS + 1`"
+# export STATUS
+# fi
+
+# G TO IGES TO G TO IGES (ROUND TRIP)
+
+# make sure we don't permute vertices or introduce some other
+# unintended change.
+
+# test G -> IGES #2a via -o
+output="iges.import.export.iges"
+rm -f "$output"
+run $GIGES -o "$output" iges.import.g box.nmg
+if [ ! -f "$output" ] ; then
+ log "ERROR: g-iges failed to create $output"
+ log "-> iges.sh FAILED, see $LOGFILE"
+ exit 1
+fi
+
+# test G -> IGES #2b via -o
+output="iges.import2.export.iges"
+rm -f "$output"
+run $GIGES -o "$output" iges.import2.g box.nmg
+if [ ! -f "$output" ] ; then
+ log "ERROR: g-iges failed to create $output"
+ log "-> iges.sh FAILED, see $LOGFILE"
+ exit 1
+fi
+
+# test G -> IGES #2c via -o
+output="iges.import3.export.iges"
+rm -f "$output"
+run $GIGES -o "$output" iges.import3.g box.nmg
+if [ ! -f "$output" ] ; then
+ log "ERROR: g-iges failed to create $output"
+ log "-> iges.sh FAILED, see $LOGFILE"
+ exit 1
+fi
+
+# COMPARE RESULTS
+
+# test that initial g-iges output does NOT match final BoT output
+files_differ iges.export.iges iges.import.export.iges -I 'G'
+if test $? -ne 0 ; then
+ STATUS="`expr $STATUS + 1`"
+ export STATUS
+fi
+
+# FIXME: these should match but vertices are permuted!
+# test that initial g-iges output DOES match final NMG output
+# files_match iges.export.iges iges.import2.export.iges -I 'G'
+# if test $? -ne 0 ; then
+# STATUS="`expr $STATUS + 1`"
+# export STATUS
+# fi
+
+# test that initial g-iges output DOES match final named NMG output
+# FIXME: these should match but iges-g -N is creating 'box.nmgA'
+# files_match iges.export.iges iges.import3.export.iges -I 'G'
+# if test $? -ne 0 ; then
+# STATUS="`expr $STATUS + 1`"
+# export STATUS
+# fi
+
+# COMPLEX TEST
+
+# check another TGM known to have a conversion failure which should be graceful
+ASC2G="`ensearch asc2g`"
+if test ! -f "$ASC2G" ; then
+ log "Unable to find asc2g, aborting"
+ exit 1
+fi
+GZIP="`which gzip`"
+if test ! -f "$GZIP" ; then
+ log "Unable to find gzip, aborting"
+ exit 1
+fi
+
+# make our starting database
+$GZIP -d -c "$PATH_TO_THIS/m35.asc.gz" > iges.m35.asc
+$ASC2G iges.m35.asc iges.m35.g
+
+# and test it (note it should work with the '-f' option, but fail
+# without any options)
+run $GIGES -f -o iges.m35.r516.iges iges.m35.g r516
+if test $? -ne 0 ; then
+ STATUS="`expr $STATUS + 1`"
+ export STATUS
+fi
+
+# TODO: add full m35 conversion test
+# run $GIGES -f -o iges.m35.iges iges.m35.g component
+# if test $? -ne 0 ; then
+# STATUS="`expr $STATUS + 1`"
+# export STATUS
+# fi
+
+if [ X$STATUS = X0 ] ; then
+ log "-> iges.sh succeeded"
+else
+ log "-> iges.sh FAILED, see $LOGFILE"
+fi
+
+exit $STATUS
+
+# Local Variables:
+# mode: sh
+# tab-width: 8
+# sh-indentation: 4
+# sh-basic-offset: 4
+# indent-tabs-mode: t
+# End:
+# ex: shiftwidth=4 tabstop=8
Copied: brlcad/branches/bioh/regress/iges/m35.asc.gz (from rev 76374,
brlcad/branches/bioh/regress/tgms/m35.asc.gz)
===================================================================
(Binary files differ)
Deleted: brlcad/branches/bioh/regress/iges.sh
===================================================================
--- brlcad/branches/bioh/regress/iges.sh 2020-07-17 18:50:23 UTC (rev
76374)
+++ brlcad/branches/bioh/regress/iges.sh 2020-07-17 20:04:27 UTC (rev
76375)
@@ -1,282 +0,0 @@
-#!/bin/sh
-# I G E S . S H
-# BRL-CAD
-#
-# Copyright (c) 2010-2020 United States Government as represented by
-# the U.S. Army Research Laboratory.
-#
-# Redistribution and use in source and binary forms, with or without
-# modification, are permitted provided that the following conditions
-# are met:
-#
-# 1. Redistributions of source code must retain the above copyright
-# notice, this list of conditions and the following disclaimer.
-#
-# 2. Redistributions in binary form must reproduce the above
-# copyright notice, this list of conditions and the following
-# disclaimer in the documentation and/or other materials provided
-# with the distribution.
-#
-# 3. The name of the author may not be used to endorse or promote
-# products derived from this software without specific prior written
-# permission.
-#
-# THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS
-# OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
-# WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-# ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY
-# DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
-# DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE
-# GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-# INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
-# WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
-# NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
-# SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-#
-###
-
-# Ensure /bin/sh
-export PATH || (echo "This isn't sh."; sh $0 $*; kill $$)
-
-# source common library functionality, setting ARGS, NAME_OF_THIS,
-# PATH_TO_THIS, and THIS.
-. "$1/regress/library.sh"
-
-if test "x$LOGFILE" = "x" ; then
- LOGFILE=`pwd`/iges.log
- rm -f "$LOGFILE"
-fi
-log "=== TESTING iges conversion ==="
-
-MGED="`ensearch mged`"
-if test ! -f "$MGED" ; then
- log "Unable to find mged, aborting"
- exit 1
-fi
-
-GIGES="`ensearch g-iges`"
-if test ! -f "$MGED" ; then
- log "Unable to find g-iges, aborting"
- exit 1
-fi
-
-IGESG="`ensearch iges-g`"
-if test ! -f "$MGED" ; then
- log "Unable to find iges-g, aborting"
- exit 1
-fi
-
-
-STATUS=0
-
-# CREATE G
-
-output=iges.g
-rm -f "$output"
-log "... running mged to create facetized geometry ($output)"
-$MGED -c >> "$LOGFILE" 2>&1 <<EOF
-opendb $output y
-
-units mm
-size 1000
-make box.s arb8
-facetize -n box.nmg box.s
-kill box.s
-q
-EOF
-if [ ! -f "$output" ] ; then
- log "ERROR: mged failed to create $output"
- log "-> iges.sh FAILED, see $LOGFILE"
- exit 1
-fi
-
-# G TO IGES
-
-# test G -> IGES via -o
-output="iges.export.iges"
-rm -f "$output"
-run $GIGES -o "$output" iges.g box.nmg
-if [ ! -f "$output" ] ; then
- log "ERROR: g-iges failed to create $output"
- log "-> iges.sh FAILED, see $LOGFILE"
- exit 1
-fi
-
-# test G -> IGES via stdout (can't use 'run')
-output="iges.export.stdout.iges"
-rm -f "$output"
-log "... running $GIGES iges.g box.nmg > $output"
-$GIGES iges.g box.nmg > $output 2>> "$LOGFILE"
-if [ ! -f "$output" ] ; then
- log "ERROR: g-iges failed to create $output"
- log "-> iges.sh FAILED, see $LOGFILE"
- exit 1
-fi
-
-# test that the first g-iges -o output matches the stdout output
-files_match iges.export.iges iges.export.stdout.iges -I 'G'
-if test $? -ne 0 ; then
- STATUS="`expr $STATUS + 1`"
- export STATUS
-fi
-
-# G TO IGES TO G
-
-# test IGES -> G
-output="iges.import.g"
-rm -f "$output"
-run $IGESG -o "$output" iges.export.iges
-if [ ! -f "$output" ] ; then
- log "ERROR: iges-g failed to create $output"
- log "-> iges.sh FAILED, see $LOGFILE"
- exit 1
-fi
-
-# test IGES -> G (with -p)
-output="iges.import2.g"
-rm -f "$output"
-run $IGESG -o "$output" -p iges.export.iges
-if [ ! -f "$output" ] ; then
- log "ERROR: iges-g failed to create $output"
- log "-> iges.sh FAILED, see $LOGFILE"
- exit 1
-fi
-
-# test IGES -> G (with -p -N name)
-output="iges.import3.g"
-rm -f "$output"
-run $IGESG -o "$output" -p -N box.nmg iges.export.iges
-if [ ! -f "$output" ] ; then
- log "ERROR: iges-g failed to create $output"
- log "-> iges.sh FAILED, see $LOGFILE"
- exit 1
-fi
-
-# test that these produced different output
-files_differ iges.import.g iges.import2.g
-if test $? -ne 0 ; then
- STATUS="`expr $STATUS + 1`"
- export STATUS
-fi
-# FIXME: these should match but -N is creating 'box.nmgA'
-# files_match iges.import2.g iges.import3.g
-# if test $? -ne 0 ; then
-# STATUS="`expr $STATUS + 1`"
-# export STATUS
-# fi
-# FIXME: these should match but -N is creating 'box.nmgA'
-# files_match iges.import.g iges.import3.g
-# if test $? -ne 0 ; then
-# STATUS="`expr $STATUS + 1`"
-# export STATUS
-# fi
-
-# G TO IGES TO G TO IGES (ROUND TRIP)
-
-# make sure we don't permute vertices or introduce some other
-# unintended change.
-
-# test G -> IGES #2a via -o
-output="iges.import.export.iges"
-rm -f "$output"
-run $GIGES -o "$output" iges.import.g box.nmg
-if [ ! -f "$output" ] ; then
- log "ERROR: g-iges failed to create $output"
- log "-> iges.sh FAILED, see $LOGFILE"
- exit 1
-fi
-
-# test G -> IGES #2b via -o
-output="iges.import2.export.iges"
-rm -f "$output"
-run $GIGES -o "$output" iges.import2.g box.nmg
-if [ ! -f "$output" ] ; then
- log "ERROR: g-iges failed to create $output"
- log "-> iges.sh FAILED, see $LOGFILE"
- exit 1
-fi
-
-# test G -> IGES #2c via -o
-output="iges.import3.export.iges"
-rm -f "$output"
-run $GIGES -o "$output" iges.import3.g box.nmg
-if [ ! -f "$output" ] ; then
- log "ERROR: g-iges failed to create $output"
- log "-> iges.sh FAILED, see $LOGFILE"
- exit 1
-fi
-
-# COMPARE RESULTS
-
-# test that initial g-iges output does NOT match final BoT output
-files_differ iges.export.iges iges.import.export.iges -I 'G'
-if test $? -ne 0 ; then
- STATUS="`expr $STATUS + 1`"
- export STATUS
-fi
-
-# FIXME: these should match but vertices are permuted!
-# test that initial g-iges output DOES match final NMG output
-# files_match iges.export.iges iges.import2.export.iges -I 'G'
-# if test $? -ne 0 ; then
-# STATUS="`expr $STATUS + 1`"
-# export STATUS
-# fi
-
-# test that initial g-iges output DOES match final named NMG output
-# FIXME: these should match but iges-g -N is creating 'box.nmgA'
-# files_match iges.export.iges iges.import3.export.iges -I 'G'
-# if test $? -ne 0 ; then
-# STATUS="`expr $STATUS + 1`"
-# export STATUS
-# fi
-
-# COMPLEX TEST
-
-# check another TGM known to have a conversion failure which should be graceful
-ASC2G="`ensearch asc2g`"
-if test ! -f "$ASC2G" ; then
- log "Unable to find asc2g, aborting"
- exit 1
-fi
-GZIP="`which gzip`"
-if test ! -f "$GZIP" ; then
- log "Unable to find gzip, aborting"
- exit 1
-fi
-
-# make our starting database
-$GZIP -d -c "$PATH_TO_THIS/tgms/m35.asc.gz" > iges.m35.asc
-$ASC2G iges.m35.asc iges.m35.g
-
-# and test it (note it should work with the '-f' option, but fail
-# without any options)
-run $GIGES -f -o iges.m35.r516.iges iges.m35.g r516
-if test $? -ne 0 ; then
- STATUS="`expr $STATUS + 1`"
- export STATUS
-fi
-
-# TODO: add full m35 conversion test
-# run $GIGES -f -o iges.m35.iges iges.m35.g component
-# if test $? -ne 0 ; then
-# STATUS="`expr $STATUS + 1`"
-# export STATUS
-# fi
-
-if [ X$STATUS = X0 ] ; then
- log "-> iges.sh succeeded"
-else
- log "-> iges.sh FAILED, see $LOGFILE"
-fi
-
-exit $STATUS
-
-# Local Variables:
-# mode: sh
-# tab-width: 8
-# sh-indentation: 4
-# sh-basic-offset: 4
-# indent-tabs-mode: t
-# End:
-# ex: shiftwidth=4 tabstop=8
Added: brlcad/branches/bioh/regress/lights/CMakeLists.txt
===================================================================
--- brlcad/branches/bioh/regress/lights/CMakeLists.txt
(rev 0)
+++ brlcad/branches/bioh/regress/lights/CMakeLists.txt 2020-07-17 20:04:27 UTC
(rev 76375)
@@ -0,0 +1,36 @@
+
+if (SH_EXEC AND TARGET asc2g)
+
+ add_test(NAME regress-lights COMMAND ${SH_EXEC}
"${CMAKE_CURRENT_SOURCE_DIR}/lights.sh" ${CMAKE_SOURCE_DIR})
+ BRLCAD_REGRESSION_TEST(regress-lights "rt;asc2g;pixdiff" TEST_DEFINED)
+
+endif (SH_EXEC AND TARGET asc2g)
+
+CMAKEFILES(
+ lights.ref.pix
+ lights.sh
+ )
+
+# list of temporary files
+set(lights_outfiles
+ lights.asc
+ lights.diff.pix
+ lights.g
+ lights.log
+ lights.pix
+ )
+
+set_property(DIRECTORY APPEND PROPERTY ADDITIONAL_MAKE_CLEAN_FILES
"${lights_outfiles}")
+DISTCLEAN(${lights_outfiles})
+
+CMAKEFILES(
+ CMakeLists.txt
+ lights.cmake
+ )
+
+# Local Variables:
+# tab-width: 8
+# mode: cmake
+# indent-tabs-mode: t
+# End:
+# ex: shiftwidth=2 tabstop=8
Property changes on: brlcad/branches/bioh/regress/lights/CMakeLists.txt
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: svn:mime-type
## -0,0 +1 ##
+text/plain
\ No newline at end of property
Copied: brlcad/branches/bioh/regress/lights/lights.cmake (from rev 76374,
brlcad/branches/bioh/regress/lights.cmake)
===================================================================
--- brlcad/branches/bioh/regress/lights/lights.cmake
(rev 0)
+++ brlcad/branches/bioh/regress/lights/lights.cmake 2020-07-17 20:04:27 UTC
(rev 76375)
@@ -0,0 +1,104 @@
+# L I G H T S . C M A K E
+# BRL-CAD
+#
+# Copyright (c) 2010-2020 United States Government as represented by
+# the U.S. Army Research Laboratory.
+#
+# Redistribution and use in source and binary forms, with or without
+# modification, are permitted provided that the following conditions
+# are met:
+#
+# 1. Redistributions of source code must retain the above copyright
+# notice, this list of conditions and the following disclaimer.
+#
+# 2. Redistributions in binary form must reproduce the above
+# copyright notice, this list of conditions and the following
+# disclaimer in the documentation and/or other materials provided
+# with the distribution.
+#
+# 3. The name of the author may not be used to endorse or promote
+# products derived from this software without specific prior written
+# permission.
+#
+# THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS
+# OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+# WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+# ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY
+# DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+# DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE
+# GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+# INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+# WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
+# NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+# SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+#
+###
+
+include("${CMAKE_CURRENT_SOURCE_DIR}/BRLCAD_Regress_Util.cmake")
+
+ensearch(rt RT REQUIRED)
+ensearch(asc2g A2G REQUIRED)
+ensearch(pixdiff PIXDIFF REQUIRED)
+
+execute_process(COMMAND ${CMAKE_COMMAND} -E remove -f lights.pix)
+
+set(lights_asc "
+title {Untitled BRL-CAD Database}
+units mm
+put {local} ell V {-4 -4 4} A {0.5 0 0} B {0 0.5 0} C {0 0 0.5}
+put {infinite} ell V {-4 4 4} A {0.5 0 0} B {0 0.5 0} C {0 0 0.5}
+put {plate.s} arb8 V1 {-30 -30 -1} V2 {30 -30 -1} V3 {30 30 -1} V4 {-30 30 -1}
V5 {-30 -30 0} V6 {30 -30 0} V7 {30 30 0} V8 {-30 30 0}
+put {pole2.s} tgc V {9 2.5 1} H {0 0 10} A {0 -0.25 0} B {0.25 0 0} C {0 -0.25
0} D {0.25 0 0}
+put {pole1.s} tgc V {-11 2.5 1} H {0 0 10} A {0 -0.25 0} B {0.25 0 0} C {0
-0.25 0} D {0.25 0 0}
+put {ball2.s} ell V {10 0 5} A {2 0 0} B {0 2 0} C {0 0 2}
+put {ball1.s} ell V {-10 0 5} A {2 0 0} B {0 2 0} C {0 0 2}
+put {shadow_objs.r} comb region yes tree {u {u {l ball1.s} {l pole1.s}} {u {l
ball2.s} {l pole2.s}}}
+attr set {shadow_objs.r} {region} {R} {los} {100} {material_id} {1}
{region_id} {1001}
+put {plate.r} comb region yes tree {l plate.s}
+attr set {plate.r} {region} {R} {los} {100} {material_id} {1} {region_id}
{1000}
+put {infinite.r} comb region yes tree {l infinite}
+attr set {infinite.r} {region} {R} {los} {100} {material_id} {1} {region_id}
{1002} {oshader} {light {i 1 v 0}} {rgb} {255/255/255}
+put {local.r} comb region yes tree {l local}
+attr set {local.r} {region} {R} {rgb} {255/255/255} {oshader} {light {s 4 pt
{-4.46848 -4.09864 4.1442} pt {-3.55149 -4.11535 4.18852} pt {-4.41469 -4.27933
4.00234} pt {-3.62755 -4.33234 4.02878} pt {-4.09301 -4.44478 3.79139} pt
{-4.10851 -3.55786 3.79328} pt {-3.63361 -4.2739 3.79817} pt {-3.62019 -3.74156
3.80263} pt {-4.432 -3.88231 4.22254} pt {-3.59094 -3.85892 4.25053} pt
{-3.85797 -4.45142 3.83861} pt {-3.84812 -3.55582 3.82785} pt {-4.16269
-4.30592 4.36048} pt {-3.84629 -4.30072 4.3687} pt {-4.3644 -3.65806 3.98285}
pt {-3.67668 -3.61863 3.99506} pt {-4.38028 -3.92574 4.31602} pt {-3.62451
-3.93287 4.32327} pt {-4.36414 -3.6574 4.00475} pt {-3.66174 -3.63259 4.02432}
pt {-4.27269 -3.6819 3.72714} pt {-3.71379 -3.68422 3.73853} pt {-4.38155
-3.67804 4.02765} pt {-3.60849 -3.68903 3.99648} pt {-4.41137 -4.15778 3.76362}
pt {-3.59758 -4.17667 3.76157}}} {region_id} {1003} {material_id} {1} {los}
{100}
+put {all.g} comb region no tree {u {u {l infinite.r} {l local.r}} {u {l
plate.r} {l shadow_objs.r}}}
+")
+
+file(WRITE lights.asc "${lights_asc}")
+execute_process(COMMAND ${A2G} lights.asc lights.g)
+execute_process(COMMAND ${CMAKE_COMMAND} -E remove -f lights.asc)
+
+message("rendering lights...")
+set(vmat "
+viewsize 1.600000000000000e+02;
+orientation 0.000000000000000e+00 0.000000000000000e+00 0.000000000000000e+00
1.000000000000000e+00;
+eye_pt 0.000000000000000e+00 0.000000000000000e+00 7.950000000000000e+01;
+start 0; clean;
+end;
+
+")
+file(WRITE vmat.in "${vmat}")
+execute_process(COMMAND ${RT} -M -B -p30 -o lights.pix lights.g all.g
INPUT_FILE vmat.in ERROR_FILE lights.log)
+execute_process(COMMAND ${CMAKE_COMMAND} -E remove -f vmat.in)
+
+execute_process(COMMAND ${PIXDIFF} lights.pix INPUT_FILE lights.pix
OUTPUT_FILE lights_diff.pix ERROR_FILE lights_diff.log)
+
+file(READ lights_diff.log llog)
+file(APPEND lights.log "${llog}")
+string(REGEX REPLACE ".*([0-9]+) off by many.*" "\\1" n_wrong "${llog}")
+message("lights.pix ${n_wrong} off by many")
+execute_process(COMMAND ${CMAKE_COMMAND} -E remove -f lights_diff.log)
+
+if(${n_wrong} EQUAL 0)
+ message("-> lights.sh succeeded")
+else(${n_wrong} EQUAL 0)
+ message(FATAL_ERROR "-> lights.sh FAILED")
+endif(${n_wrong} EQUAL 0)
+
+
+
+# Local Variables:
+# tab-width: 8
+# mode: cmake
+# indent-tabs-mode: t
+# End:
+# ex: shiftwidth=2 tabstop=8
Copied: brlcad/branches/bioh/regress/lights/lights.ref.pix (from rev 76374,
brlcad/branches/bioh/regress/lights.ref.pix)
===================================================================
(Binary files differ)
Copied: brlcad/branches/bioh/regress/lights/lights.sh (from rev 76374,
brlcad/branches/bioh/regress/lights.sh)
===================================================================
--- brlcad/branches/bioh/regress/lights/lights.sh
(rev 0)
+++ brlcad/branches/bioh/regress/lights/lights.sh 2020-07-17 20:04:27 UTC
(rev 76375)
@@ -0,0 +1,123 @@
+#!/bin/sh
+# L I G H T S . S H
@@ Diff output truncated at 100000 characters. @@
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
