summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAlbert Cheng <acheng@hdfgroup.org>2004-03-23 04:43:12 (GMT)
committerAlbert Cheng <acheng@hdfgroup.org>2004-03-23 04:43:12 (GMT)
commitb45703bf8996cef0cfb6c9c62aa0b6cf9660d118 (patch)
tree6ee8d374c992c9298fdf0eea6d84fbb142fa65fd
parent5f7cc587559f9b421e82dc7c70c37077a4411706 (diff)
downloadhdf5-b45703bf8996cef0cfb6c9c62aa0b6cf9660d118.zip
hdf5-b45703bf8996cef0cfb6c9c62aa0b6cf9660d118.tar.gz
hdf5-b45703bf8996cef0cfb6c9c62aa0b6cf9660d118.tar.bz2
[svn-r8274] Purpose:
Code cleanup. Description: The routines residing in testframe.c was defined in testhdf5.h due to historical reason. It really belongs to h5test.h because those routines reside in libh55test.a. Solution: Moved them to the right place. Also removed the duplicated occurance of testframe.c in the TEST_SRC. Platforms tested: Tested in o2 (SGI) parallel.
-rw-r--r--test/Makefile.in2
-rw-r--r--test/h5test.h16
-rw-r--r--test/testhdf5.h16
3 files changed, 17 insertions, 17 deletions
diff --git a/test/Makefile.in b/test/Makefile.in
index 15421e7..3951d7a 100644
--- a/test/Makefile.in
+++ b/test/Makefile.in
@@ -76,7 +76,7 @@ CLEAN=$(TIMINGS)
TEST_SRC=big.c bittests.c cmpd_dset.c dsets.c dtypes.c extend.c \
external.c fillval.c flush1.c flush2.c gheap.c h5test.c hyperslab.c \
istore.c lheap.c links.c mount.c mtime.c ohdr.c stab.c tarray.c \
- tattr.c tconfig.c testframe.c testhdf5.c testmeta.c tfile.c \
+ tattr.c tconfig.c testhdf5.c testmeta.c tfile.c \
tgenprop.c th5s.c theap.c titerate.c tmeta.c trefer.c trefstr.c \
tselect.c ttime.c ttbbt.c ttst.c tvltypes.c tvlstr.c tmisc.c \
unlink.c enum.c ttsafe.c ttsafe_dcreate.c ttsafe_error.c \
diff --git a/test/h5test.h b/test/h5test.h
index 2f039f3..1b37feb 100644
--- a/test/h5test.h
+++ b/test/h5test.h
@@ -112,6 +112,22 @@ H5TEST_DLL void h5_show_hostname(void);
H5TEST_DLL off_t h5_get_file_size(const char *filename);
H5TEST_DLL int print_func(const char *format, ...);
+/* Routines for operating on the list of tests (for the "all in one" tests) */
+H5TEST_DLL void TestUsage(void);
+H5TEST_DLL void AddTest(const char *TheName, void (*TheCall) (void),
+ void (*Cleanup) (void), const char *TheDescr);
+H5TEST_DLL void TestInfo(const char *ProgName);
+H5TEST_DLL void TestParseCmdLine(int argc, char *argv[], int *Summary, int *CleanUp);
+H5TEST_DLL void PerformTests(void);
+H5TEST_DLL void TestSummary(void);
+H5TEST_DLL void TestCleanup(void);
+H5TEST_DLL void TestInit(void);
+H5TEST_DLL int GetTestVerbosity(void);
+H5TEST_DLL int SetTestVerbosity(int newval);
+H5TEST_DLL void ParseTestVerbosity(char *argv);
+H5TEST_DLL int GetTestNumErrs(void);
+H5TEST_DLL int TestErrPrintf(const char *format, ...);
+
#ifdef H5_HAVE_PARALLEL
H5TEST_DLL int h5_set_info_object(void);
H5TEST_DLL void h5_dump_info_object(MPI_Info info);
diff --git a/test/testhdf5.h b/test/testhdf5.h
index 5a560d9..15c9fe1 100644
--- a/test/testhdf5.h
+++ b/test/testhdf5.h
@@ -176,22 +176,6 @@
extern "C" {
#endif
-/* Routines for operating on the list of tests (for the "all in one" tests) */
-H5TEST_DLL void TestUsage(void);
-H5TEST_DLL void AddTest(const char *TheName, void (*TheCall) (void),
- void (*Cleanup) (void), const char *TheDescr);
-H5TEST_DLL void TestInfo(const char *ProgName);
-H5TEST_DLL void TestParseCmdLine(int argc, char *argv[], int *Summary, int *CleanUp);
-H5TEST_DLL void PerformTests(void);
-H5TEST_DLL void TestSummary(void);
-H5TEST_DLL void TestCleanup(void);
-H5TEST_DLL void TestInit(void);
-H5TEST_DLL int GetTestVerbosity(void);
-H5TEST_DLL int SetTestVerbosity(int newval);
-H5TEST_DLL void ParseTestVerbosity(char *argv);
-H5TEST_DLL int GetTestNumErrs(void);
-H5TEST_DLL int TestErrPrintf(const char *format, ...);
-
/* Prototypes for the test routines */
void test_metadata(void);
void test_tbbt(void);