testsuite: better fix for changed Perl 5.18 ordering
Version: 1.14-2 Related: #976973
This commit is contained in:
parent
41ad053b1c
commit
28c517d647
|
@ -1,16 +0,0 @@
|
|||
diff --git a/t/primary-prefix-invalid-couples.tap b/t/primary-prefix-invalid-couples.tap
|
||||
index 64f11f8..09b332a 100644
|
||||
--- a/t/primary-prefix-invalid-couples.tap
|
||||
+++ b/t/primary-prefix-invalid-couples.tap
|
||||
@@ -186,8 +186,10 @@ grep -v 'dir.* not a legitimate directory' stderr && exit 1
|
||||
# Check that the same failures are present without the '--add-missing'
|
||||
# option.
|
||||
mv stderr stderr.old
|
||||
+cat stderr.old | sort > a
|
||||
AUTOMAKE_fails -d "automake error out on mismatched prefix/primary couples"
|
||||
+cat stderr | sort > b
|
||||
command_ok_ "... and with the same diagnostic of 'automake -a'" \
|
||||
- diff stderr.old stderr
|
||||
+ diff a b
|
||||
|
||||
:
|
|
@ -0,0 +1,38 @@
|
|||
diff --git a/t/preproc-errmsg.sh b/t/preproc-errmsg.sh
|
||||
index 704562d..891ae43 100644
|
||||
--- a/t/preproc-errmsg.sh
|
||||
+++ b/t/preproc-errmsg.sh
|
||||
@@ -48,7 +48,7 @@ END
|
||||
$ACLOCAL
|
||||
AUTOMAKE_fails
|
||||
|
||||
-cat > expected << 'END'
|
||||
+sort > expected << 'END'
|
||||
sub/sub2/more.mk:1: sub_sub2_UNDEFINED must be set with '=' before using '+='
|
||||
Makefile.am:2: 'sub/local.mk' included from here
|
||||
sub/local.mk:2: 'sub/sub2/more.mk' included from here
|
||||
@@ -71,7 +71,7 @@ END
|
||||
sed -e '/warnings are treated as errors/d' stderr > t1
|
||||
sed -e 's/: warning:/:/' t1 > t2
|
||||
sed -e 's/: error:/:/' t2 > t3
|
||||
-sed -e 's/ */ /g' t3 > obtained
|
||||
+sed -e 's/ */ /g' t3 | sort > obtained
|
||||
|
||||
diff expected obtained
|
||||
|
||||
diff --git a/t/primary-prefix-invalid-couples.tap b/t/primary-prefix-invalid-couples.tap
|
||||
index 64f11f8..09b332a 100644
|
||||
-a/t/primary-prefix-invalid-couples.tap
|
||||
+++ b/t/primary-prefix-invalid-couples.tap
|
||||
@@ -186,8 +186,10 @@ grep -v 'dir.* not a legitimate directory' stderr && exit 1
|
||||
# Check that the same failures are present without the '--add-missing'
|
||||
# option.
|
||||
mv stderr stderr.old
|
||||
+cat stderr.old | sort > a
|
||||
AUTOMAKE_fails -d "automake error out on mismatched prefix/primary couples"
|
||||
+cat stderr | sort > b
|
||||
command_ok_ "... and with the same diagnostic of 'automake -a'" \
|
||||
- diff stderr.old stderr
|
||||
+ diff a b
|
||||
|
||||
:
|
|
@ -22,9 +22,10 @@ Patch0: %{name}-1.13.1-disable-tests.patch
|
|||
# of random looping in hashes items. Upstream will probably start sorting of
|
||||
# hash items by default for this failing case ~> we just don't resist on its
|
||||
# order for now (only testsuite change).
|
||||
# ~> Downstream
|
||||
# ~> Downstream, but proper fix will be pushed:
|
||||
# http://lists.gnu.org/archive/html/bug-automake/2013-07/msg00030.html
|
||||
# ~> http://lists.gnu.org/archive/html/bug-automake/2013-07/msg00022.html
|
||||
Patch1: %{name}-1.13.4-hash-order-workaround.patch
|
||||
Patch1: %{name}-1.14-hash-order-workaround.patch
|
||||
|
||||
URL: http://www.gnu.org/software/automake/
|
||||
Requires: autoconf >= 2.65
|
||||
|
@ -94,8 +95,10 @@ cp contrib/multilib/README README.multilib
|
|||
make install DESTDIR=%{buildroot}
|
||||
|
||||
%check
|
||||
# %%global TESTS_FLAGS t/preproc-errmsg t/preproc-basics
|
||||
%if %{with check}
|
||||
make -k %{?_smp_mflags} check || ( cat ./test-suite.log && false )
|
||||
make -k %{?_smp_mflags} check %{?TESTS_FLAGS: TESTS="%{TESTS_FLAGS}"} \
|
||||
|| ( cat ./test-suite.log && false )
|
||||
%endif
|
||||
|
||||
%post
|
||||
|
@ -117,8 +120,9 @@ fi
|
|||
%{_mandir}/man1/*
|
||||
|
||||
%changelog
|
||||
* Tue Oct 15 2013 Pavel Raiskup <praiskup@redhat.com> - 1.14-2
|
||||
* Thu Oct 24 2013 Pavel Raiskup <praiskup@redhat.com> - 1.14-2
|
||||
- rebase to automake-1.14, enable testsuite (#976973)
|
||||
- fix the hash-order patch for testsuite and Perl 5.18
|
||||
|
||||
* Wed Oct 09 2013 Pavel Raiskup <praiskup@redhat.com> - 1.14-1
|
||||
- rebase to automake-1.14, first step (without testsuite) (#976973)
|
||||
|
|
Loading…
Reference in New Issue