[pkgsrc/trunk]: pkgsrc/regress/env-vars regress/env-vars: make test output mo...

[rillig <rillig%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/8f3289c510fc
branches:  trunk
changeset: 387074:8f3289c510fc
user:      rillig <rillig%pkgsrc.org@localhost>
date:      Fri Nov 09 06:59:20 2018 +0000

description:
regress/env-vars: make test output more concise

diffstat:

 regress/env-vars/Makefile        |   4 ++--
 regress/env-vars/files/Makefile  |   4 ++--
 regress/env-vars/files/configure |   4 ++--
 regress/env-vars/spec            |  24 ++++++++++++------------
 4 files changed, 18 insertions(+), 18 deletions(-)

diffs (92 lines):

diff -r da0fdcb13edc -r 8f3289c510fc regress/env-vars/Makefile
--- a/regress/env-vars/Makefile Fri Nov 09 06:48:27 2018 +0000
+++ b/regress/env-vars/Makefile Fri Nov 09 06:59:20 2018 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1 2018/11/09 06:46:03 rillig Exp $
+# $NetBSD: Makefile,v 1.2 2018/11/09 06:59:20 rillig Exp $
 #
 
 DISTNAME=      env-vars-1.0
@@ -45,5 +45,5 @@
 
 save-env-vars: .USE .PHONY
        ${RUN}                                                          \
-       env | sed -n -e '/^[^=]*_set=yes$$/p' | LC_ALL=C sort           \
+       env | sed -n -e 's/^\([^=]*\)_set=yes$$/\1/p' | LC_ALL=C sort   \
        > "$$REGRESS_TMPDIR/${.TARGET}.vars"
diff -r da0fdcb13edc -r 8f3289c510fc regress/env-vars/files/Makefile
--- a/regress/env-vars/files/Makefile   Fri Nov 09 06:48:27 2018 +0000
+++ b/regress/env-vars/files/Makefile   Fri Nov 09 06:59:20 2018 +0000
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.1 2018/11/09 06:46:03 rillig Exp $
+# $NetBSD: Makefile,v 1.2 2018/11/09 06:59:20 rillig Exp $
 
 all install:
        @set -eu; \
-       env | sed -n -e '/^.*_set=yes$$/p' | LC_ALL=C sort \
+       env | sed -n -e 's/^\([^=]*\)_set=yes$$/\1/p' | LC_ALL=C sort \
        > "$$REGRESS_TMPDIR/make-${.TARGET}.vars"
diff -r da0fdcb13edc -r 8f3289c510fc regress/env-vars/files/configure
--- a/regress/env-vars/files/configure  Fri Nov 09 06:48:27 2018 +0000
+++ b/regress/env-vars/files/configure  Fri Nov 09 06:59:20 2018 +0000
@@ -1,5 +1,5 @@
-# $NetBSD: configure,v 1.1 2018/11/09 06:46:03 rillig Exp $
+# $NetBSD: configure,v 1.2 2018/11/09 06:59:20 rillig Exp $
 set -eu
 
-env | sed -n -e '/^.*_set=yes$/p' | LC_ALL=C sort \
+env | sed -n -e 's/^\([^=]*\)_set=yes$/\1/p' | LC_ALL=C sort \
 > "$REGRESS_TMPDIR/configure.vars"
diff -r da0fdcb13edc -r 8f3289c510fc regress/env-vars/spec
--- a/regress/env-vars/spec     Fri Nov 09 06:48:27 2018 +0000
+++ b/regress/env-vars/spec     Fri Nov 09 06:59:20 2018 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: spec,v 1.1 2018/11/09 06:46:03 rillig Exp $
+# $NetBSD: spec,v 1.2 2018/11/09 06:59:20 rillig Exp $
 #
 
 tmpdir=${TMPDIR:-/tmp}/pkgsrc-env-vars
@@ -34,32 +34,32 @@
        # variables are set.
        #
        require_file_has_lines "$tmpdir/do-build.vars" \
-               "PKGSRC_MAKE_ENV_set=yes"
+               "PKGSRC_MAKE_ENV"
 
        # In the configure script of the package, some more variables
        # are set.
        #
        require_file_has_lines "$tmpdir/configure.vars" \
-               "ALL_ENV_set=yes" \
-               "CONFIGURE_ENV_set=yes" \
-               "PKGSRC_MAKE_ENV_set=yes"
+               "ALL_ENV" \
+               "CONFIGURE_ENV" \
+               "PKGSRC_MAKE_ENV"
 
        # In the build phase, when the default do-build commands are
        # run, the Makefiles from the package have access to these
        # variables:
        #
        require_file_has_lines "$tmpdir/make-all.vars" \
-               "ALL_ENV_set=yes" \
-               "MAKE_ENV_set=yes" \
-               "PKGSRC_MAKE_ENV_set=yes"
+               "ALL_ENV" \
+               "MAKE_ENV" \
+               "PKGSRC_MAKE_ENV"
 
        # In the install phase, when the default do-install commands are
        # run, the Makefiles from the package have access to these
        # variables:
        #
        require_file_has_lines "$tmpdir/make-install.vars" \
-               "ALL_ENV_set=yes" \
-               "INSTALL_ENV_set=yes" \
-               "MAKE_ENV_set=yes" \
-               "PKGSRC_MAKE_ENV_set=yes"
+               "ALL_ENV" \
+               "INSTALL_ENV" \
+               "MAKE_ENV" \
+               "PKGSRC_MAKE_ENV"
 }