CVS commit: pkgsrc/regress/infra-unittests

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

Module Name:    pkgsrc
Committed By:   rillig
Date:           Sun Apr 26 12:46:33 UTC 2020

Modified Files:
        pkgsrc/regress/infra-unittests: extract.sh mocked-include.sh subst.sh
            test.subr tools-bison.sh

Log Message:
regress/infra-unittests: bring files into normal form


To generate a diff of this commit:
cvs rdiff -u -r1.3 -r1.4 pkgsrc/regress/infra-unittests/extract.sh \
    pkgsrc/regress/infra-unittests/mocked-include.sh \
    pkgsrc/regress/infra-unittests/tools-bison.sh
cvs rdiff -u -r1.24 -r1.25 pkgsrc/regress/infra-unittests/subst.sh
cvs rdiff -u -r1.9 -r1.10 pkgsrc/regress/infra-unittests/test.subr

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

Modified files:

Index: pkgsrc/regress/infra-unittests/extract.sh
diff -u pkgsrc/regress/infra-unittests/extract.sh:1.3 pkgsrc/regress/infra-unittests/extract.sh:1.4
--- pkgsrc/regress/infra-unittests/extract.sh:1.3       Fri Mar 27 22:56:29 2020
+++ pkgsrc/regress/infra-unittests/extract.sh   Sun Apr 26 12:46:33 2020
@@ -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"
Index: pkgsrc/regress/infra-unittests/mocked-include.sh
diff -u pkgsrc/regress/infra-unittests/mocked-include.sh:1.3 pkgsrc/regress/infra-unittests/mocked-include.sh:1.4
--- pkgsrc/regress/infra-unittests/mocked-include.sh:1.3        Fri Mar 27 22:56:29 2020
+++ pkgsrc/regress/infra-unittests/mocked-include.sh    Sun Apr 26 12:46:33 2020
@@ -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"
 
Index: pkgsrc/regress/infra-unittests/tools-bison.sh
diff -u pkgsrc/regress/infra-unittests/tools-bison.sh:1.3 pkgsrc/regress/infra-unittests/tools-bison.sh:1.4
--- pkgsrc/regress/infra-unittests/tools-bison.sh:1.3   Fri Mar 27 22:56:29 2020
+++ pkgsrc/regress/infra-unittests/tools-bison.sh       Sun Apr 26 12:46:33 2020
@@ -1,7 +1,10 @@
 #! /bin/sh
-set -eu
-
+# $NetBSD: tools-bison.sh,v 1.4 2020/04/26 12:46:33 rillig Exp $
+#
 # Tests for mk/tools/bison.mk
+#
+
+set -eu
 
 . "./test.subr"
 

Index: pkgsrc/regress/infra-unittests/subst.sh
diff -u pkgsrc/regress/infra-unittests/subst.sh:1.24 pkgsrc/regress/infra-unittests/subst.sh:1.25
--- pkgsrc/regress/infra-unittests/subst.sh:1.24        Sun Apr 26 12:21:39 2020
+++ pkgsrc/regress/infra-unittests/subst.sh     Sun Apr 26 12:46:33 2020
@@ -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"

Index: pkgsrc/regress/infra-unittests/test.subr
diff -u pkgsrc/regress/infra-unittests/test.subr:1.9 pkgsrc/regress/infra-unittests/test.subr:1.10
--- pkgsrc/regress/infra-unittests/test.subr:1.9        Fri Mar 27 22:56:29 2020
+++ pkgsrc/regress/infra-unittests/test.subr    Sun Apr 26 12:46:33 2020
@@ -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 @@ set -eu
 #      directory after the test has run successfully.
 #
 
+set -eu
+
 : "${cleanup:=yes}"
 : "${make:=bmake}"
 : "${if_verbose=:}"