[svn-r3629] Purpose:

    Feature Add
Description:
    Added "real" testing to the C++ library.
Platforms tested:
    Linux

3 files changed, 27 insertions, 20 deletions

diff --git a/c++/Makefile.in b/c++/Makefile.in
index 9da76fe..238024e 100644
--- a/c++/Makefile.in
+++ b/c++/Makefile.in
@@ -1,7 +1,7 @@
 ## Top-level HDF5-C++ Makefile(.in)
 ##
-## Copyright (C) 2000 National Center for Supercomputing Applications.
-##                    All rights reserved.
+## Copyright (C) 2000-2001 National Center for Supercomputing Applications.
+##                         All rights reserved.
 ##
 ## 
 ## This makefile mostly just reinvokes make in the various subdirectories
@@ -17,7 +17,7 @@ srcdir=@srcdir@
 # Subdirectories in build-order (not including `examples')
 # We include examples now since those are our "tests" at this time. We
 # can remove it later.
-SUBDIRS=src test examples
+SUBDIRS=src test
 
 ##############################################################################
 ##		    T A R G E T S
@@ -72,9 +72,8 @@ lib progs check test _test uninstall:
 	   (cd $$d && $(MAKE) $@) || exit 1;				      \
 	done
 
-##	@@SETX@; for d in $(SUBDIRS) examples; do
 tests TAGS dep depend:
-	@@SETX@; for d in $(SUBDIRS); do				      \
+	@@SETX@; for d in $(SUBDIRS) examples; do		      \
 	   (cd $$d && $(MAKE) $@) || exit 1;				      \
 	done
 
@@ -87,16 +86,14 @@ install:
 .PHONY: all lib progs test _test install uninstall dep depend clean           \
 	mostlyclean distclean maintainer-clean
 
-##	@@SETX@; for d in $(SUBDIRS) examples; do
 clean mostlyclean:
-	@@SETX@; for d in $(SUBDIRS); do				      \
+	@@SETX@; for d in $(SUBDIRS) examples; do		      \
 	   (cd $$d && $(MAKE) $@);					      \
 	done
 	-$(RM) conftest conftest.c
 
-##	@@SETX@; for d in $(SUBDIRS) examples; do
 distclean:
-	@@SETX@; for d in $(SUBDIRS); do				      \
+	@@SETX@; for d in $(SUBDIRS) examples; do				      \
 	   (cd $$d && $(MAKE) $@);					      \
 	done
 	-$(RM) config/commence config/conclude
diff --git a/c++/examples/Makefile.in b/c++/examples/Makefile.in
index 67c448a..ac0d26e 100644
--- a/c++/examples/Makefile.in
+++ b/c++/examples/Makefile.in
@@ -1,7 +1,7 @@
 ## HDF5-C++ examples/Makefile(.in)
 ##
-## Copyright (C) 2000 National Center for Supercomputing Applications.
-##                    All rights reserved.
+## Copyright (C) 2000-2001 National Center for Supercomputing Applications.
+##                         All rights reserved.
 ##
 ##
 top_srcdir=@top_srcdir@/..
@@ -29,7 +29,7 @@ TEST_OBJ=$(TEST_SRC:.cpp=.lo)
 ## `make check' will run. List them in the order they should be run.
 TEST_PROGS=$(TEST_SRC:.cpp=)
 
-TEST_SCRIPTS=$(srcdir)/testexamples.sh
+##TEST_SCRIPTS=$(srcdir)/testexamples.sh
 
 ## These are the files that `make clean' (and derivatives) will remove from
 ## this directory.
diff --git a/c++/test/Makefile.in b/c++/test/Makefile.in
index 50eac99..c63a581 100644
--- a/c++/test/Makefile.in
+++ b/c++/test/Makefile.in
@@ -14,26 +14,36 @@ hdf5_builddir=$(top_builddir)/src
 
 ## Add include directory to the C preprocessor flags and the h5test and hdf5
 ## libraries to the library list.
+CPPFLAGS=-I. -I../src -I$(srcdir)/../src -I$(top_srcdir)/test -I$(hdf5_builddir) -I$(hdf5_srcdir) @CPPFLAGS@
+
+## These are our main targets. They should be listed in the order to be
+## executed, generally most specific tests to least specific tests.
+RUNTEST=$(LT_RUN)
+
+## Add include directory to the C preprocessor flags and the h5test and hdf5
+## libraries to the library list.
 LT_LINK_LIB=$(LT) --mode=link $(CXX) -rpath $(libdir)
 LIB=../src/libhdf5_cpp.la
-CPPFLAGS=-I. -I../src -I$(srcdir)/../src -I$(hdf5_builddir) -I$(hdf5_srcdir) @CPPFLAGS@
-HDF5LIB=$(hdf5_builddir)/libhdf5.la
+LIBHDF5=$(hdf5_builddir)/libhdf5.la
 
 ## These are our main targets. They should be listed in the order to be
 ## executed, generally most specific tests to least specific tests.
 RUNTEST=$(LT_RUN)
 
-TEST_PROGS_SRC=
-TEST_PROGS=
-
-TEST_SRC=
+TEST_SRC=dsets.cpp testhdf5.cpp tfile.cpp
 TEST_OBJ=$(TEST_SRC:.cpp=.lo)
+TEST_PROGS=dsets testhdf5
 
 TEST_SCRIPTS=
 
 DISTCLEAN=$(TEST_PROGS_SRC:.cpp=.lo) $(TEST_PROGS_SRC:.cpp=.o) *.h5
 
-$(TEST_PROGS): $(LIB)
-	@echo No C++ test as of yet.
+$(TEST_PROGS): $(LIB) $(LIBHDF5)
+
+testhdf5: $(TEST_OBJ)
+	@$(LT_LINK_EXE) $(CFLAGS) -o $@ testhdf5.lo tfile.lo $(LIB) $(LIBHDF5) $(LDFLAGS) $(LIBS)
+
+dsets: dsets.lo
+	@$(LT_LINK_EXE) $(CFLAGS) -o $@ dsets.lo $(hdf5_builddir)/../test/h5test.lo $(LIB) $(LIBHDF5) $(LDFLAGS) $(LIBS)
 
 @CONCLUDE@