Add --enable-hardcoded-path-in-tests configure option

[platform/upstream/glibc.git] / localedata / tst-rpmatch.sh

diff --git a/localedata/tst-rpmatch.sh b/localedata/tst-rpmatch.sh
index 24fd2f9..29fb7b7 100755 (executable)
--- a/localedata/tst-rpmatch.sh
+++ b/localedata/tst-rpmatch.sh
@@ -1,6 +1,6 @@
 #! /bin/sh -f
 #
-# Copyright (C) 1998, 1999 Free Software Foundation, Inc.
+# Copyright (C) 1998-2013 Free Software Foundation, Inc.
 # This file is part of the GNU C Library and contains tests for
 # the rpmatch(3)-implementation.
 # contributed by Jochen Hein <jochen.hein@delphi.central.de>
@@ -16,23 +16,25 @@
 # GNU General Public License for more details.
 #
 # You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+# along with this program; if not, see <http://www.gnu.org/licenses/>.
+
+set -e
 
 common_objpfx=$1
-IFS="&"
+tst_rpmatch=$2
+
 rc=0
-while read locale string result dummy; do
+while IFS=\& read locale string result dummy; do
     if [ "$locale" != "#" ]; then
        LOCPATH=${common_objpfx}localedata \
-       ${common_objpfx}elf/ld.so --library-path $common_objpfx \
-       ${common_objpfx}localedata/tst-rpmatch $locale $string $result \
-       || exit 1
+       GCONV_PATH=${common_objpfx}/iconvdata \
+       ${tst_rpmatch} $locale $string $result < /dev/null \
+       || { echo "$locale $string $result  FAILED"; exit 1; }
     fi
 done <<EOF
 #& These are the tests for rpmatch in glibc.  Each line contains one test,
-#& comments start with #& in the first column.  The fields are seperated
-#& by paragraph signs and contain: the locale, the string, the expected
+#& comments start with #& in the first column.  The fields are separated
+#& by ampersand signs and contain: the locale, the string, the expected
 #& return value of rpmatch(3).  If the test fails, test-rpmatch prints
 #& all these informations
 C&Yes&1
@@ -48,17 +50,11 @@ C&no&0
 #& Uh, that's nonsense
 C&nonsens&0
 C&Error&-1
-de_DE&Yes&1
-de_DE&Ja&1
-de_DE&Jammerschade&1
-de_DE&dejavu&-1
-de_DE&Nein&0
-de_DE&Fehler&-1
-de_DE&jein&1
+de_DE.ISO-8859-1&Yes&1
+de_DE.ISO-8859-1&Ja&1
+de_DE.ISO-8859-1&Jammerschade&1
+de_DE.ISO-8859-1&dejavu&-1
+de_DE.ISO-8859-1&Nein&0
+de_DE.ISO-8859-1&Fehler&-1
+de_DE.ISO-8859-1&jein&1
 EOF
-
-rc=$?
-if [ $rc -eq 1 ]; then
-    echo "Errors"
-fi
-exit $rc