- Fixed for sort-mb-tests (avoid +n syntax).

This commit is contained in:
Tim Waugh 2005-10-28 15:03:19 +00:00
parent 0158c2b09b
commit b43cfa4724
2 changed files with 5 additions and 4 deletions

View File

@ -3082,7 +3082,7 @@
+locale -k LC_CTYPE 2>&1 | grep -q charmap.*UTF-8 || exit 77 +locale -k LC_CTYPE 2>&1 | grep -q charmap.*UTF-8 || exit 77
+errors=0 +errors=0
+ +
+$xx -t +1 -n mb1.I > mb1.O +$xx -t -k2 -n mb1.I > mb1.O
+code=$? +code=$?
+if test $code != 0; then +if test $code != 0; then
+ $echo "Test mb1 failed: $xx return code $code differs from expected value 0" 1>&2 + $echo "Test mb1 failed: $xx return code $code differs from expected value 0" 1>&2
@ -3100,7 +3100,7 @@
+ esac + esac
+fi +fi
+ +
+$xx -t +3 -n mb2.I > mb2.O +$xx -t -k4 -n mb2.I > mb2.O
+code=$? +code=$?
+if test $code != 0; then +if test $code != 0; then
+ $echo "Test mb2 failed: $xx return code $code differs from expected value 0" 1>&2 + $echo "Test mb2 failed: $xx return code $code differs from expected value 0" 1>&2
@ -3171,7 +3171,7 @@
editpl = sed -e 's,@''PERL''@,$(PERL),g' -e 's,@''srcdir''@,$(srcdir),g' editpl = sed -e 's,@''PERL''@,$(PERL),g' -e 's,@''srcdir''@,$(srcdir),g'
-TESTS = $x-tests -TESTS = $x-tests
+TESTS = $x-tests # $x-mb-tests +TESTS = $x-tests $x-mb-tests
mk_script = $(srcdir)/../mk-script mk_script = $(srcdir)/../mk-script
$(srcdir)/$x-tests: $(mk_script) Test.pm Makefile.am $(srcdir)/$x-tests: $(mk_script) Test.pm Makefile.am
@ -3192,7 +3192,7 @@
editpl = sed -e 's,@''PERL''@,$(PERL),g' -e 's,@''srcdir''@,$(srcdir),g' editpl = sed -e 's,@''PERL''@,$(PERL),g' -e 's,@''srcdir''@,$(srcdir),g'
-TESTS = $x-tests -TESTS = $x-tests
+TESTS = $x-tests # $x-mb-tests +TESTS = $x-tests $x-mb-tests
mk_script = $(srcdir)/../mk-script mk_script = $(srcdir)/../mk-script
MAINTAINERCLEANFILES = $x-tests $(maint_gen) MAINTAINERCLEANFILES = $x-tests $(maint_gen)
CLEANFILES = $(run_gen) CLEANFILES = $(run_gen)

View File

@ -265,6 +265,7 @@ fi
%changelog %changelog
* Fri Oct 28 2005 Tim Waugh <twaugh@redhat.com> * Fri Oct 28 2005 Tim Waugh <twaugh@redhat.com>
- Fixed for sort-mb-tests (avoid +n syntax).
- Start porting i18n patch to sort.c. - Start porting i18n patch to sort.c.
* Fri Oct 28 2005 Tim Waugh <twaugh@redhat.com> 5.92-0.2 * Fri Oct 28 2005 Tim Waugh <twaugh@redhat.com> 5.92-0.2