summaryrefslogtreecommitdiffstats
path: root/test
diff options
context:
space:
mode:
authorJames Laird <jlaird@hdfgroup.org>2006-04-21 19:21:24 (GMT)
committerJames Laird <jlaird@hdfgroup.org>2006-04-21 19:21:24 (GMT)
commit91e56dc68db9b37fb536bac555e95953ba240ac2 (patch)
tree55140e8a869ac834886f90f94dd805ff4be2fd08 /test
parent5eb6bc4dfebffadaa6de112b66f43e20bad9d0c5 (diff)
downloadhdf5-91e56dc68db9b37fb536bac555e95953ba240ac2.zip
hdf5-91e56dc68db9b37fb536bac555e95953ba240ac2.tar.gz
hdf5-91e56dc68db9b37fb536bac555e95953ba240ac2.tar.bz2
[svn-r12295] Purpose:
Several bug fixes Description: Added config file for Cray X1 (previous file was misnamed) Simplified some code in hyperslab.c test that seemed to have been confusing compiler on Cray X1. Fixed typo in config/commence.am Cleaned up hl/src/Makefile.am Solution: All four fixes should be straightforward. The failure on Cray was very difficult to debug, but involved arithmetic errors. This change seems to fix it. Platforms tested: heping, copper, sol, some Cray X1 (more testing when system comes back up)
Diffstat (limited to 'test')
-rw-r--r--test/Makefile.in6
-rw-r--r--test/hyperslab.c4
2 files changed, 6 insertions, 4 deletions
diff --git a/test/Makefile.in b/test/Makefile.in
index 8643049..a3a651d 100644
--- a/test/Makefile.in
+++ b/test/Makefile.in
@@ -420,9 +420,9 @@ F9XMODEXT = @F9XMODEXT@
F9XMODFLAG = @F9XMODFLAG@
F9XSUFFIXFLAG = @F9XSUFFIXFLAG@
FC = @FC@
-FCFLAGS = @FCFLAGS@
+FCFLAGS = @FCFLAGS@ @H5_FCFLAGS@
FCLIBS = @FCLIBS@
-FFLAGS = @FFLAGS@ @H5_FFLAGS@
+FFLAGS = @FFLAGS@
FILTERS = @FILTERS@
FORTRAN_SHARED_CONDITIONAL_FALSE = @FORTRAN_SHARED_CONDITIONAL_FALSE@
FORTRAN_SHARED_CONDITIONAL_TRUE = @FORTRAN_SHARED_CONDITIONAL_TRUE@
@@ -430,7 +430,7 @@ FSEARCH_DIRS = @FSEARCH_DIRS@
H5_CFLAGS = @H5_CFLAGS@
H5_CPPFLAGS = @H5_CPPFLAGS@
H5_CXXFLAGS = @H5_CXXFLAGS@
-H5_FFLAGS = @H5_FFLAGS@
+H5_FCFLAGS = @H5_FCFLAGS@
H5_VERSION = @H5_VERSION@
HADDR_T = @HADDR_T@
HDF5_INTERFACES = @HDF5_INTERFACES@
diff --git a/test/hyperslab.c b/test/hyperslab.c
index b954ace..cd85c3d 100644
--- a/test/hyperslab.c
+++ b/test/hyperslab.c
@@ -62,7 +62,9 @@ init_full(uint8_t *array, size_t nx, size_t ny, size_t nz)
for (j=0; j<ny; j++) {
for (k=0; k<nz; k++) {
total += acc;
- *array++ = acc++;
+ *array = acc;
+ acc++;
+ array++;
}
}
}