X-Git-Url: http://erislabs.net/gitweb/?a=blobdiff_plain;f=tests%2Ftest-exclude4.sh;h=f450dbb1077ea79d1c9b7954f70025289b7e5101;hb=bbfcd2f1a92c9bdbb8d7d7d0a8a8c6665c316747;hp=cc0e06421cebd92b8e6b3bd79be042bc790958e3;hpb=f28a2482feb7b5870dea9c7fb895622cdca5bd30;p=gnulib.git
diff --git a/tests/test-exclude4.sh b/tests/test-exclude4.sh
index cc0e06421..f450dbb10 100755
--- a/tests/test-exclude4.sh
+++ b/tests/test-exclude4.sh
@@ -1,6 +1,6 @@
#! /bin/sh
# Test suite for exclude.
-# Copyright (C) 2009 Free Software Foundation, Inc.
+# Copyright (C) 2009-2013 Free Software Foundation, Inc.
# This file is part of the GNUlib Library.
#
# This program is free software: you can redistribute it and/or modify
@@ -16,23 +16,30 @@
# You should have received a copy of the GNU General Public License
# along with this program. If not, see .
-TMP=excltmp.$$
-LIST=flist.$$
-ERR=0
+. "${srcdir=.}/init.sh"; path_prepend_ .
+fail=0
# Test wildcard matching
-cat > $LIST < in < $TMP < expected < out || exit $?
-rm -f $TMP $LIST
-exit $ERR
+# Find out how to remove carriage returns from output. Solaris /usr/ucb/tr
+# does not understand '\r'.
+case $(echo r | tr -d '\r') in '') cr='\015';; *) cr='\r';; esac
+
+# normalize output
+LC_ALL=C tr -d "$cr" < out > k && mv k out
+
+compare expected out || fail=1
+
+Exit $fail