From d2c184a38c5c23365787bb54ba17aa6e45648052d852243fb8e7f5772c94ca44 Mon Sep 17 00:00:00 2001 From: Stephan Kulow Date: Sun, 28 Sep 2014 17:53:33 +0000 Subject: [PATCH] Accepting request 250219 from Base:System Make testsuite succeed again OBS-URL: https://build.opensuse.org/request/show/250219 OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/coreutils?expand=0&rev=105 --- coreutils-disable_tests.patch | 25 ++++ ...ls-fix_false_du_failure_on_newer_xfs.patch | 124 ++++++++++++++++++ coreutils-test_without_valgrind.patch | 18 +++ coreutils-testsuite.changes | 8 ++ coreutils-testsuite.spec | 8 ++ coreutils.changes | 8 ++ coreutils.spec | 8 ++ 7 files changed, 199 insertions(+) create mode 100644 coreutils-disable_tests.patch create mode 100644 coreutils-fix_false_du_failure_on_newer_xfs.patch create mode 100644 coreutils-test_without_valgrind.patch diff --git a/coreutils-disable_tests.patch b/coreutils-disable_tests.patch new file mode 100644 index 0000000..7cf0c56 --- /dev/null +++ b/coreutils-disable_tests.patch @@ -0,0 +1,25 @@ +--- + gnulib-tests/gnulib.mk | 10 +++++----- + 1 file changed, 5 insertions(+), 5 deletions(-) + +Index: gnulib-tests/gnulib.mk +=================================================================== +--- gnulib-tests/gnulib.mk.orig 2014-09-18 18:39:37.692580154 +0200 ++++ gnulib-tests/gnulib.mk 2014-09-18 18:40:13.905127435 +0200 +@@ -877,11 +877,11 @@ EXTRA_DIST += test-getloadavg.c signatur + ## end gnulib module getloadavg-tests + + ## begin gnulib module getlogin-tests +- +-TESTS += test-getlogin +-check_PROGRAMS += test-getlogin +-EXTRA_DIST += test-getlogin.c signature.h macros.h +- ++# ++#TESTS += test-getlogin ++#check_PROGRAMS += test-getlogin ++#EXTRA_DIST += test-getlogin.c signature.h macros.h ++# + ## end gnulib module getlogin-tests + + ## begin gnulib module getndelim2-tests diff --git a/coreutils-fix_false_du_failure_on_newer_xfs.patch b/coreutils-fix_false_du_failure_on_newer_xfs.patch new file mode 100644 index 0000000..448be79 --- /dev/null +++ b/coreutils-fix_false_du_failure_on_newer_xfs.patch @@ -0,0 +1,124 @@ +From coreutils-bounces+pth=suse.de@gnu.org Tue Sep 16 00:19:14 2014 +Return-Path: +X-Original-To: pth@wotan.suse.de +Received: from relay1.suse.de (relay1.suse.de [149.44.160.133]) + by wotan.suse.de (Postfix) with ESMTP id 9E7716283 + for ; Tue, 16 Sep 2014 00:19:14 +0200 (CEST) +Received: by relay1.suse.de (Postfix) + id 9723D28DD; Tue, 16 Sep 2014 00:19:14 +0200 (CEST) +Received: from localhost (localhost [127.0.0.1]) + by relay1.suse.de (Postfix) with ESMTP id 91A4228D9 + for ; Tue, 16 Sep 2014 00:19:14 +0200 (CEST) +X-Virus-Scanned: by amavisd-new at localhost +X-Spam-Flag: NO +X-Spam-Score: -5.868 +X-Spam-Level: +X-Spam-Status: No, score=-5.868 tagged_above=-9999 required=5 + tests=[BAYES_50=0.8, IS_MAILMAN_LIST=-1, RCVD_IN_DNSWL_HI=-5, + RP_MATCHES_RCVD=-0.668] autolearn=disabled +Received: from relay1.suse.de ([127.0.0.1]) + by localhost (localhost [127.0.0.1]) (amavisd-new, port 10026) + with ESMTP id ChE53gAm38xF for ; + Tue, 16 Sep 2014 00:19:14 +0200 (CEST) +Received: from mx1.suse.de (cantor1.suse.de [195.135.220.2]) + (using TLSv1 with cipher ADH-CAMELLIA256-SHA (256/256 bits)) + (No client certificate requested) + by relay1.suse.de (Postfix) with ESMTPS id 3DFCE2030 + for ; Tue, 16 Sep 2014 00:19:14 +0200 (CEST) +Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) + (using TLSv1 with cipher AES256-SHA (256/256 bits)) + (No client certificate requested) + by mx1.suse.de (Postfix) with ESMTPS id 14E56AAC5 + for ; Tue, 16 Sep 2014 00:19:14 +0200 (CEST) +Received: from localhost ([::1]:34619 helo=lists.gnu.org) + by lists.gnu.org with esmtp (Exim 4.71) + (envelope-from ) + id 1XTec5-00066K-6z + for pth@suse.de; Mon, 15 Sep 2014 18:19:13 -0400 +Received: from eggs.gnu.org ([2001:4830:134:3::10]:44002) + by lists.gnu.org with esmtp (Exim 4.71) + (envelope-from ) id 1XTebt-0005zb-Ea + for coreutils@gnu.org; Mon, 15 Sep 2014 18:19:08 -0400 +Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) + (envelope-from ) id 1XTebh-0006mb-A2 + for coreutils@gnu.org; Mon, 15 Sep 2014 18:19:01 -0400 +Received: from mout.kundenserver.de ([212.227.126.130]:61454) + by eggs.gnu.org with esmtp (Exim 4.71) + (envelope-from ) id 1XTebh-0006m4-1Y + for coreutils@gnu.org; Mon, 15 Sep 2014 18:18:49 -0400 +Received: from blackice.site (pD957CBB4.dip0.t-ipconnect.de [217.87.203.180]) + by mrelayeu.kundenserver.de (node=mreue007) with ESMTP (Nemesis) + id 0MY0P5-1Xnddz1jeR-00WkzE; Tue, 16 Sep 2014 00:18:44 +0200 +From: Bernhard Voelker +To: coreutils@gnu.org +Subject: [PATCH] tests: fix false du failure on newer XFS +Date: Tue, 16 Sep 2014 00:17:43 +0200 +Message-Id: <1410819463-5423-1-git-send-email-mail@bernhard-voelker.de> +X-Mailer: git-send-email 1.8.4.5 +X-Provags-ID: V02:K0:qhDLt5+dLDL9ZojGDjR2JCZUT99RsLhoiyP2U0vHUVe + 6sFe6AEQdVdEBTcxwG3rxuMC20RiygA6M3jqShv8YrHI8aMVAd + eE8xJ/hJz3vHhN5RsbqbiGh6bGodZh6z/8pEPo4nIZfvFj5/Oy + IXHy4YysR6g0Ci11Fcpx0MH2q50tuGRgVct132icfAEbWFZM7o + //TkmA8XFocuHSW4d1dv6YXnnf1OA1QDsTHrc7TrX3NwqGqTzl + qIUlhT4OBcqPtunpPR5ty3yLNFY61T33c0Y4tB0LRpDgS7bbE7 + Gk8SkMUBH447xJjIFByTt+DQk+mgpo1h1Eo2vUlIFXzNzZrdaV + BcRVj5v4GBKK1/e2y3rVH4VUBgbCZiJhb9TsicXKVwkF+Xejjb + mCtjMo7wyvEjtHeCr0aBNLE18yA2j8FEEI= +X-UI-Out-Filterresults: notjunk:1; +X-detected-operating-system: by eggs.gnu.org: GNU/Linux 3.x [generic] +X-Received-From: 212.227.126.130 +Cc: Bernhard Voelker +X-BeenThere: coreutils@gnu.org +X-Mailman-Version: 2.1.14 +Precedence: list +List-Id: GNU coreutils General Discussion +List-Unsubscribe: , + +List-Archive: +List-Post: +List-Help: +List-Subscribe: , + +Errors-To: coreutils-bounces+pth=suse.de@gnu.org +Sender: coreutils-bounces+pth=suse.de@gnu.org +Status: RO +Content-Length: 1239 +Lines: 40 + +* tests/du/2g.sh: Similar to the fix for a dd test (see commit +v8.22-65-g7c03fe2), avoid speculative preallocation by creating +the 'big' file in one go instead of appending to it in the loop. +Remove debugging statements as the output with 'set -x' is +sufficient nowadays. +--- + tests/du/2g.sh | 17 ++++++++--------- + 1 file changed, 8 insertions(+), 9 deletions(-) + +Index: coreutils-8.22/tests/du/2g.sh +=================================================================== +--- coreutils-8.22.orig/tests/du/2g.sh 2013-12-04 15:48:30.000000000 +0100 ++++ coreutils-8.22/tests/du/2g.sh 2014-09-16 14:00:30.718944253 +0200 +@@ -46,15 +46,14 @@ test $min_kb -lt $free_kb || + + big=big + rm -f $big +-test -t 1 || printf 'creating a 2GB file...\n' +-for i in $(seq 100); do +- # Note: 2147483648 == 2^31. Print floor(2^31/100) per iteration. +- printf %21474836s x >> $big || fail=1 +- # On the final iteration, append the remaining 48 bytes. +- test $i = 100 && { printf %48s x >> $big || fail=1; } +- test -t 1 && printf 'creating a 2GB file: %d%% complete\r' $i +-done +-echo ++{ ++ for i in $(seq 100); do ++ # Note: 2147483648 == 2^31. Print floor(2^31/100) per iteration. ++ printf %21474836s x || fail=1 ++ done ++ # After the final iteration, append the remaining 48 bytes. ++ printf %48s x || fail=1 ++} > $big || fail=1 + + du -k $big > out1 || fail=1 + rm -f $big diff --git a/coreutils-test_without_valgrind.patch b/coreutils-test_without_valgrind.patch new file mode 100644 index 0000000..193c543 --- /dev/null +++ b/coreutils-test_without_valgrind.patch @@ -0,0 +1,18 @@ +--- + tests/misc/shuf-reservoir.sh | 3 +-- + 1 file changed, 1 insertion(+), 2 deletions(-) + +Index: tests/misc/shuf-reservoir.sh +=================================================================== +--- tests/misc/shuf-reservoir.sh.orig 2013-12-09 14:40:46.000000000 +0100 ++++ tests/misc/shuf-reservoir.sh 2014-09-18 18:30:07.752705383 +0200 +@@ -37,8 +37,7 @@ run_shuf_n() + + # Critical memory-related bugs will cause a segfault here + # (with varying numbers of input/output lines) +- seq "$INPUT_LINES" | valgrind --leak-check=$leaklevel --error-exitcode=1 \ +- shuf -n "$OUTPUT_LINES" -o "out_${INPUT_LINES}_${OUTPUT_LINES}" || return 1 ++ seq "$INPUT_LINES" | shuf -n "$OUTPUT_LINES" -o "out_${INPUT_LINES}_${OUTPUT_LINES}" || return 1 + + EXPECTED_LINES="$OUTPUT_LINES" + test "$INPUT_LINES" -lt "$OUTPUT_LINES" && EXPECTED_LINES="$INPUT_LINES" diff --git a/coreutils-testsuite.changes b/coreutils-testsuite.changes index 8f92ef5..1fd8a32 100644 --- a/coreutils-testsuite.changes +++ b/coreutils-testsuite.changes @@ -1,3 +1,11 @@ +------------------------------------------------------------------- +Thu Sep 18 18:04:37 CEST 2014 - pth@suse.de + +- Add coreutils-fix_false_du_failure_on_newer_xfs.patch that fixes a false + negative in the testsuite. +- Add coreutils-disable_tests.patch to not run a tests that fail inside the OBS. +- Add coreutils-test_without_valgrind.patch to not use valgrind in shuf-reservoir. + ------------------------------------------------------------------- Fri Aug 1 15:54:41 UTC 2014 - mail@bernhard-voelker.de diff --git a/coreutils-testsuite.spec b/coreutils-testsuite.spec index cb7f8d8..2c16c54 100644 --- a/coreutils-testsuite.spec +++ b/coreutils-testsuite.spec @@ -125,6 +125,11 @@ Patch400: coreutils-fix-man-deps.patch # Fixes a regression in chroot which did not chdir("/") in all cases. Patch401: coreutils-chroot-perform-chdir-unless-skip-chdir.patch +Patch416: coreutils-fix_false_du_failure_on_newer_xfs.patch + +Patch500: coreutils-disable_tests.patch +Patch501: coreutils-test_without_valgrind.patch + # ================================================ %description These are the GNU core utilities. This package is the union of @@ -164,6 +169,9 @@ the GNU fileutils, sh-utils, and textutils packages. %patch303 %patch400 %patch401 +%patch416 -p1 +%patch500 +%patch501 #???## We need to statically link to gmp, otherwise we have a build loop #???#sed -i s,'$(LIB_GMP)',%%{_libdir}/libgmp.a,g Makefile.in diff --git a/coreutils.changes b/coreutils.changes index 8f92ef5..1fd8a32 100644 --- a/coreutils.changes +++ b/coreutils.changes @@ -1,3 +1,11 @@ +------------------------------------------------------------------- +Thu Sep 18 18:04:37 CEST 2014 - pth@suse.de + +- Add coreutils-fix_false_du_failure_on_newer_xfs.patch that fixes a false + negative in the testsuite. +- Add coreutils-disable_tests.patch to not run a tests that fail inside the OBS. +- Add coreutils-test_without_valgrind.patch to not use valgrind in shuf-reservoir. + ------------------------------------------------------------------- Fri Aug 1 15:54:41 UTC 2014 - mail@bernhard-voelker.de diff --git a/coreutils.spec b/coreutils.spec index 3b630c7..c3e43d8 100644 --- a/coreutils.spec +++ b/coreutils.spec @@ -125,6 +125,11 @@ Patch400: coreutils-fix-man-deps.patch # Fixes a regression in chroot which did not chdir("/") in all cases. Patch401: coreutils-chroot-perform-chdir-unless-skip-chdir.patch +Patch416: coreutils-fix_false_du_failure_on_newer_xfs.patch + +Patch500: coreutils-disable_tests.patch +Patch501: coreutils-test_without_valgrind.patch + # ================================================ %description These are the GNU core utilities. This package is the union of @@ -164,6 +169,9 @@ the GNU fileutils, sh-utils, and textutils packages. %patch303 %patch400 %patch401 +%patch416 -p1 +%patch500 +%patch501 #???## We need to statically link to gmp, otherwise we have a build loop #???#sed -i s,'$(LIB_GMP)',%%{_libdir}/libgmp.a,g Makefile.in