CVS commit: pkgsrc/regress

["Roland Illig" <rillig%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   rillig
Date:           Sun Nov 24 08:34:46 UTC 2024

Modified Files:
        pkgsrc/regress/buildlink-libtool: Makefile
        pkgsrc/regress/buildlink-transform: Makefile
        pkgsrc/regress/buildlink-unwrap: Makefile
        pkgsrc/regress/infra-unittests: subst.sh
        pkgsrc/regress/make-quoting: Makefile

Log Message:
regress: remove DO_NADA; that variable has been removed


To generate a diff of this commit:
cvs rdiff -u -r1.6 -r1.7 pkgsrc/regress/buildlink-libtool/Makefile
cvs rdiff -u -r1.22 -r1.23 pkgsrc/regress/buildlink-transform/Makefile
cvs rdiff -u -r1.8 -r1.9 pkgsrc/regress/buildlink-unwrap/Makefile
cvs rdiff -u -r1.51 -r1.52 pkgsrc/regress/infra-unittests/subst.sh
cvs rdiff -u -r1.11 -r1.12 pkgsrc/regress/make-quoting/Makefile

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/regress/buildlink-libtool/Makefile
diff -u pkgsrc/regress/buildlink-libtool/Makefile:1.6 pkgsrc/regress/buildlink-libtool/Makefile:1.7
--- pkgsrc/regress/buildlink-libtool/Makefile:1.6       Sun Mar 24 21:09:21 2019
+++ pkgsrc/regress/buildlink-libtool/Makefile   Sun Nov 24 08:34:45 2024
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.6 2019/03/24 21:09:21 rillig Exp $
+# $NetBSD: Makefile,v 1.7 2024/11/24 08:34:45 rillig Exp $
 
 DISTNAME=      regress-buildlink-libtool-0.0
 CATEGORIES=    regress
@@ -35,8 +35,6 @@ do-regress:
                        ${ECHO} "       $$test";                        \
                done;                                                   \
                exit 1;                                                 \
-       else                                                            \
-               ${DO_NADA};                                             \
        fi
 
 report-failed:

Index: pkgsrc/regress/buildlink-transform/Makefile
diff -u pkgsrc/regress/buildlink-transform/Makefile:1.22 pkgsrc/regress/buildlink-transform/Makefile:1.23
--- pkgsrc/regress/buildlink-transform/Makefile:1.22    Sat May  9 22:42:37 2020
+++ pkgsrc/regress/buildlink-transform/Makefile Sun Nov 24 08:34:45 2024
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.22 2020/05/09 22:42:37 rillig Exp $
+# $NetBSD: Makefile,v 1.23 2024/11/24 08:34:45 rillig Exp $
 #
 # Run many buildlink transform tests in a single regression test to avoid
 # having to keep creating the wrapper scripts over and over again.
@@ -57,8 +57,6 @@ do-regress:
                        ${ECHO} "       $$test";                        \
                done;                                                   \
                exit 1;                                                 \
-       else                                                            \
-               ${DO_NADA};                                             \
        fi
 
 report-failed:

Index: pkgsrc/regress/buildlink-unwrap/Makefile
diff -u pkgsrc/regress/buildlink-unwrap/Makefile:1.8 pkgsrc/regress/buildlink-unwrap/Makefile:1.9
--- pkgsrc/regress/buildlink-unwrap/Makefile:1.8        Sun Mar 21 16:29:43 2010
+++ pkgsrc/regress/buildlink-unwrap/Makefile    Sun Nov 24 08:34:45 2024
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.8 2010/03/21 16:29:43 wiz Exp $
+# $NetBSD: Makefile,v 1.9 2024/11/24 08:34:45 rillig Exp $
 
 DISTNAME=      regress-buildlink-unwrap-0.0
 CATEGORIES=    regress
@@ -46,8 +46,6 @@ do-regress:
                        ${ECHO} "       $$test";                        \
                done;                                                   \
                exit 1;                                                 \
-       else                                                            \
-               ${DO_NADA};                                             \
        fi
 
 report-failed:

Index: pkgsrc/regress/infra-unittests/subst.sh
diff -u pkgsrc/regress/infra-unittests/subst.sh:1.51 pkgsrc/regress/infra-unittests/subst.sh:1.52
--- pkgsrc/regress/infra-unittests/subst.sh:1.51        Sun Nov 24 08:22:47 2024
+++ pkgsrc/regress/infra-unittests/subst.sh     Sun Nov 24 08:34:46 2024
@@ -1,5 +1,5 @@
 #! /bin/sh
-# $NetBSD: subst.sh,v 1.51 2024/11/24 08:22:47 rillig Exp $
+# $NetBSD: subst.sh,v 1.52 2024/11/24 08:34:46 rillig Exp $
 #
 # Tests for mk/subst.mk.
 #
@@ -30,7 +30,6 @@ test_case_set_up() {
                # Commands that are specific to pkgsrc
                RUN=            @set -e;
                STEP_MSG=       echo '=>'
-               DO_NADA=        : do-nada
                INFO_MSG=       echo 'info:'
                WARNING_MSG=    echo 'warning:'
                FAIL_MSG=       sh $pkgsrcdir/mk/scripts/fail echo 'fail:' 1>&2

Index: pkgsrc/regress/make-quoting/Makefile
diff -u pkgsrc/regress/make-quoting/Makefile:1.11 pkgsrc/regress/make-quoting/Makefile:1.12
--- pkgsrc/regress/make-quoting/Makefile:1.11   Sun Apr 26 13:11:17 2020
+++ pkgsrc/regress/make-quoting/Makefile        Sun Nov 24 08:34:46 2024
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.11 2020/04/26 13:11:17 rillig Exp $
+# $NetBSD: Makefile,v 1.12 2024/11/24 08:34:46 rillig Exp $
 #
 
 DISTNAME=      regress-make-20.04.26
@@ -43,7 +43,6 @@ WRKSRC=               ${WRKDIR}
 USE_TOOLS+=    diff printf
 
 do-build: do-regress
-       @${DO_NADA}
 
 do-regress:
        @printf "Testing bmake(1) version %s\\n" ${NUM_MAKE_VERSION:Q}""