[svn-r16537] Description:

	Merge r16500:16536 from trunk into revise_chunks branch.

Tested on:
       FreeBSD/32 6.3 (duty) in debug mode
       FreeBSD/64 6.3 (liberty) w/C++ & FORTRAN, in debug mode
       Linux/32 2.6 (jam) w/PGI compilers, w/C++ & FORTRAN, w/threadsafe,
                               in debug mode
       Linux/64-amd64 2.6 (smirom) w/Intel compilers w/default API=1.6.x,
                               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.6 (cobalt) w/Intel compilers, w/C++ & FORTRAN,
                               in production mode
       Linux/64-ia64 2.4 (tg-login3) w/parallel, w/FORTRAN, in production mode
       Linux/64-amd64 2.6 (abe) w/parallel, w/FORTRAN, in production mode
       Mac OS X/32 10.5.6 (amazon) in debug mode
       Mac OS X/32 10.5.6 (amazon) w/C++ & FORTRAN, w/threadsafe,
                               in production mode

1 files changed, 0 insertions, 186 deletions

diff --git a/tools/h5ls/testh5ls.sh b/tools/h5ls/testh5ls.sh
deleted file mode 100755
index 8194bfb..0000000
--- a/tools/h5ls/testh5ls.sh
+++ /dev/null
@@ -1,186 +0,0 @@
-#! /bin/sh
-#
-# Copyright by The HDF Group.
-# Copyright by the Board of Trustees of the University of Illinois.
-# All rights reserved.
-#
-# This file is part of HDF5.  The full HDF5 copyright notice, including
-# terms governing use, modification, and redistribution, is contained in
-# the files COPYING and Copyright.html.  COPYING can be found at the root
-# of the source code distribution tree; Copyright.html can be found at the
-# root level of an installed copy of the electronic HDF5 document set and
-# is linked from the top-level documents page.  It can also be found at
-# http://hdfgroup.org/HDF5/doc/Copyright.html.  If you do not have
-# access to either file, you may request a copy from help@hdfgroup.org.
-#
-# Tests for the h5ls tool
-
-H5LS=h5ls               # The tool name
-H5LS_BIN=`pwd`/$H5LS    # The path of the tool binary
-
-CMP='cmp -s'
-DIFF='diff -c'
-NLINES=20			# Max. lines of output to display if test fails
-
-nerrors=0
-verbose=yes
-
-# The build (current) directory might be different than the source directory.
-if test -z "$srcdir"; then
-    srcdir=.
-fi
-test -d ../testfiles || mkdir ../testfiles
-
-# Print a line-line message left justified in a field of 70 characters
-# beginning with the word "Testing".
-TESTING() {
-    SPACES="                                                               "
-    echo "Testing $* $SPACES" |cut -c1-70 |tr -d '\012'
-}
-
-# Run a test and print PASS or *FAIL*. For now, if h5ls can complete
-# with exit status 0, consider it pass. If a test fails then increment
-# the `nerrors' global variable and (if $verbose is set) display up to $NLINS
-# lines of the actual output from the tool test.  The actual output is not
-# removed if $HDF5_NOCLEANUP has a non-zero value.
-# Arguemnts:
-# $1 -- actual output filename to use
-# $2 and on -- argument for the h5ls tool
-TOOLTEST() {
-    expect="$srcdir/../testfiles/$1"
-    actual="../testfiles/`basename $1 .ls`.out"
-    actual_err="../testfiles/`basename $1 .ls`.err"
-    shift
-    retvalexpect=$1
-    shift
-
-    # Run test.
-    # Stderr is included in stdout so that the diff can detect
-    # any unexpected output from that stream too.
-    TESTING $H5LS $@
-    (
-	echo "#############################"
-	echo " output for '$H5LS $@'" 
-	echo "#############################"
-	cd $srcdir/../testfiles
-        $RUNSERIAL $H5LS_BIN "$@"
-    ) >$actual 2>$actual_err 
-    
-    exitcode=$?
-    cat $actual_err >> $actual
-    if [ $exitcode -ne $retvalexpect ]; then
-	echo "*FAILED*"
-	nerrors="`expr $nerrors + 1`"
-	if [ yes = "$verbose" ]; then
-	    echo "test returned with exit code $exitcode"
-	    echo "test output: (up to $NLINES lines)"
-	    head -$NLINES $actual
-	    echo "***end of test output***"
-	    echo ""
-	fi
-    elif [ ! -f $expect ]; then
-	# Create the expect file if it doesn't yet exist.
-        echo " CREATED"
-        cp $actual $expect
-    elif $CMP $expect $actual; then
-        echo " PASSED"
-    else
-        echo "*FAILED*"
-	echo "    Expected result differs from actual result"
-	nerrors="`expr $nerrors + 1`"
-	test yes = "$verbose" && $DIFF $expect $actual |sed 's/^/    /'
-    fi
-
-    # Clean up output file
-    if test -z "$HDF5_NOCLEANUP"; then
-	rm -f $actual $actual_err
-    fi
-}
-
-##############################################################################
-##############################################################################
-###			  T H E   T E S T S                                ###
-##############################################################################
-##############################################################################
-
-# Toss in a bunch of tests.  Not sure if they are the right kinds.
-# test the help syntax
-TOOLTEST help-1.ls 0 -w80 -h
-TOOLTEST help-2.ls 0 -w80 -help
-TOOLTEST help-3.ls 0 -w80 -?
-
-# test simple command
-TOOLTEST tall-1.ls 0 -w80 tall.h5
-TOOLTEST tall-2.ls 0 -w80 -r -d tall.h5
-TOOLTEST tgroup.ls 0 -w80 tgroup.h5
-TOOLTEST tgroup-3.ls 0 -w80 tgroup.h5/g1
-
-# test for displaying groups
-# The following combination of arguments is expected to return an error message
-# and return value 1
-TOOLTEST tgroup-1.ls 1 -w80 -r -g tgroup.h5
-TOOLTEST tgroup-2.ls 0 -w80 -g tgroup.h5/g1
-
-# test for displaying simple space datasets
-TOOLTEST tdset-1.ls 0 -w80 -r -d tdset.h5
-
-# test for displaying soft links
-TOOLTEST tslink-1.ls 0 -w80 -r tslink.h5
-
-# test for displaying external and user-defined links
-TOOLTEST textlink-1.ls 0 -w80 -r textlink.h5
-TOOLTEST textlinksrc-1.ls 0 -w80 -Er textlinksrc.h5
-TOOLTEST textlinksrc-2.ls 0 -w80 -Erv textlinksrc.h5/ext_link5
-TOOLTEST textlinksrc-3.ls 0 -w80 -Er textlinksrc.h5/ext_link1
-TOOLTEST textlinksrc-4.ls 0 -w80 -r textlinksrc.h5
-TOOLTEST textlinksrc-5.ls 0 -w80 -r textlinksrc.h5/ext_link1
-TOOLTEST textlinksrc-6.ls 0 -w80 -E textlinksrc.h5
-TOOLTEST textlinksrc-7.ls 0 -w80 -E textlinksrc.h5/ext_link1
-TOOLTEST tudlink-1.ls 0 -w80 -r tudlink.h5
-
-# tests for hard links
-TOOLTEST thlink-1.ls 0 -w80 thlink.h5
-
-# tests for compound data types
-TOOLTEST tcomp-1.ls 0 -w80 -r -d tcompound.h5
-
-#test for the nested compound type
-TOOLTEST tnestcomp-1.ls 0 -w80 -r -d tnestedcomp.h5
-
-# test for loop detection
-TOOLTEST tloop-1.ls 0 -w80 -r -d tloop.h5
-
-# test for string 
-TOOLTEST tstr-1.ls 0 -w80 -r -d tstr.h5
-
-# test test file created from lib SAF team
-TOOLTEST tsaf.ls 0 -w80 -r -d tsaf.h5
-
-# test for variable length data types
-TOOLTEST tvldtypes1.ls 0 -w80 -r -d tvldtypes1.h5
-
-# test for array data types
-TOOLTEST tarray1.ls 0 -w80 -r -d tarray1.h5
-
-# test for empty data
-TOOLTEST tempty.ls 0 -w80 -d tempty.h5
-
-# test for all dataset types written to attributes
-# enable -S for avoiding printing NATIVE types
-TOOLTEST tattr2.ls 0 -w80 -v -S tattr2.h5
-
-# tests for error handling.
-# test for non-existing file
-TOOLTEST nosuchfile.ls 0 nosuchfile.h5
-
-# test for variable length data types in verbose mode 
-TOOLTEST tvldtypes2.ls 0 -v tvldtypes1.h5
-
-# test for dataset region references data types in verbose mode 
-TOOLTEST tdatareg.ls 0 -v tdatareg.h5
-
-if test $nerrors -eq 0 ; then
-	echo "All h5ls tests passed."
-fi
-
-exit $nerrors