3 files changed, 26 insertions, 5 deletions
diff --git a/tools/h5dump/Makefile.am b/tools/h5dump/Makefile.am
index ab4f73d..3f6a081 100644
--- a/tools/h5dump/Makefile.am
+++ b/tools/h5dump/Makefile.am
@@ -24,7 +24,7 @@ INCLUDES+=-I$(top_srcdir)/src -I$(top_srcdir)/tools/lib
 
 # Test programs and scripts
 TEST_PROG=h5dumpgentest
-TEST_SCRIPT=testh5dump.sh $(srcdir)/testh5dumpxml.sh
+TEST_SCRIPT=testh5dump.sh testh5dumpxml.sh
 
 check_PROGRAMS=$(TEST_PROG)
 check_SCRIPTS=$(TEST_SCRIPT)
diff --git a/tools/h5dump/Makefile.in b/tools/h5dump/Makefile.in
index 324056d..4ced9c0 100644
--- a/tools/h5dump/Makefile.in
+++ b/tools/h5dump/Makefile.in
@@ -55,7 +55,8 @@ POST_UNINSTALL = :
 build_triplet = @build@
 host_triplet = @host@
 DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \
-	$(srcdir)/testh5dump.sh.in $(top_srcdir)/config/commence.am \
+	$(srcdir)/testh5dump.sh.in $(srcdir)/testh5dumpxml.sh.in \
+	$(top_srcdir)/config/commence.am \
 	$(top_srcdir)/config/conclude.am
 check_PROGRAMS = $(am__EXEEXT_1)
 bin_PROGRAMS = h5dump$(EXEEXT)
@@ -66,7 +67,7 @@ am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
 	$(ACLOCAL_M4)
 mkinstalldirs = $(SHELL) $(top_srcdir)/bin/mkinstalldirs
 CONFIG_HEADER = $(top_builddir)/src/H5config.h
-CONFIG_CLEAN_FILES = testh5dump.sh
+CONFIG_CLEAN_FILES = testh5dump.sh testh5dumpxml.sh
 am__installdirs = "$(DESTDIR)$(bindir)"
 binPROGRAMS_INSTALL = $(INSTALL_PROGRAM)
 am__EXEEXT_1 = h5dumpgentest$(EXEEXT)
@@ -174,6 +175,7 @@ H5_CFLAGS = @H5_CFLAGS@
 H5_CPPFLAGS = @H5_CPPFLAGS@
 H5_CXXFLAGS = @H5_CXXFLAGS@
 H5_FCFLAGS = @H5_FCFLAGS@
+H5_LONE_COLON = @H5_LONE_COLON@
 H5_VERSION = @H5_VERSION@
 HADDR_T = @HADDR_T@
 HDF5_INTERFACES = @HDF5_INTERFACES@
@@ -346,7 +348,7 @@ CHECK_CLEANFILES = *.chkexe *.chklog *.clog *.h5
 
 # Test programs and scripts
 TEST_PROG = h5dumpgentest
-TEST_SCRIPT = testh5dump.sh $(srcdir)/testh5dumpxml.sh
+TEST_SCRIPT = testh5dump.sh testh5dumpxml.sh
 check_SCRIPTS = $(TEST_SCRIPT)
 SCRIPT_DEPEND = h5dump$(EXEEXT)
 
@@ -405,6 +407,8 @@ $(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
 testh5dump.sh: $(top_builddir)/config.status $(srcdir)/testh5dump.sh.in
 	cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@
+testh5dumpxml.sh: $(top_builddir)/config.status $(srcdir)/testh5dumpxml.sh.in
+	cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@
 install-binPROGRAMS: $(bin_PROGRAMS)
 	@$(NORMAL_INSTALL)
 	test -z "$(bindir)" || $(mkdir_p) "$(DESTDIR)$(bindir)"
diff --git a/tools/h5dump/testh5dumpxml.sh b/tools/h5dump/testh5dumpxml.sh.in
index c2fa23f..21db71a 100755
--- a/tools/h5dump/testh5dumpxml.sh
+++ b/tools/h5dump/testh5dumpxml.sh.in
@@ -14,6 +14,8 @@
 #
 # Tests for the h5dump tool
 
+H5_LONE_COLON="@H5_LONE_COLON@"
+
 DUMPER=h5dump               # The tool name
 DUMPER_BIN=`pwd`/$DUMPER    # The path of the tool binary
 
@@ -83,6 +85,13 @@ TOOLTEST() {
    fi
 }
 
+# Print a "SKIP" message    
+SKIP() {
+         TESTING $DUMPER $@
+          echo  " -SKIP-"
+}
+
+
 ##############################################################################
 ##############################################################################
 ###			  T H E   T E S T S                                ###
@@ -145,7 +154,15 @@ 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
-TOOLTEST tempty-nons.h5.xml --xml -X ":" 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-2.h5.xml --xml --xml-ns=":" tempty.h5
 
 ## Some of these combinations are syntactically correct but