Mon Nov 2 20:40:10 2020 UTC ()
make(1): remove debugging code from sync-mi


(rillig)
diff -r1.183 -r1.184 src/usr.bin/make/unit-tests/Makefile

cvs diff -r1.183 -r1.184 src/usr.bin/make/unit-tests/Makefile (expand / switch to unified diff)

--- src/usr.bin/make/unit-tests/Makefile 2020/11/02 20:20:42 1.183
+++ src/usr.bin/make/unit-tests/Makefile 2020/11/02 20:40:10 1.184
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1# $NetBSD: Makefile,v 1.183 2020/11/02 20:20:42 rillig Exp $ 1# $NetBSD: Makefile,v 1.184 2020/11/02 20:40:10 rillig Exp $
2# 2#
3# Unit tests for make(1) 3# Unit tests for make(1)
4# 4#
5# The main targets are: 5# The main targets are:
6# 6#
7# all: 7# all:
8# run all the tests 8# run all the tests
9# test: 9# test:
10# run 'all', and compare to expected results 10# run 'all', and compare to expected results
11# accept: 11# accept:
12# move generated output to expected results 12# move generated output to expected results
13# 13#
14# Settable variables 14# Settable variables
@@ -538,27 +538,26 @@ accept: @@ -538,27 +538,26 @@ accept:
538 538
539# Note: only works for adding tests. 539# Note: only works for adding tests.
540# To remove a test, the $$mi file must be edited manually. 540# To remove a test, the $$mi file must be edited manually.
541sync-mi: 541sync-mi:
542 @set -eu; \ 542 @set -eu; \
543 cd "${MAKEFILE:tA:H}/../../.."; \ 543 cd "${MAKEFILE:tA:H}/../../.."; \
544 mi="distrib/sets/lists/tests/mi"; \ 544 mi="distrib/sets/lists/tests/mi"; \
545 cvs update "$$mi"; \ 545 cvs update "$$mi"; \
546 testsdir="usr.bin/make/unit-tests"; \ 546 testsdir="usr.bin/make/unit-tests"; \
547 fmt="./usr/tests/$$testsdir/%s\ttests-usr.bin-tests\tcompattestfile,atf\\n"; \ 547 fmt="./usr/tests/$$testsdir/%s\ttests-usr.bin-tests\tcompattestfile,atf\\n"; \
548 cat "$$mi" > "$$mi.tmp"; \ 548 cat "$$mi" > "$$mi.tmp"; \
549 (cd "$$testsdir" && ls *.exp *.mk) | xargs printf "$$fmt" >> "$$mi.tmp"; \ 549 (cd "$$testsdir" && ls *.exp *.mk) | xargs printf "$$fmt" >> "$$mi.tmp"; \
550 distrib/sets/fmt-list "$$mi.tmp"; \ 550 distrib/sets/fmt-list "$$mi.tmp"; \
551 echo $$?; \ 
552 mv "$$mi.tmp" "$$mi"; \ 551 mv "$$mi.tmp" "$$mi"; \
553 cvs diff "$$mi" || true 552 cvs diff "$$mi" || true
554 553
555.if exists(${TEST_MAKE}) 554.if exists(${TEST_MAKE})
556${TESTS:=.rawout}: ${TEST_MAKE} 555${TESTS:=.rawout}: ${TEST_MAKE}
557# in meta mode, we *know* if a target script is impacted 556# in meta mode, we *know* if a target script is impacted
558# by a makefile change. 557# by a makefile change.
559.if ${.MAKE.MODE:Unormal:Mmeta} == "" 558.if ${.MAKE.MODE:Unormal:Mmeta} == ""
560${TESTS:=.rawout}: ${.PARSEDIR}/Makefile 559${TESTS:=.rawout}: ${.PARSEDIR}/Makefile
561.endif 560.endif
562.endif 561.endif
563 562
564.-include <bsd.obj.mk> 563.-include <bsd.obj.mk>