Github messages for voidlinux
 help / color / mirror / Atom feed
From: jnbr <jnbr@users.noreply.github.com>
To: ml@inbox.vuxu.org
Subject: [PR PATCH] coreutils: fix tests
Date: Tue, 03 Nov 2020 20:38:19 +0100	[thread overview]
Message-ID: <gh-mailinglist-notifications-41a7ca26-5023-4802-975b-f1789d68868e-void-packages-26110@inbox.vuxu.org> (raw)

[-- Attachment #1: Type: text/plain, Size: 376 bytes --]

There is a new pull request by jnbr against master on the void-packages repository

https://github.com/jnbr/void-packages coreutils
https://github.com/void-linux/void-packages/pull/26110

coreutils: fix tests
try not to destroy the makefile while disabling tests
use vsed in do_check

A patch file from https://github.com/void-linux/void-packages/pull/26110.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-coreutils-26110.patch --]
[-- Type: text/x-diff, Size: 1091 bytes --]

From 783eb4fcf4befde5d2d02aa744bad4817c730cf2 Mon Sep 17 00:00:00 2001
From: Johannes <johannes.brechtmann@gmail.com>
Date: Tue, 3 Nov 2020 20:32:27 +0100
Subject: [PATCH] coreutils: fix tests

try not to destroy the makefile while disabling tests
use vsed in do_check
---
 srcpkgs/coreutils/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/coreutils/template b/srcpkgs/coreutils/template
index feccd606958..334d1b0ea94 100644
--- a/srcpkgs/coreutils/template
+++ b/srcpkgs/coreutils/template
@@ -91,16 +91,16 @@ do_check() {
 	local exeext_tests
 
 	# chgrp tests fail inside a chroot
-	sed -i '/tests\/chgrp/d' Makefile
+	vsed -i '/tests\/chgrp/d' Makefile
 
 	# Tests that fail due to being inside a chroot
 	exeext_tests="chown lchown fchownat"
 
-	# Tests that depend on the tests reemoved
+	# Tests that depend on the tests removed
 	exeext_tests+=" fchmodat fchdir"
 
 	for test in $exeext_tests ; do
-		sed -i "/test-$test\$(EXEEXT)/d" gnulib-tests/Makefile
+		vsed -i "s/test-$test\$(EXEEXT) //" gnulib-tests/Makefile
 	done
 
 	make check

             reply	other threads:[~2020-11-03 19:38 UTC|newest]

Thread overview: 2+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2020-11-03 19:38 jnbr [this message]
2020-11-06 20:35 ` [PR PATCH] [Merged]: " jnbr

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=gh-mailinglist-notifications-41a7ca26-5023-4802-975b-f1789d68868e-void-packages-26110@inbox.vuxu.org \
    --to=jnbr@users.noreply.github.com \
    --cc=ml@inbox.vuxu.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).