From 5525aa52c9191ff621ff4526167d554af902dc68 Mon Sep 17 00:00:00 2001 From: Matthias Clasen Date: Wed, 5 Apr 2006 05:31:11 +0000 Subject: [PATCH] Fix up shell script --- ChangeLog | 2 ++ ChangeLog.pre-2-12 | 2 ++ tests/run-collate-tests.sh | 9 +++------ 3 files changed, 7 insertions(+), 6 deletions(-) diff --git a/ChangeLog b/ChangeLog index 2284a5a..1a581cf 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,7 @@ 2006-04-05 Matthias Clasen + * tests/run-collate-tests.sh: Fix up shell script. + * tests/option-test.c (arg_test5): Skip the test if setting the locale fails. (empty_test1): Reset prgname before the test. diff --git a/ChangeLog.pre-2-12 b/ChangeLog.pre-2-12 index 2284a5a..1a581cf 100644 --- a/ChangeLog.pre-2-12 +++ b/ChangeLog.pre-2-12 @@ -1,5 +1,7 @@ 2006-04-05 Matthias Clasen + * tests/run-collate-tests.sh: Fix up shell script. + * tests/option-test.c (arg_test5): Skip the test if setting the locale fails. (empty_test1): Reset prgname before the test. diff --git a/tests/run-collate-tests.sh b/tests/run-collate-tests.sh index 73e4ea3..b27f7d6 100755 --- a/tests/run-collate-tests.sh +++ b/tests/run-collate-tests.sh @@ -25,17 +25,14 @@ for I in ${srcdir:-.}/collate/*.in; do echo_v "Sorting $I" name=`basename $I .in` ./unicode-collate $I > collate.out - if ! diff collate.out ${srcdir:-.}/collate/$name.unicode; then + diff collate.out ${srcdir:-.}/collate/$name.unicode || fail "unexpected error when using g_utf8_collate() on $I" - fi ./unicode-collate --key $I > collate.out - if ! diff collate.out ${srcdir:-.}/collate/$name.unicode; then + diff collate.out ${srcdir:-.}/collate/$name.unicode || fail "unexpected error when using g_utf8_collate_key() on $I" - fi ./unicode-collate --file $I > collate.out - if ! diff collate.out ${srcdir:-.}/collate/$name.file; then + diff collate.out ${srcdir:-.}/collate/$name.file || fail "unexpected error when using g_utf8_collate_key_for_filename() on $I" - fi done echo_v "All tests passed." -- 2.7.4