Skip to content

Commit

Permalink
Added Neil Salter's osgUtx library into the distribution, have put al…
Browse files Browse the repository at this point in the history
…l the

orignal seperate headers and source into include/osg/UnitTestFrameWork
and src/osg/UnitTestFramework.cpp respectively.  I have done this to
keep the include and source directories focused on the scene graph rather
than the test framework.

Have added a very simple unit test to Vec3.cpp, which are optionally
compiled in with the OSG_COMPILE_UNIT_TESTS define, which is only
currently defined in debug builds under unix.  It should be fine to
add it in under Windows project files as well.

Finally, a new demo app osgunittests runs the tests and reports success
or failure of the tests.
  • Loading branch information
robertosfield committed Aug 28, 2002
1 parent 111f052 commit a0cc3e4
Show file tree
Hide file tree
Showing 13 changed files with 1,213 additions and 9 deletions.
4 changes: 4 additions & 0 deletions Make/debugtests.bat
Expand Up @@ -2,6 +2,10 @@ echo osgversion
osgversion
more memleaks.log

echo osgunittests
osgunittests
more memleaks.log

echo sgv osgcool.osg
sgv osgcool.osg
more memleaks.log
Expand Down
18 changes: 9 additions & 9 deletions Make/makedefs
Expand Up @@ -93,7 +93,7 @@ ifeq ($(COMPILER),gnu)
INC += -I/usr/local/glut-3.7/include
DEF += -W -Wall -fPIC -fpermissive
OPTF = -O2
DBGF = -g
DBGF = -g -DOSG_COMPILE_UNIT_TESTS
SHARED = -shared -fPIC
ifeq ($(ARCH),64)
ARCHARGS = -m64
Expand Down Expand Up @@ -127,7 +127,7 @@ else
INC +=
DEF += -features=extensions
OPTF = -xO4
DBGF = -g
DBGF = -g -DOSG_COMPILE_UNIT_TESTS
SHARED = -G
ifeq ($(ARCH),64)
ARCHARGS = -xarch=v9
Expand Down Expand Up @@ -166,7 +166,7 @@ ifeq ($(OS),IRIX)
-DEBUG:woff=1682 -DEBUG:woff=3303\
-MDupdate $(MAKEDEPEND)
OPTF = -O2
DBGF = -g
DBGF = -g -DOSG_COMPILE_UNIT_TESTS
SHARED = -shared
ARCH = 32
ifeq ($(ARCH),64)
Expand Down Expand Up @@ -216,7 +216,7 @@ endif
INC +=
DEF += -W -Wall
OPTF = -O2
DBGF = -g -DOSG_USE_MEMORY_MANAGER
DBGF = -g -DOSG_COMPILE_UNIT_TESTS -DOSG_USE_MEMORY_MANAGER
SHARED = -shared
ARCHARGS =
LINKARGS = -L/usr/X11R6/lib
Expand Down Expand Up @@ -250,7 +250,7 @@ ifeq ($(OS),FreeBSD)
INC += -I/usr/local/include -I/usr/X11R6/include
DEF += -W -Wall
OPTF = -O2
DBGF = -g
DBGF = -g -DOSG_COMPILE_UNIT_TESTS
SHARED = -shared
ARCHARGS =
LINKARGS = -L/usr/X11R6/lib -L/usr/local/lib -rpath /usr/local/lib
Expand All @@ -274,7 +274,7 @@ ifeq ($(OS),Darwin)
INC += -I/usr/include
DEF += -Wall -D__DARWIN_OSX__
OPTF = -O2
DBGF = -g
DBGF = -g -DOSG_COMPILE_UNIT_TESTS
DEPARG = -M $(DEF)
SHARED = -shared
ARCHARGS =
Expand Down Expand Up @@ -316,7 +316,7 @@ ifeq ($(OS),CYGWIN)
INC +=
DEF += -DWIN32 -W -Wall
OPTF = -O2
DBGF = -g
DBGF = -g -DOSG_COMPILE_UNIT_TESTS
SHARED = -shared\
-Wl,--export-all-symbols \
-Wl,--output-def,lib$(TARGET_BASENAME).def \
Expand Down Expand Up @@ -381,7 +381,7 @@ ifeq ($(OS),MINGW)
DEF += -DWIN32 -Wall
# -W
OPTF = -O2
DBGF = -g
DBGF = -g -DOSG_COMPILE_UNIT_TESTS
SHARED = -shared\
-Wl,--export-all-symbols \
-Wl,--output-def,lib$(TARGET_BASENAME).def \
Expand Down Expand Up @@ -457,7 +457,7 @@ ifeq ($(OS),HP-UX)
OPTF = -O2
# gcc 3.1 uses DWARF as default, my GDB might not yet support this...
# at least I've got problems everywhere
DBGF = -g -gstabs+
DBGF = -g -gstabs+ -DOSG_COMPILE_UNIT_TESTS
SHARED = -shared -fPIC
ARCH = 32
ifeq ($(ARCH),64)
Expand Down
1 change: 1 addition & 0 deletions Make/makedirdefs
Expand Up @@ -93,6 +93,7 @@ DEMOS_DIRS = \
osgtexture1D\
osgtexture2D\
osgtexture3D\
osgunittests\
osgviews\
osgversion\
sgv
95 changes: 95 additions & 0 deletions VisualStudio/Demos/osgunittests/osgunittests.dsp

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

21 changes: 21 additions & 0 deletions VisualStudio/VisualStudio.dsw
Expand Up @@ -279,6 +279,27 @@ Package=<4>

###############################################################################

Project: "Demo osgconv"=.\Demos\osgunittests\osgunittests.dsp - Package Owner=<4>

Package=<5>
{{{
}}}

Package=<4>
{{{
Begin Project Dependency
Project_Dep_Name Core osg
End Project Dependency
Begin Project Dependency
Project_Dep_Name Core osgDB
End Project Dependency
Begin Project Dependency
Project_Dep_Name Core osgUtil
End Project Dependency
}}}

###############################################################################

Project: "Demo osgcopy"=.\Demos\osgcopy\osgcopy.dsp - Package Owner=<4>

Package=<5>
Expand Down
12 changes: 12 additions & 0 deletions VisualStudio/osg/osg.dsp

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

0 comments on commit a0cc3e4

Please sign in to comment.