summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAllen Byrne <byrn@hdfgroup.org>2017-10-10 14:01:31 (GMT)
committerAllen Byrne <byrn@hdfgroup.org>2017-10-10 14:01:31 (GMT)
commitdf853afe50787ad619137a33e0bc9361187de6f5 (patch)
tree5927630c469c2868542e9fe241ff749cfd5a1814
parentc577a5e995bf339f4760e3b8fa30763e6aa4e4ae (diff)
parent59a4ffac402cc4d96ec43b0027f9ac30ad7b0527 (diff)
downloadhdf5-df853afe50787ad619137a33e0bc9361187de6f5.zip
hdf5-df853afe50787ad619137a33e0bc9361187de6f5.tar.gz
hdf5-df853afe50787ad619137a33e0bc9361187de6f5.tar.bz2
Merging in latest from upstream (HDFFV/hdf5:refs/heads/develop)
* commit '59a4ffac402cc4d96ec43b0027f9ac30ad7b0527': removed always true ifdef
-rw-r--r--testpar/t_shapesame.c2
1 files changed, 0 insertions, 2 deletions
diff --git a/testpar/t_shapesame.c b/testpar/t_shapesame.c
index d81d2be..0375710 100644
--- a/testpar/t_shapesame.c
+++ b/testpar/t_shapesame.c
@@ -5074,7 +5074,6 @@ int main(int argc, char **argv)
TestInit(argv[0], usage, parse_options);
/* Shape Same tests using contigous hyperslab */
-#if 1
AddTest("sscontig1", sscontig1, NULL,
"Cntg hslab, ind IO, cntg dsets", PARATESTFILE);
AddTest("sscontig2", sscontig2, NULL,
@@ -5083,7 +5082,6 @@ int main(int argc, char **argv)
"Cntg hslab, ind IO, chnk dsets", PARATESTFILE);
AddTest("sscontig4", sscontig4, NULL,
"Cntg hslab, col IO, chnk dsets", PARATESTFILE);
-#endif
/* Shape Same tests using checker board hyperslab */
AddTest("sschecker1", sschecker1, NULL,