Source-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[pkgsrc/trunk]: pkgsrc/sysutils/entr entr: Skip portability check for system_...



details:   https://anonhg.NetBSD.org/pkgsrc/rev/496fba7dbad9
branches:  trunk
changeset: 434278:496fba7dbad9
user:      leot <leot%pkgsrc.org@localhost>
date:      Sat Jun 13 22:04:35 2020 +0000

description:
entr: Skip portability check for system_test.sh (needs bash)

system_test.sh has several other bash-isms and we already needed bash
for testing, but, the way it was required triggered the portability
checks.  Remove patch-system__test.sh accordingly.

diffstat:

 sysutils/entr/Makefile                      |   7 ++++---
 sysutils/entr/distinfo                      |   3 +--
 sysutils/entr/patches/patch-system__test.sh |  24 ------------------------
 3 files changed, 5 insertions(+), 29 deletions(-)

diffs (61 lines):

diff -r 8aa6b0c3c9ab -r 496fba7dbad9 sysutils/entr/Makefile
--- a/sysutils/entr/Makefile    Sat Jun 13 21:51:38 2020 +0000
+++ b/sysutils/entr/Makefile    Sat Jun 13 22:04:35 2020 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.14 2020/06/13 21:51:26 leot Exp $
+# $NetBSD: Makefile,v 1.15 2020/06/13 22:04:35 leot Exp $
 #
 
 DISTNAME=      entr-4.5
@@ -25,8 +25,9 @@
 NOT_FOR_PLATFORM=      ${MACHINE_PLATFORM}
 .endif
 
-TEST_TARGET=   test
-USE_TOOLS+=    bash:test
+TEST_TARGET=                   test
+USE_TOOLS+=                    bash:test
+CHECK_PORTABILITY_SKIP+=       system_test.sh
 .if ${PKGSRC_RUN_TEST:tl} == yes
 REPLACE_BASH+= system_test.sh
 .endif
diff -r 8aa6b0c3c9ab -r 496fba7dbad9 sysutils/entr/distinfo
--- a/sysutils/entr/distinfo    Sat Jun 13 21:51:38 2020 +0000
+++ b/sysutils/entr/distinfo    Sat Jun 13 22:04:35 2020 +0000
@@ -1,7 +1,6 @@
-$NetBSD: distinfo,v 1.12 2020/06/13 21:51:26 leot Exp $
+$NetBSD: distinfo,v 1.13 2020/06/13 22:04:35 leot Exp $
 
 SHA1 (entr-4.5.tar.gz) = a706c15f7be76e94c7504242cf488280af4bb0e2
 RMD160 (entr-4.5.tar.gz) = 6e2c0f4828e2dc306185fc173658ba6ec44af468
 SHA512 (entr-4.5.tar.gz) = db9499d78385df5056a30a4e3262fb436090acc5410ddfc529a7cfe4e10e304e13787abfc31dd38dbf8b9f01fa3369ef32d20c9fb903fa35763f41791bdda9c7
 Size (entr-4.5.tar.gz) = 24674 bytes
-SHA1 (patch-system__test.sh) = 2b13ae80c7f3a84bc2fb2da4f4fa0a4e4cabb3bd
diff -r 8aa6b0c3c9ab -r 496fba7dbad9 sysutils/entr/patches/patch-system__test.sh
--- a/sysutils/entr/patches/patch-system__test.sh       Sat Jun 13 21:51:38 2020 +0000
+++ /dev/null   Thu Jan 01 00:00:00 1970 +0000
@@ -1,24 +0,0 @@
-$NetBSD: patch-system__test.sh,v 1.1 2020/06/13 21:51:26 leot Exp $
-
-Do not use non-portable `==' test(1) operator.
-
---- system_test.sh.orig        2020-04-20 16:02:05.000000000 +0000
-+++ system_test.sh
-@@ -22,7 +22,7 @@ typeset -i tests=0
- function try { let tests+=1; this="$1"; }
- 
- function assert {
--      [[ "$1" == "$2" ]] && { printf "."; return; }
-+      [[ "$1" = "$2" ]] && { printf "."; return; }
-       printf "\nFAIL: $this\n'$1' != '$2'\n"; exit 1
- }
- function skip { printf "s"; }
-@@ -110,7 +110,7 @@ try "fail to exec an command using one-s
- 
- try "restart a server when a file is modified using one-shot option"
-       setup
--      if [ $(uname) == 'Linux' ]; then
-+      if [ $(uname) = 'Linux' ]; then
-               skip "GNU nc spins while retrying SELECT(2); busybox does not support domain sockets"
-       else
-               ls $tmp/file2 | ./entr -rz nc -l -U $tmp/nc.s >> $tmp/exec.out &



Home | Main Index | Thread Index | Old Index