[svn-r7507] *** empty log message ***

1 files changed, 20 insertions, 6 deletions

diff --git a/test/Makefile.in b/test/Makefile.in
index 4a89e03..d46d90e 100644
--- a/test/Makefile.in
+++ b/test/Makefile.in
@@ -22,14 +22,21 @@ srcdir=@srcdir@
 ## libraries to the library list.
 CPPFLAGS=-I. -I$(srcdir) -I../src -I$(top_srcdir)/src @CPPFLAGS@
 
+## Test script for error_test and err_compat
+TEST_SCRIPTS=$(srcdir)/testerror.sh
+
 ## These are our main targets. They should be listed in the order to be
 ## executed, generally most specific tests to least specific tests.
 TEST_PROGS=testhdf5 lheap ohdr stab gheap hyperslab istore bittests dtypes      \
            dsets cmpd_dset extend external links unlink big mtime fillval mount \
            flush1 flush2 enum gass_write gass_read gass_append set_extent       \
            srb_write srb_append srb_read ttsafe stream_test getname file_handle \
-           ntypes dangle errors
+           ntypes dangle
+
+## Test programs for Error API
+ERR_PROGS=error_test err_compat
 
+PROGS=$(ERR_PROGS) $(TEST_PROGS)
 TIMINGS=testmeta
 
 ## The libh5test.a library provides common support code for the tests. We link
@@ -57,7 +64,7 @@ MOSTLYCLEAN=cmpd_dset.h5 compact_dataset.h5 dataset.h5 extend.h5 istore.h5   \
             set_extent_read.h5 set_extent_create.h5 getname.h5               \
             getname[1-3].h5 sec2_file.h5 family_file000[0-3][0-9].h5         \
             multi_file-[rs].h5 core_file new_move_[ab].h5 ntypes.h5          \
-            dangle.h5 errors.h5
+            dangle.h5 error_test.h5 err_compat.h5
 
 CLEAN=$(TIMINGS)
 
@@ -75,7 +82,7 @@ TEST_SRC=big.c bittests.c cmpd_dset.c dsets.c dtypes.c extend.c              \
          ttsafe_dcreate.c ttsafe_error.c ttsafe_cancel.c ttsafe_acreate.c    \
          gass_write.c gass_read.c gass_append.c srb_read.c srb_write.c       \
          srb_append.c stream_test.c set_extent.c getname.c file_handle.c     \
-         ntypes.c dangle.c errors.c
+         ntypes.c dangle.c error_test.c err_compat.c
 
 TEST_OBJ=$(TEST_SRC:.c=.lo)
 
@@ -94,8 +101,12 @@ timings _timings: $(TIMINGS)
 	   fi;								      \
 	done;
 
+## Programs have to be built before they can be tested!
+##
+check test _test: $(PROGS)
+
 ## How to build the tests...  They all depend on the test and hdf5 libraries.
-$(TEST_PROGS): $(LIB) $(LIBHDF5)
+$(PROGS): $(LIB) $(LIBHDF5)
 
 TESTHDF5_OBJ=testhdf5.lo tarray.lo tattr.lo tconfig.lo tfile.lo tgenprop.lo   \
     th5s.lo theap.lo titerate.lo tmeta.lo ttime.lo trefer.lo trefstr.lo       \
@@ -212,7 +223,10 @@ ntypes: ntypes.lo
 dangle: dangle.lo
 	@$(LT_LINK_EXE) $(CFLAGS) -o $@ dangle.lo $(LIB) $(LIBHDF5) $(LDFLAGS) $(LIBS)
 
-errors: errors.lo
-	@$(LT_LINK_EXE) $(CFLAGS) -o $@ errors.lo $(LIB) $(LIBHDF5) $(LDFLAGS) $(LIBS)
+error_test: error_test.lo
+	@$(LT_LINK_EXE) $(CFLAGS) -o $@ error_test.lo $(LIB) $(LIBHDF5) $(LDFLAGS) $(LIBS)
+   
+err_compat: err_compat.lo
+	@$(LT_LINK_EXE) $(CFLAGS) -o $@ err_compat.lo $(LIB) $(LIBHDF5) $(LDFLAGS) $(LIBS)
 
 @CONCLUDE@