summaryrefslogtreecommitdiffstats
path: root/test
diff options
context:
space:
mode:
authorQuincey Koziol <koziol@hdfgroup.org>2001-04-01 03:25:53 (GMT)
committerQuincey Koziol <koziol@hdfgroup.org>2001-04-01 03:25:53 (GMT)
commite7e8b02c3a1a01aaf61560079504a6d04eb482d3 (patch)
tree4806e78ccd7bfd48d3c853533257eff24c54065c /test
parentb2bfb5ebc0a07a083e2368d7063f49ffb6fc486c (diff)
downloadhdf5-e7e8b02c3a1a01aaf61560079504a6d04eb482d3.zip
hdf5-e7e8b02c3a1a01aaf61560079504a6d04eb482d3.tar.gz
hdf5-e7e8b02c3a1a01aaf61560079504a6d04eb482d3.tar.bz2
[svn-r3745] Purpose:
Code Tweaks Description: "FILE" macro for file names was getting confused with Standard C __FILE__ macro on certain platforms. Solution: Changed "FILE" macro usage to "DATAFILE" Platforms tested: FreeBSD 4.3 (hawkwind)
Diffstat (limited to 'test')
-rw-r--r--test/th5s.c12
-rw-r--r--test/titerate.c14
-rw-r--r--test/ttime.c8
-rw-r--r--test/tvlstr.c6
4 files changed, 20 insertions, 20 deletions
diff --git a/test/th5s.c b/test/th5s.c
index a6052e2..b29de85 100644
--- a/test/th5s.c
+++ b/test/th5s.c
@@ -28,7 +28,7 @@
#include <H5Pprivate.h>
#define TESTFILE "th5s.h5"
-#define FILE "th5s1.h5"
+#define DATAFILE "th5s1.h5"
/* 3-D dataset with fixed dimensions */
#define SPACE1_NAME "Space1"
@@ -213,7 +213,7 @@ test_h5s_scalar_write(void)
MESSAGE(5, ("Testing Scalar Dataspace Manipulation during Writing\n"));
/* Create file */
- fid1 = H5Fcreate(FILE, H5F_ACC_TRUNC, H5P_DEFAULT, H5P_DEFAULT);
+ fid1 = H5Fcreate(DATAFILE, H5F_ACC_TRUNC, H5P_DEFAULT, H5P_DEFAULT);
CHECK(fid1, FAIL, "H5Fcreate");
/* Create scalar dataspace */
@@ -276,7 +276,7 @@ test_h5s_scalar_read(void)
MESSAGE(5, ("Testing Scalar Dataspace Manipulation during Reading\n"));
/* Create file */
- fid1 = H5Fopen(FILE, H5F_ACC_RDWR, H5P_DEFAULT);
+ fid1 = H5Fopen(DATAFILE, H5F_ACC_RDWR, H5P_DEFAULT);
CHECK(fid1, FAIL, "H5Fopen");
/* Create a dataset */
@@ -336,7 +336,7 @@ test_h5s_compound_scalar_write(void)
MESSAGE(5, ("Testing Scalar Dataspace Manipulation for Writing Compound Datatypes\n"));
/* Create file */
- fid1 = H5Fcreate(FILE, H5F_ACC_TRUNC, H5P_DEFAULT, H5P_DEFAULT);
+ fid1 = H5Fcreate(DATAFILE, H5F_ACC_TRUNC, H5P_DEFAULT, H5P_DEFAULT);
CHECK(fid1, FAIL, "H5Fcreate");
/* Create the compound datatype. */
@@ -417,7 +417,7 @@ test_h5s_compound_scalar_read(void)
MESSAGE(5, ("Testing Scalar Dataspace Manipulation for Reading Compound Datatypes\n"));
/* Create file */
- fid1 = H5Fopen(FILE, H5F_ACC_RDWR, H5P_DEFAULT);
+ fid1 = H5Fopen(DATAFILE, H5F_ACC_RDWR, H5P_DEFAULT);
CHECK(fid1, FAIL, "H5Fopen");
/* Create a dataset */
@@ -500,6 +500,6 @@ test_h5s(void)
void
cleanup_h5s(void)
{
- remove(FILE);
+ remove(DATAFILE);
}
diff --git a/test/titerate.c b/test/titerate.c
index b067b88..15a39f8 100644
--- a/test/titerate.c
+++ b/test/titerate.c
@@ -24,7 +24,7 @@
#include <hdf5.h>
-#define FILE "titerate.h5"
+#define DATAFILE "titerate.h5"
/* Number of datasets for group iteration test */
#define NDATASETS 50
@@ -118,7 +118,7 @@ static void test_iter_group(void)
MESSAGE(5, ("Testing Group Iteration Functionality\n"));
/* Create the test file with the datasets */
- file = H5Fcreate(FILE, H5F_ACC_TRUNC, H5P_DEFAULT, H5P_DEFAULT);
+ file = H5Fcreate(DATAFILE, H5F_ACC_TRUNC, H5P_DEFAULT, H5P_DEFAULT);
CHECK(file, FAIL, "H5Fcreate");
datatype = H5Tcopy(H5T_NATIVE_INT);
@@ -154,7 +154,7 @@ static void test_iter_group(void)
qsort(dnames,NDATASETS,sizeof(char *),iter_strcmp);
/* Iterate through the datasets in the root group in various ways */
- file=H5Fopen(FILE, H5F_ACC_RDONLY, H5P_DEFAULT);
+ file=H5Fopen(DATAFILE, H5F_ACC_RDONLY, H5P_DEFAULT);
CHECK(file, FAIL, "H5Fopen");
/* Test all objects in group, when callback always returns 0 */
@@ -262,7 +262,7 @@ static void test_iter_attr(void)
MESSAGE(5, ("Testing Attribute Iteration Functionality\n"));
/* Create the test file with the datasets */
- file = H5Fcreate(FILE, H5F_ACC_TRUNC, H5P_DEFAULT, H5P_DEFAULT);
+ file = H5Fcreate(DATAFILE, H5F_ACC_TRUNC, H5P_DEFAULT, H5P_DEFAULT);
CHECK(file, FAIL, "H5Fcreate");
datatype = H5Tcopy(H5T_NATIVE_INT);
@@ -301,7 +301,7 @@ static void test_iter_attr(void)
CHECK(ret, FAIL, "H5Fclose");
/* Iterate through the attributes on the dataset in various ways */
- file=H5Fopen(FILE, H5F_ACC_RDONLY, H5P_DEFAULT);
+ file=H5Fopen(DATAFILE, H5F_ACC_RDONLY, H5P_DEFAULT);
CHECK(file, FAIL, "H5Fopen");
dataset=H5Dopen(file, "Dataset");
@@ -438,7 +438,7 @@ static void test_iter_group_large(void)
MESSAGE(5, ("Testing Large Group Iteration Functionality\n"));
/* Create file */
- file = H5Fcreate(FILE, H5F_ACC_TRUNC, H5P_DEFAULT, H5P_DEFAULT);
+ file = H5Fcreate(DATAFILE, H5F_ACC_TRUNC, H5P_DEFAULT, H5P_DEFAULT);
CHECK(file, FAIL, "H5Fcreate");
/* Create dataspace for datasets */
@@ -555,6 +555,6 @@ test_iterate(void)
void
cleanup_iterate(void)
{
- remove(FILE);
+ remove(DATAFILE);
}
diff --git a/test/ttime.c b/test/ttime.c
index 8ce2cc9..94b82db 100644
--- a/test/ttime.c
+++ b/test/ttime.c
@@ -24,7 +24,7 @@
#include <hdf5.h>
-#define FILE "ttime.h5"
+#define DATAFILE "ttime.h5"
/****************************************************************
**
@@ -41,7 +41,7 @@ test_time(void)
MESSAGE(5, ("Testing Time Datatypes\n"));
/* Create a new file using default properties. */
- file_id = H5Fcreate(FILE, H5F_ACC_TRUNC, H5P_DEFAULT, H5P_DEFAULT);
+ file_id = H5Fcreate(DATAFILE, H5F_ACC_TRUNC, H5P_DEFAULT, H5P_DEFAULT);
CHECK(file_id, FAIL, "H5Fcreate");
tid = H5Tcopy (H5T_UNIX_D32LE);
@@ -76,7 +76,7 @@ test_time(void)
status = H5Fclose(file_id);
CHECK(status, FAIL, "H5Fclose");
- file_id = H5Fopen(FILE, H5F_ACC_RDWR, H5P_DEFAULT);
+ file_id = H5Fopen(DATAFILE, H5F_ACC_RDWR, H5P_DEFAULT);
CHECK(file_id, FAIL, "H5Fopen");
tid = H5Topen(file_id, "Committed D32LE type");
@@ -146,6 +146,6 @@ test_time(void)
void
cleanup_time(void)
{
- remove(FILE);
+ remove(DATAFILE);
}
diff --git a/test/tvlstr.c b/test/tvlstr.c
index bab4365..6e9afd8 100644
--- a/test/tvlstr.c
+++ b/test/tvlstr.c
@@ -28,7 +28,7 @@
#include <hdf5.h>
-#define FILE "tvlstr.h5"
+#define DATAFILE "tvlstr.h5"
/* 1-D dataset with fixed dimensions */
#define SPACE1_NAME "Space1"
@@ -131,7 +131,7 @@ test_vlstrings_basic(void)
MESSAGE(5, ("Testing Basic VL String Functionality\n"));
/* Create file */
- fid1 = H5Fcreate(FILE, H5F_ACC_TRUNC, H5P_DEFAULT, H5P_DEFAULT);
+ fid1 = H5Fcreate(DATAFILE, H5F_ACC_TRUNC, H5P_DEFAULT, H5P_DEFAULT);
CHECK(fid1, FAIL, "H5Fcreate");
/* Create dataspace for datasets */
@@ -254,6 +254,6 @@ test_vlstrings(void)
void
cleanup_vlstrings(void)
{
- remove(FILE);
+ remove(DATAFILE);
}