summaryrefslogtreecommitdiffstats
path: root/testpar
diff options
context:
space:
mode:
authorQuincey Koziol <koziol@hdfgroup.org>2008-06-30 13:22:44 (GMT)
committerQuincey Koziol <koziol@hdfgroup.org>2008-06-30 13:22:44 (GMT)
commit9e9f96879d760850794a191988a205fbf1a3957d (patch)
treebc7afacf87ac7f5d4d4e71923ea44a6cefef14b8 /testpar
parent5b7788f3ececa7efa6b91c4d0806e672ed724d14 (diff)
downloadhdf5-9e9f96879d760850794a191988a205fbf1a3957d.zip
hdf5-9e9f96879d760850794a191988a205fbf1a3957d.tar.gz
hdf5-9e9f96879d760850794a191988a205fbf1a3957d.tar.bz2
[svn-r15295] Description:
Merge revisions 15130:15210 from trunk into metadata journaling branch Tested on: FreeBSD/32 6.2 (duty) in debug mode FreeBSD/64 6.2 (liberty) w/C++ & FORTRAN, in debug mode Linux/32 2.6 (kagiso) w/PGI compilers, w/C++ & FORTRAN, w/threadsafe, in debug mode Linux/64-amd64 2.6 (smirom) w/default API=1.6.x, w/C++ & FORTRAN, in production mode Linux/64-ia64 2.6 (cobalt) w/Intel compilers, w/C++ & FORTRAN, in production mode Solaris/32 2.10 (linew) w/deprecated symbols disabled, w/C++ & FORTRAN, w/szip filter, in production mode Linux/64-ia64 2.4 (tg-login3) w/parallel, w/FORTRAN, in production mode
Diffstat (limited to 'testpar')
-rw-r--r--testpar/t_mdset.c6
-rw-r--r--testpar/testphdf5.c6
2 files changed, 0 insertions, 12 deletions
diff --git a/testpar/t_mdset.c b/testpar/t_mdset.c
index 5b114be..2559d3e 100644
--- a/testpar/t_mdset.c
+++ b/testpar/t_mdset.c
@@ -457,9 +457,7 @@ void big_dataset(void)
/* Check that file of the correct size was created */
file_size=h5_get_file_size(filename);
-#ifndef _WIN32
VRFY((file_size == 2147485696ULL), "File is correct size(~2GB)");
-#endif
/*
* Create >4GB HDF5 file
@@ -488,9 +486,7 @@ void big_dataset(void)
/* Check that file of the correct size was created */
file_size=h5_get_file_size(filename);
-#ifndef _WIN32
VRFY((file_size == 4294969344ULL), "File is correct size(~4GB)");
-#endif
/*
* Create >8GB HDF5 file
@@ -519,9 +515,7 @@ void big_dataset(void)
/* Check that file of the correct size was created */
file_size=h5_get_file_size(filename);
-#ifndef _WIN32
VRFY((file_size == 8589936640ULL), "File is correct size(~8GB)");
-#endif
/* Close fapl */
ret = H5Pclose(fapl);
diff --git a/testpar/testphdf5.c b/testpar/testphdf5.c
index 2f74221..2760a8b 100644
--- a/testpar/testphdf5.c
+++ b/testpar/testphdf5.c
@@ -399,14 +399,8 @@ int main(int argc, char **argv)
"collective group and dataset write", &collngroups_params);
AddTest("ingrpr", independent_group_read, NULL,
"independent group and dataset read", &collngroups_params);
- /* By default, do not run big dataset on _WIN32. */
-#ifdef _WIN32
- AddTest("-bigdset", big_dataset, NULL,
- "big dataset test", PARATESTFILE);
-#else
AddTest("bigdset", big_dataset, NULL,
"big dataset test", PARATESTFILE);
-#endif
AddTest("fill", dataset_fillvalue, NULL,
"dataset fill value", PARATESTFILE);