Fri Nov 9 06:59:20 2018 UTC ()
regress/env-vars: make test output more concise


(rillig)
diff -r1.1 -r1.2 pkgsrc/regress/env-vars/Makefile
diff -r1.1 -r1.2 pkgsrc/regress/env-vars/spec
diff -r1.1 -r1.2 pkgsrc/regress/env-vars/files/Makefile
diff -r1.1 -r1.2 pkgsrc/regress/env-vars/files/configure
cvs diff -r1.1 -r1.2 pkgsrc/regress/env-vars/Makefile (expand / switch to unified diff)

--- pkgsrc/regress/env-vars/Makefile 2018/11/09 06:46:03 1.1
+++ pkgsrc/regress/env-vars/Makefile 2018/11/09 06:59:20 1.2
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1# $NetBSD: Makefile,v 1.1 2018/11/09 06:46:03 rillig Exp $ 1# $NetBSD: Makefile,v 1.2 2018/11/09 06:59:20 rillig Exp $
2# 2#
3 3
4DISTNAME= env-vars-1.0 4DISTNAME= env-vars-1.0
5CATEGORIES= regress 5CATEGORIES= regress
6MASTER_SITES= # none 6MASTER_SITES= # none
7DISTFILES= # none 7DISTFILES= # none
8 8
9MAINTAINER= pkgsrc-users@NetBSD.org 9MAINTAINER= pkgsrc-users@NetBSD.org
10COMMENT= Demonstrates the various *_ENV variables 10COMMENT= Demonstrates the various *_ENV variables
11LICENSE= 2-clause-bsd 11LICENSE= 2-clause-bsd
12 12
13USE_TOOLS+= printf env sed sort 13USE_TOOLS+= printf env sed sort
14NO_CHECKSUM= yes 14NO_CHECKSUM= yes
@@ -35,15 +35,15 @@ do-extract: @@ -35,15 +35,15 @@ do-extract:
35# These definitions must be below bsd.pkg.mk, or their pkgsrc default 35# These definitions must be below bsd.pkg.mk, or their pkgsrc default
36# actions will not be run. 36# actions will not be run.
37# 37#
38pre-fetch do-fetch post-fetch \ 38pre-fetch do-fetch post-fetch \
39pre-extract do-extract post-extract \ 39pre-extract do-extract post-extract \
40pre-patch do-patch post-patch \ 40pre-patch do-patch post-patch \
41pre-configure do-configure post-configure \ 41pre-configure do-configure post-configure \
42pre-build do-build post-build \ 42pre-build do-build post-build \
43pre-install do-install post-install: \ 43pre-install do-install post-install: \
44save-env-vars 44save-env-vars
45 45
46save-env-vars: .USE .PHONY 46save-env-vars: .USE .PHONY
47 ${RUN} \ 47 ${RUN} \
48 env | sed -n -e '/^[^=]*_set=yes$$/p' | LC_ALL=C sort \ 48 env | sed -n -e 's/^\([^=]*\)_set=yes$$/\1/p' | LC_ALL=C sort \
49 > "$$REGRESS_TMPDIR/${.TARGET}.vars" 49 > "$$REGRESS_TMPDIR/${.TARGET}.vars"
cvs diff -r1.1 -r1.2 pkgsrc/regress/env-vars/spec (expand / switch to unified diff)

