X-Git-Url: http://erislabs.net/gitweb/?a=blobdiff_plain;f=tests%2Ftest-exclude5.sh;h=1dac96b7825a61b35c509f312d8df44e540e8c39;hb=5191b3546cfb6c163228c23f214e325ddf60d46f;hp=32579637c2a59c404ced4146345e360f30b83617;hpb=e500079a186434daeba99a1ea115690715fd56eb;p=gnulib.git diff --git a/tests/test-exclude5.sh b/tests/test-exclude5.sh index 32579637c..1dac96b78 100755 --- a/tests/test-exclude5.sh +++ b/tests/test-exclude5.sh @@ -1,6 +1,6 @@ #! /bin/sh # Test suite for exclude. -# Copyright (C) 2009-2011 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 @@ -17,7 +17,6 @@ # along with this program. If not, see . . "${srcdir=.}/init.sh"; path_prepend_ . - fail=0 # Test FNM_LEADING_DIR @@ -35,16 +34,14 @@ barz: 0 foo/bar: 1 EOT -test-exclude -leading_dir in -- bar bar/qux barz foo/bar > out \ - || exit $? +test-exclude -leading_dir in -- bar bar/qux barz foo/bar > out || exit $? # 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 +LC_ALL=C tr -d "$cr" < out > k && mv k out compare expected out || fail=1