diff options
| author | Larry Knox <lrknox@hdfgroup.org> | 2015-03-28 14:48:12 (GMT) |
|---|---|---|
| committer | Larry Knox <lrknox@hdfgroup.org> | 2015-03-28 14:48:12 (GMT) |
| commit | ed599421c5ef01347368d50b1b7dbed3b323c43f (patch) | |
| tree | 2086a03a84db4e650dd6a4ca35c8548e63bbb8f6 /tools | |
| parent | 2845400b6d74c9ab48ea8d875f3873445aa55d38 (diff) | |
| download | hdf5-ed599421c5ef01347368d50b1b7dbed3b323c43f.zip hdf5-ed599421c5ef01347368d50b1b7dbed3b323c43f.tar.gz hdf5-ed599421c5ef01347368d50b1b7dbed3b323c43f.tar.bz2 | |
[svn-r26641] configure.ac:
Remove VPATH and related search path syntax checking.
Remove check for H5_LONE_COLON and checking for lone colon compiler confusion.
tools/h5dump/testh5dumpxml.sh.in
tools/h5dump/CMakeTestsXML.cmake
Remove test skipping for compilers that were formerly confused by lone colon.
Tested with h5committest.
Diffstat (limited to 'tools')
| -rw-r--r-- | tools/h5dump/CMakeTestsXML.cmake | 8 | ||||
| -rw-r--r-- | tools/h5dump/testh5dumpxml.sh.in | 12 |
2 files changed, 1 insertions, 19 deletions
diff --git a/tools/h5dump/CMakeTestsXML.cmake b/tools/h5dump/CMakeTestsXML.cmake index a939d78..0a667c4 100644 --- a/tools/h5dump/CMakeTestsXML.cmake +++ b/tools/h5dump/CMakeTestsXML.cmake @@ -411,14 +411,6 @@ ADD_XML_H5_TEST (tempty-dtd.h5 0 --use-dtd tempty.h5) ADD_XML_H5_TEST (tempty-dtd-2.h5 0 -u tempty.h5) - # The lone colon here confuses some systems (Cray X1). Skip - # it if configure detects that this is a problem. - set (TESTTYPE "TEST") - if (NOT ${H5_LONE_COLON}) - set (TESTTYPE "SKIP") - endif (NOT ${H5_LONE_COLON}) - ADD_XML_SKIP_H5_TEST (tempty-nons.h5 0 ${TESTTYPE} -X : tempty.h5) - ADD_XML_H5_TEST (tempty-nons-2.h5 0 --xml-ns=: tempty.h5) ## Some of these combinations are syntactically correct but diff --git a/tools/h5dump/testh5dumpxml.sh.in b/tools/h5dump/testh5dumpxml.sh.in index 4dad9cd..1efde85 100644 --- a/tools/h5dump/testh5dumpxml.sh.in +++ b/tools/h5dump/testh5dumpxml.sh.in @@ -21,8 +21,6 @@ TESTNAME=h5dumpxml EXIT_SUCCESS=0 EXIT_FAILURE=1 -H5_LONE_COLON="@H5_LONE_COLON@" - DUMPER=h5dump # The tool name DUMPER_BIN=`pwd`/$DUMPER # The path of the tool binary @@ -356,15 +354,7 @@ TOOLTEST tnamed_dtype_attr.h5.xml --xml tnamed_dtype_attr.h5 TOOLTEST tempty-dtd.h5.xml --xml --use-dtd tempty.h5 TOOLTEST tempty-dtd-2.h5.xml --xml -u tempty.h5 - -# The lone colon here confuses some systems (Cray X1). Skip -# it if configure detects that this is a problem. -if test "X$H5_LONE_COLON" != "Xno"; then - TOOLTEST tempty-nons.h5.xml --xml -X ":" tempty.h5 -else - SKIP tempty-nons.h5.xml --xml -X ":" tempty.h5 -fi - +TOOLTEST tempty-nons.h5.xml --xml -X ":" tempty.h5 TOOLTEST tempty-nons-2.h5.xml --xml --xml-ns=":" tempty.h5 ## Some of these combinations are syntactically correct but |