--- pkgsrc/regress/env-vars/spec 2018/11/09 06:46:03 1.1
+++ pkgsrc/regress/env-vars/spec 2018/11/09 06:59:20 1.2
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1# $NetBSD: spec,v 1.1 2018/11/09 06:46:03 rillig Exp $ 1# $NetBSD: spec,v 1.2 2018/11/09 06:59:20 rillig Exp $
2# 2#
3 3
4tmpdir=${TMPDIR:-/tmp}/pkgsrc-env-vars 4tmpdir=${TMPDIR:-/tmp}/pkgsrc-env-vars
5rm -rf "$tmpdir" 5rm -rf "$tmpdir"
6mkdir -p "$tmpdir" 6mkdir -p "$tmpdir"
7 7
8require_file_has_lines() { # filename line... 8require_file_has_lines() { # filename line...
9 rfhl_expected="$tmpdir/expected" 9 rfhl_expected="$tmpdir/expected"
10 rfhl_actual=$1 10 rfhl_actual=$1
11 shift 11 shift
12 12
13 printf '%s\n' "$@" > "$rfhl_expected" 13 printf '%s\n' "$@" > "$rfhl_expected"
14 14
@@ -24,42 +24,42 @@ require_file_has_lines() { # filename li @@ -24,42 +24,42 @@ require_file_has_lines() { # filename li
24 24
25 25
26do_test() { 26do_test() {
27 env REGRESS_TMPDIR="$tmpdir" $TEST_MAKE clean 27 env REGRESS_TMPDIR="$tmpdir" $TEST_MAKE clean
28 env REGRESS_TMPDIR="$tmpdir" $TEST_MAKE update 28 env REGRESS_TMPDIR="$tmpdir" $TEST_MAKE update
29} 29}
30 30
31check_result() { 31check_result() {
32 32
33 # In the {pre,do,post}-* targets, only the PKGSRC_MAKE_ENV 33 # In the {pre,do,post}-* targets, only the PKGSRC_MAKE_ENV
34 # variables are set. 34 # variables are set.
35 # 35 #
36 require_file_has_lines "$tmpdir/do-build.vars" \ 36 require_file_has_lines "$tmpdir/do-build.vars" \
37 "PKGSRC_MAKE_ENV_set=yes" 37 "PKGSRC_MAKE_ENV"
38 38
39 # In the configure script of the package, some more variables 39 # In the configure script of the package, some more variables
40 # are set. 40 # are set.
41 # 41 #
42 require_file_has_lines "$tmpdir/configure.vars" \ 42 require_file_has_lines "$tmpdir/configure.vars" \
43 "ALL_ENV_set=yes" \ 43 "ALL_ENV" \
44 "CONFIGURE_ENV_set=yes" \ 44 "CONFIGURE_ENV" \
45 "PKGSRC_MAKE_ENV_set=yes" 45 "PKGSRC_MAKE_ENV"
46 46
47 # In the build phase, when the default do-build commands are 47 # In the build phase, when the default do-build commands are
48 # run, the Makefiles from the package have access to these 48 # run, the Makefiles from the package have access to these
49 # variables: 49 # variables:
50 # 50 #
51 require_file_has_lines "$tmpdir/make-all.vars" \ 51 require_file_has_lines "$tmpdir/make-all.vars" \
52 "ALL_ENV_set=yes" \ 52 "ALL_ENV" \
53 "MAKE_ENV_set=yes" \ 53 "MAKE_ENV" \
54 "PKGSRC_MAKE_ENV_set=yes" 54 "PKGSRC_MAKE_ENV"
55 55
56 # In the install phase, when the default do-install commands are 56 # In the install phase, when the default do-install commands are
57 # run, the Makefiles from the package have access to these 57 # run, the Makefiles from the package have access to these
58 # variables: 58 # variables:
59 # 59 #
60 require_file_has_lines "$tmpdir/make-install.vars" \ 60 require_file_has_lines "$tmpdir/make-install.vars" \
61 "ALL_ENV_set=yes" \ 61 "ALL_ENV" \
62 "INSTALL_ENV_set=yes" \ 62 "INSTALL_ENV" \
63 "MAKE_ENV_set=yes" \ 63 "MAKE_ENV" \
64 "PKGSRC_MAKE_ENV_set=yes" 64 "PKGSRC_MAKE_ENV"
65} 65}
cvs diff -r1.1 -r1.2 pkgsrc/regress/env-vars/files/Makefile (expand / switch to unified diff)

--- pkgsrc/regress/env-vars/files/Makefile 2018/11/09 06:46:03 1.1
+++ pkgsrc/regress/env-vars/files/Makefile 2018/11/09 06:59:20 1.2
@@ -1,6 +1,6 @@ @@ -1,6 +1,6 @@
1# $NetBSD: Makefile,v 1.1 2018/11/09 06:46:03 rillig Exp $ 1# $NetBSD: Makefile,v 1.2 2018/11/09 06:59:20 rillig Exp $
2 2
3all install: 3all install:
4 @set -eu; \ 4 @set -eu; \
5 env | sed -n -e '/^.*_set=yes$$/p' | LC_ALL=C sort \ 5 env | sed -n -e 's/^\([^=]*\)_set=yes$$/\1/p' | LC_ALL=C sort \
6 > "$$REGRESS_TMPDIR/make-${.TARGET}.vars" 6 > "$$REGRESS_TMPDIR/make-${.TARGET}.vars"
cvs diff -r1.1 -r1.2 pkgsrc/regress/env-vars/files/configure (expand / switch to unified diff)

--- pkgsrc/regress/env-vars/files/configure 2018/11/09 06:46:03 1.1
+++ pkgsrc/regress/env-vars/files/configure 2018/11/09 06:59:20 1.2
@@ -1,5 +1,5 @@ @@ -1,5 +1,5 @@
1# $NetBSD: configure,v 1.1 2018/11/09 06:46:03 rillig Exp $ 1# $NetBSD: configure,v 1.2 2018/11/09 06:59:20 rillig Exp $
2set -eu 2set -eu
3 3
4env | sed -n -e '/^.*_set=yes$/p' | LC_ALL=C sort \ 4env | sed -n -e 's/^\([^=]*\)_set=yes$/\1/p' | LC_ALL=C sort \
5> "$REGRESS_TMPDIR/configure.vars" 5> "$REGRESS_TMPDIR/configure.vars"