CVS commit: pkgsrc/regress/env-vars

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

Module Name:    pkgsrc
Committed By:   rillig
Date:           Fri Nov  9 06:59:20 UTC 2018

Modified Files:
        pkgsrc/regress/env-vars: Makefile spec
        pkgsrc/regress/env-vars/files: Makefile configure

Log Message:
regress/env-vars: make test output more concise


To generate a diff of this commit:
cvs rdiff -u -r1.1 -r1.2 pkgsrc/regress/env-vars/Makefile \
    pkgsrc/regress/env-vars/spec
cvs rdiff -u -r1.1 -r1.2 pkgsrc/regress/env-vars/files/Makefile \
    pkgsrc/regress/env-vars/files/configure

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

Modified files:

Index: pkgsrc/regress/env-vars/Makefile
diff -u pkgsrc/regress/env-vars/Makefile:1.1 pkgsrc/regress/env-vars/Makefile:1.2
--- pkgsrc/regress/env-vars/Makefile:1.1        Fri Nov  9 06:46:03 2018
+++ pkgsrc/regress/env-vars/Makefile    Fri Nov  9 06:59:20 2018
@@ -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
 
 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"
Index: pkgsrc/regress/env-vars/spec
diff -u pkgsrc/regress/env-vars/spec:1.1 pkgsrc/regress/env-vars/spec:1.2
--- pkgsrc/regress/env-vars/spec:1.1    Fri Nov  9 06:46:03 2018
+++ pkgsrc/regress/env-vars/spec        Fri Nov  9 06:59:20 2018
@@ -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 @@ check_result() {
        # 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"
 }

Index: pkgsrc/regress/env-vars/files/Makefile
diff -u pkgsrc/regress/env-vars/files/Makefile:1.1 pkgsrc/regress/env-vars/files/Makefile:1.2
--- pkgsrc/regress/env-vars/files/Makefile:1.1  Fri Nov  9 06:46:03 2018
+++ pkgsrc/regress/env-vars/files/Makefile      Fri Nov  9 06:59:20 2018
@@ -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"
Index: pkgsrc/regress/env-vars/files/configure
diff -u pkgsrc/regress/env-vars/files/configure:1.1 pkgsrc/regress/env-vars/files/configure:1.2
--- pkgsrc/regress/env-vars/files/configure:1.1 Fri Nov  9 06:46:03 2018
+++ pkgsrc/regress/env-vars/files/configure     Fri Nov  9 06:59:20 2018
@@ -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"