summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--test/dsets.c8
-rw-r--r--test/dtypes.c3
-rw-r--r--test/hyperslab.c3
-rw-r--r--test/istore.c3
-rw-r--r--test/testhdf5.h9
5 files changed, 21 insertions, 5 deletions
diff --git a/test/dsets.c b/test/dsets.c
index 51a023c..f6d4df8 100644
--- a/test/dsets.c
+++ b/test/dsets.c
@@ -13,6 +13,9 @@
#include <stdio.h>
#include <unistd.h>
+#ifndef HAVE_FUNCTION
+#define __FUNCTION__ ""
+#endif
#define AT() printf (" at %s:%d in %s()...\n", \
__FILE__, __LINE__, __FUNCTION__);
@@ -41,7 +44,7 @@ static herr_t
test_create (hid_t file)
{
hid_t dataset, space, create_parms;
- intn dims[2];
+ size_t dims[2];
herr_t status;
size_t csize[2];
@@ -206,7 +209,8 @@ test_simple_io (hid_t file)
hid_t dataset, space;
herr_t status;
int points[100][200], check[100][200];
- int i, j, n, dims[2];
+ int i, j, n;
+ size_t dims[2];
printf ("%-70s", "Testing simple I/O");
diff --git a/test/dtypes.c b/test/dtypes.c
index b4e865f..6ff118f 100644
--- a/test/dtypes.c
+++ b/test/dtypes.c
@@ -12,6 +12,9 @@
#include <unistd.h>
+#ifndef HAVE_FUNCTION
+#define __FUNCTION__ ""
+#endif
#define AT() printf (" at %s:%d in %s()...\n", \
__FILE__, __LINE__, __FUNCTION__);
diff --git a/test/hyperslab.c b/test/hyperslab.c
index f985608..64c731e 100644
--- a/test/hyperslab.c
+++ b/test/hyperslab.c
@@ -15,6 +15,9 @@
#include <H5MMprivate.h>
#include <H5Vprivate.h>
+#ifndef HAVE_FUNCTION
+#define __FUNCTION__ ""
+#endif
#define AT() printf (" at %s:%d in %s()\n",__FILE__,__LINE__,__FUNCTION__);
#define TEST_SMALL 0x0001
diff --git a/test/istore.c b/test/istore.c
index 20b1179..cf331ef 100644
--- a/test/istore.c
+++ b/test/istore.c
@@ -30,6 +30,9 @@
#define TEST_MEDIUM 0x0002
#define TEST_LARGE 0x0004
+#ifndef HAVE_FUNCTION
+#define __FUNCTION__ ""
+#endif
#define AT() printf (" at %s:%d in %s()...\n", \
__FILE__, __LINE__, __FUNCTION__);
diff --git a/test/testhdf5.h b/test/testhdf5.h
index 50ceb33..27b9e19 100644
--- a/test/testhdf5.h
+++ b/test/testhdf5.h
@@ -24,6 +24,7 @@
* so we include the private headers here.
*/
#include <H5private.h>
+#include <H5Eprivate.h>
extern int num_errs;
extern int Verbosity;
@@ -32,7 +33,7 @@ extern int Verbosity;
/* Used to make certain a return value _is_not_ a value */
#define CHECK(ret, val, where) \
do {if (Verbosity>9) print_func(" Call to routine: %15s at line %4d in %s returned %ld \n",where,(int)__LINE__,__FILE__,(long)ret);\
-if(ret == val) {print_func("*** UNEXPECTED RETURN from %s is %ld at line %4d in %s\n", where, (long)ret, (int)__LINE__,__FILE__); num_errs++;} \
+if(ret == val) {print_func("*** UNEXPECTED RETURN from %s is %ld at line %4d in %s\n", where, (long)ret, (int)__LINE__,__FILE__); num_errs++;H5Eprint (H5E_thrdid_g, stdout);} \
} while(0)
#define CHECK_I(ret,where) { \
@@ -43,6 +44,7 @@ if(ret == val) {print_func("*** UNEXPECTED RETURN from %s is %ld at line %4d in
if ((ret)<0) { \
print_func ("*** UNEXPECTED RETURN from %s is %ld line %4d in %s\n", \
(where), (long)(ret), (int)__LINE__, __FILE__); \
+ H5Eprint (H5E_thrdid_g, stdout); \
num_errs++; \
} \
}
@@ -55,6 +57,7 @@ if(ret == val) {print_func("*** UNEXPECTED RETURN from %s is %ld at line %4d in
if (!(ret)) { \
print_func ("*** UNEXPECTED RETURN from %s is NULL line %4d in %s\n", \
(where), (int)__LINE__, __FILE__); \
+ H5Eprint (H5E_thrdid_g, stdout); \
num_errs++; \
} \
}
@@ -62,7 +65,7 @@ if(ret == val) {print_func("*** UNEXPECTED RETURN from %s is %ld at line %4d in
/* Used to make certain a return value _is_ a value */
#define VERIFY(x, val, where) \
do {if (Verbosity>9) print_func(" Call to routine: %15s at line %4d in %s had value %ld \n",where,(int)__LINE__,__FILE__,(long)x);\
-if(x != val) {print_func("*** UNEXPECTED VALUE from %s is %ld at line %4d in %s\n", where, (long)x,(int)__LINE__,__FILE__); num_errs++;} \
+if(x != val) {print_func("*** UNEXPECTED VALUE from %s is %ld at line %4d in %s\n", where, (long)x,(int)__LINE__,__FILE__); H5Eprint (H5E_thrdid_g, stdout); num_errs++;} \
} while(0)
/* Used to document process through a test and to check for errors */
@@ -70,7 +73,7 @@ if(x != val) {print_func("*** UNEXPECTED VALUE from %s is %ld at line %4d in %s\
do { \
if (Verbosity>8) print_func(" Call to routine: %15s at line %4d in %s returned %ld \n",func,(int)__LINE__,__FILE__,(long)ret); \
if (Verbosity>9) HEprint(stdout,0); \
-if(ret == FAIL) {print_func("*** UNEXPECTED RETURN from %s is %ld at line %4d in %s\n", func, (long)ret,(int)__LINE__,__FILE__); num_errs++;} \
+if(ret == FAIL) {print_func("*** UNEXPECTED RETURN from %s is %ld at line %4d in %s\n", func, (long)ret,(int)__LINE__,__FILE__); H5Eprint (H5E_thrdid_g, stdout); num_errs++;} \
} while(0)
/* Used to document process through a test */