[pkgsrc/trunk]: pkgsrc/regress/infra-unittests regress/infra-unittests: bring...

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

details:   https://anonhg.NetBSD.org/pkgsrc/rev/45a9bccd814b
branches:  trunk
changeset: 428259:45a9bccd814b
user:      rillig <rillig%pkgsrc.org@localhost>
date:      Sun Apr 26 12:46:33 2020 +0000

description:
regress/infra-unittests: bring files into normal form

diffstat:

 regress/infra-unittests/extract.sh        |   4 +++-
 regress/infra-unittests/mocked-include.sh |  10 +++++++---
 regress/infra-unittests/subst.sh          |   2 ++
 regress/infra-unittests/test.subr         |   7 ++++---
 regress/infra-unittests/tools-bison.sh    |   7 +++++--
 5 files changed, 21 insertions(+), 9 deletions(-)

diffs (85 lines):

diff -r cbdd3cb64733 -r 45a9bccd814b regress/infra-unittests/extract.sh
--- a/regress/infra-unittests/extract.sh        Sun Apr 26 12:46:01 2020 +0000
+++ b/regress/infra-unittests/extract.sh        Sun Apr 26 12:46:33 2020 +0000
@@ -1,7 +1,9 @@
 #! /bin/sh
+# $NetBSD: extract.sh,v 1.4 2020/04/26 12:46:33 rillig Exp $
 #
-# Tests for mk/subst.mk.
+# Test cases for mk/extract/extract.
 #
+
 set -eu
 
 . "./test.subr"
diff -r cbdd3cb64733 -r 45a9bccd814b regress/infra-unittests/mocked-include.sh
--- a/regress/infra-unittests/mocked-include.sh Sun Apr 26 12:46:01 2020 +0000
+++ b/regress/infra-unittests/mocked-include.sh Sun Apr 26 12:46:33 2020 +0000
@@ -1,8 +1,12 @@
 #! /bin/sh
-set -eu
+# $NetBSD: mocked-include.sh,v 1.4 2020/04/26 12:46:33 rillig Exp $
+#
+# Demonstrates how to mock a pkgsrc infrastructure file in a regression
+# test.  This mocked file is created using create_pkgsrc_file and
+# overrides any file of the same name from the "real pkgsrc" directory.
+#
 
-# Ensures that files that are overridden in the "mocked pkgsrc" directory
-# are picked up before those from the "real pkgsrc" directory.
+set -eu
 
 . "./test.subr"
 
diff -r cbdd3cb64733 -r 45a9bccd814b regress/infra-unittests/subst.sh
--- a/regress/infra-unittests/subst.sh  Sun Apr 26 12:46:01 2020 +0000
+++ b/regress/infra-unittests/subst.sh  Sun Apr 26 12:46:33 2020 +0000
@@ -1,7 +1,9 @@
 #! /bin/sh
+# $NetBSD: subst.sh,v 1.25 2020/04/26 12:46:33 rillig Exp $
 #
 # Tests for mk/subst.mk.
 #
+
 set -eu
 
 . "./test.subr"
diff -r cbdd3cb64733 -r 45a9bccd814b regress/infra-unittests/test.subr
--- a/regress/infra-unittests/test.subr Sun Apr 26 12:46:01 2020 +0000
+++ b/regress/infra-unittests/test.subr Sun Apr 26 12:46:33 2020 +0000
@@ -1,7 +1,6 @@
 #! /bin/sh
-# $NetBSD: test.subr,v 1.9 2020/03/27 22:56:29 rillig Exp $
-set -eu
-
+# $NetBSD: test.subr,v 1.10 2020/04/26 12:46:33 rillig Exp $
+#
 # This file defines utilities for testing Makefile fragments and shell
 # programs from the pkgsrc infrastructure. While testing one part of the
 # infrastructure, other parts can be mocked away.
@@ -114,6 +113,8 @@
 #      directory after the test has run successfully.
 #
 
+set -eu
+
 : "${cleanup:=yes}"
 : "${make:=bmake}"
 : "${if_verbose=:}"
diff -r cbdd3cb64733 -r 45a9bccd814b regress/infra-unittests/tools-bison.sh
--- a/regress/infra-unittests/tools-bison.sh    Sun Apr 26 12:46:01 2020 +0000
+++ b/regress/infra-unittests/tools-bison.sh    Sun Apr 26 12:46:33 2020 +0000
@@ -1,8 +1,11 @@
 #! /bin/sh
+# $NetBSD: tools-bison.sh,v 1.4 2020/04/26 12:46:33 rillig Exp $
+#
+# Tests for mk/tools/bison.mk
+#
+
 set -eu
 
-# Tests for mk/tools/bison.mk
-
 . "./test.subr"
 
 bison=$(mock_cmd mock-bison \