diff options
| author | Pedro Vicente Nunes <pvn@hdfgroup.org> | 2001-06-07 16:03:02 (GMT) |
|---|---|---|
| committer | Pedro Vicente Nunes <pvn@hdfgroup.org> | 2001-06-07 16:03:02 (GMT) |
| commit | 504bc34f6015d2c4df03b024c95cdbbab71cbd5f (patch) | |
| tree | acb62b5417ce2d5ef9f1209a5a7ac7945eea7e45 /test | |
| parent | 80737b93ef4425801da0f24b592e9b1bb3e3bca9 (diff) | |
| download | hdf5-504bc34f6015d2c4df03b024c95cdbbab71cbd5f.zip hdf5-504bc34f6015d2c4df03b024c95cdbbab71cbd5f.tar.gz hdf5-504bc34f6015d2c4df03b024c95cdbbab71cbd5f.tar.bz2 | |
[svn-r3974] code warrior port
Diffstat (limited to 'test')
| -rw-r--r-- | test/enum.c | 2 | ||||
| -rw-r--r-- | test/flush1.c | 8 | ||||
| -rw-r--r-- | test/iopipe.c | 11 | ||||
| -rw-r--r-- | test/overhead.c | 7 | ||||
| -rw-r--r-- | test/testhdf5.c | 4 |
5 files changed, 28 insertions, 4 deletions
diff --git a/test/enum.c b/test/enum.c index 00677f1..d7e2ce4 100644 --- a/test/enum.c +++ b/test/enum.c @@ -207,7 +207,7 @@ test_tr1(hid_t file) if (H5Tenum_insert(m_type, "WHITE", CPTR(eval, E1_WHITE))<0) goto error; if (H5Tenum_insert(m_type, "BLACK", CPTR(eval, E1_BLACK))<0) goto error; -#ifndef __WATCOMC__ +#if !defined (__WATCOMC__) || !defined(__MWERKS__) assert(sizeof(c_e1)==sizeof(int)); #endif /* __WATCOMCC__ */ if ((f_type = H5Tcreate(H5T_ENUM, sizeof(c_e1)))<0) goto error; diff --git a/test/flush1.c b/test/flush1.c index fa63d52..71c2dfe 100644 --- a/test/flush1.c +++ b/test/flush1.c @@ -13,6 +13,14 @@ */ #include "h5test.h" + +#if defined __MWERKS__ +#include <abort_exit.h> +# define EXIT(a) __exit(a) +#else +# define EXIT(a) _exit(a) +#endif + const char *FILENAME[] = { "flush", NULL diff --git a/test/iopipe.c b/test/iopipe.c index 94d27b9..fda5929 100644 --- a/test/iopipe.c +++ b/test/iopipe.c @@ -41,6 +41,17 @@ #include <Winsock.h> #endif + +#if defined (__MWERKS__) +#ifdef H5_HAVE_SYS_TIMEB +#undef H5_HAVE_SYS_TIMEB +#endif +#ifdef H5_HAVE_SYSTEM +#undef H5_HAVE_SYSTEM +#endif +#endif /* __MWERKS__*/ + + #ifdef H5_HAVE_SYS_TIMEB #include <sys/timeb.h> #endif diff --git a/test/overhead.c b/test/overhead.c index 3e2d5fc..0480a73 100644 --- a/test/overhead.c +++ b/test/overhead.c @@ -207,7 +207,10 @@ test(fill_t fill_style, const double splits[], if ((mspace=H5Screate_simple(1, ch_size, ch_size))<0) goto error; if ((dset=H5Dcreate(file, "chunked", H5T_NATIVE_INT, fspace, dcpl))<0) goto error; + +#if !defined( __MWERKS__) if ((fd=open(FILE_NAME_1, O_RDONLY))<0) goto error; +#endif for (i=1; i<=cur_size[0]; i++) { @@ -242,6 +245,10 @@ test(fill_t fill_style, const double splits[], goto error; } +#if defined( __MWERKS__) + if ((fd=open(FILE_NAME_1, O_RDONLY))<0) goto error; +#endif + /* Determine overhead */ if (verbose) { if (H5Fflush(file, H5F_SCOPE_LOCAL)<0) goto error; diff --git a/test/testhdf5.c b/test/testhdf5.c index 2ab6f51..8c1d4e7 100644 --- a/test/testhdf5.c +++ b/test/testhdf5.c @@ -140,9 +140,7 @@ main(int argc, char *argv[]) int Cache = 1; uintn major, minor, release; -#if defined __MWERKS__ - argc = ccommand(&argv); -#endif + #if !(defined MAC || defined __MWERKS__ || defined SYMANTEC_C) /* Un-buffer the stdout and stderr */ |