Module Name:    src
Committed By:   rillig
Date:           Mon Jun  8 19:50:11 UTC 2020

Modified Files:
        src/tests/usr.bin/make: t_make.sh

Log Message:
usr.bin/make: fix test failure

The two files include-sub.mk and include-subsub.mk were never intended to
be test cases on their own.  They belong to include-main.mk.

Fixes PR bin/55360.


To generate a diff of this commit:
cvs rdiff -u -r1.7 -r1.8 src/tests/usr.bin/make/t_make.sh

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

Modified files:

Index: src/tests/usr.bin/make/t_make.sh
diff -u src/tests/usr.bin/make/t_make.sh:1.7 src/tests/usr.bin/make/t_make.sh:1.8
--- src/tests/usr.bin/make/t_make.sh:1.7	Tue Jan 27 12:57:14 2015
+++ src/tests/usr.bin/make/t_make.sh	Mon Jun  8 19:50:10 2020
@@ -1,4 +1,4 @@
-# $NetBSD: t_make.sh,v 1.7 2015/01/27 12:57:14 martin Exp $
+# $NetBSD: t_make.sh,v 1.8 2020/06/08 19:50:10 rillig Exp $
 #
 # Copyright (c) 2008, 2010, 2014 The NetBSD Foundation, Inc.
 # All rights reserved.
@@ -77,6 +77,12 @@ atf_init_test_cases()
 	for filename in "$(atf_get_srcdir)"/unit-tests/*.mk ; do
 	    basename="${filename##*/}"
 	    basename="${basename%.mk}"
+
+	    # skip files that are not test cases on their own
+	    case "${basename}" in
+	    include-sub*) continue;;
+	    esac
+
 	    atfname="$(echo "${basename}" | tr "x-" "x_")"
 	    descr='' # XXX
             test_case "${atfname}" "${basename}" "${descr}"

Reply via email to