diff options
| author | Bill Wendling <wendling@ncsa.uiuc.edu> | 2001-03-05 23:09:59 (GMT) |
|---|---|---|
| committer | Bill Wendling <wendling@ncsa.uiuc.edu> | 2001-03-05 23:09:59 (GMT) |
| commit | e99887cc669f3dccba8a4869a21b8cc1a8e3a3b6 (patch) | |
| tree | 0c34fb56c41bf3aded23edea449ee97c23b5341d /c++/test/Makefile.in | |
| parent | 659945ecb58ad2ad3d7e6c5bc988cba146cba85d (diff) | |
| download | hdf5-e99887cc669f3dccba8a4869a21b8cc1a8e3a3b6.zip hdf5-e99887cc669f3dccba8a4869a21b8cc1a8e3a3b6.tar.gz hdf5-e99887cc669f3dccba8a4869a21b8cc1a8e3a3b6.tar.bz2 | |
[svn-r3549] Purpose:
Adding Test
Description:
- Add the tests to the Makefile so that they'll be executed.
- Fixed a few bugs in dsets.cpp
* Some buffers should have been char *'s instead of void *'s.
* An iterator for a loop wasn't declared properly.
- Formatting changes
Solution:
- Changed the void *'s to char *'s.
- Declared the loop iterator.
NOTE: Doesn't work just yet. There's a conflict with a C++ keyword
(delete) in the H5Pprivate.h header file. Quincey's looking into
this.
Platforms tested:
Linux
Diffstat (limited to 'c++/test/Makefile.in')
| -rw-r--r-- | c++/test/Makefile.in | 26 |
1 files changed, 18 insertions, 8 deletions
diff --git a/c++/test/Makefile.in b/c++/test/Makefile.in index 50eac99..0eda5be 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=$(TEST_SRC:.cpp=) 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_OBJ) $(LIB) $(LIBHDF5) $(LDFLAGS) $(LIBS) + +dsets: dsets.lo + @$(LT_LINK_EXE) $(CFLAGS) -o $@ dsets.lo $(hdf5_builddir)/../test/h5test.lo $(LIB) $(LIBHDF5) $(LDFLAGS) $(LIBS) @CONCLUDE@ |