Disable failing test-update-copyright to fix FTBFS

This commit is contained in:
Peter Robinson 2015-07-04 11:25:51 +01:00
parent 42e4196fc0
commit 1f9b908a99
2 changed files with 57 additions and 1 deletions

View File

@ -0,0 +1,50 @@
--- coreutils-8.23/gnulib-tests/gnulib.mk.orig 2015-07-04 11:11:09.438579284 +0100
+++ coreutils-8.23/gnulib-tests/gnulib.mk 2015-07-04 11:12:12.113643496 +0100
@@ -2312,14 +2312,6 @@
## end gnulib module unsetenv-tests
-## begin gnulib module update-copyright-tests
-
-TESTS += test-update-copyright.sh
-TESTS_ENVIRONMENT += abs_aux_dir='$(abs_aux_dir)'
-EXTRA_DIST += test-update-copyright.sh
-
-## end gnulib module update-copyright-tests
-
## begin gnulib module userspec-tests
TESTS += test-userspec
--- coreutils-8.23/gnulib-tests/Makefile.in.orig 2015-07-04 11:10:54.353323089 +0100
+++ coreutils-8.23/gnulib-tests/Makefile.in 2015-07-04 11:12:45.542210970 +0100
@@ -220,7 +220,6 @@
test-u8-mbtoucr$(EXEEXT) test-u8-uctomb$(EXEEXT) \
test-uc_width$(EXEEXT) uniwidth/test-uc_width2.sh \
test-unlink$(EXEEXT) test-unlinkat$(EXEEXT) \
- test-unsetenv$(EXEEXT) test-update-copyright.sh \
test-userspec$(EXEEXT) test-utimens$(EXEEXT) \
test-utimensat$(EXEEXT) test-vasnprintf$(EXEEXT) \
test-vasprintf-posix$(EXEEXT) test-vasprintf$(EXEEXT) \
@@ -3766,7 +3765,7 @@
uniwidth/test-uc_width2.sh macros.h test-unlink.h \
test-unlink.c signature.h macros.h test-unlinkat.c \
test-rmdir.h test-unlink.h signature.h macros.h unlinkdir.h \
- test-unsetenv.c signature.h macros.h test-update-copyright.sh \
+ test-unsetenv.c signature.h macros.h \
test-userspec.c nap.h test-futimens.h test-lutimens.h \
test-utimens.h test-utimens-common.h test-utimens.c macros.h \
nap.h test-lutimens.h test-utimens.h test-utimens-common.h \
@@ -7787,13 +7786,6 @@
$(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \
--log-file $$b.log --trs-file $$b.trs \
$(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \
- "$$tst" $(AM_TESTS_FD_REDIRECT)
-test-update-copyright.sh.log: test-update-copyright.sh
- @p='test-update-copyright.sh'; \
- b='test-update-copyright.sh'; \
- $(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \
- --log-file $$b.log --trs-file $$b.trs \
- $(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \
"$$tst" $(AM_TESTS_FD_REDIRECT)
test-userspec.log: test-userspec$(EXEEXT)
@p='test-userspec$(EXEEXT)'; \

View File

@ -1,7 +1,7 @@
Summary: A set of basic GNU tools commonly used in shell scripts
Name: coreutils
Version: 8.23
Release: 13%{?dist}
Release: 14%{?dist}
License: GPLv3+
Group: System Environment/Base
Url: http://www.gnu.org/software/coreutils/
@ -29,6 +29,8 @@ Patch103: coreutils-8.2-uname-processortype.patch
Patch104: coreutils-df-direct.patch
#add note about mkdir --mode behaviour into info documentation(#610559)
Patch107: coreutils-8.4-mkdir-modenote.patch
# Don't run the currently failing test-update-copyright.sh test
Patch108: coreutils-remove-test-update-copyright.patch
# sh-utils
#add info about TZ envvar to date manpage
@ -132,6 +134,7 @@ the old GNU fileutils, sh-utils, and textutils packages.
%patch103 -p1 -b .sysinfo
%patch104 -p1 -b .dfdirect
%patch107 -p1 -b .mkdirmode
%patch108 -p1 -b .crtest
# sh-utils
%patch703 -p1 -b .dateman
@ -373,6 +376,9 @@ fi
%{_sbindir}/chroot
%changelog
* Sat Jul 4 2015 Peter Robinson <pbrobinson@fedoraproject.org> 8.23-14
- Disable failing test-update-copyright to fix FTBFS
* Wed Jun 17 2015 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 8.23-13
- Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild