Module Name: src Committed By: apb Date: Thu Aug 21 13:44:52 UTC 2014
Modified Files: src/usr.bin/make/unit-tests: Makefile Added Files: src/usr.bin/make/unit-tests: comment.exp comment.mk cond1.exp cond1.mk doterror.exp doterror.mk dotwait.exp dotwait.mk error.exp error.mk export-all.exp export-all.mk export-env.exp export-env.mk export.exp export.mk forloop.exp forloop.mk forsubst.exp forsubst.mk hash.exp hash.mk misc.exp misc.mk moderrs.exp moderrs.mk modmatch.exp modmatch.mk modmisc.exp modmisc.mk modorder.exp modorder.mk modts.exp modts.mk modword.exp modword.mk order.exp order.mk phony-end.exp phony-end.mk posix.exp posix.mk qequals.exp qequals.mk sunshcmd.exp sunshcmd.mk sysv.exp sysv.mk ternary.exp ternary.mk unexport-env.exp unexport-env.mk unexport.exp unexport.mk varcmd.exp varcmd.mk varshell.exp varshell.mk Removed Files: src/usr.bin/make/unit-tests: comment cond1 doterror dotwait error export export-all export-env forloop forsubst hash misc moderrs modmatch modmisc modorder modts modword order phony-end posix qequals sunshcmd sysv ternary test.exp unexport unexport-env varcmd varshell Log Message: Give each group of tests its own output file. * Rename each sub-makefile to *.mk; * Add a *.exp file of expected output for each sub-makefile; * Remove test.exp, which is replaced by all the other *.exp files. * Use suffix rules to generate *.rawout and *.out files for each test case. * Rewrite the test and accept targets to adapt to the new way. The old (now removed) test.exp file is almost identical to the concatenation (in the correct order) of all the new *.exp files. There are expected differences in makefile names embedded in the output, and the new "exit status" lines. Some old "*** Error code 1 (ignored)" lines are also removed (replaced by new "exit status 1" lines). To generate a diff of this commit: cvs rdiff -u -r1.41 -r1.42 src/usr.bin/make/unit-tests/Makefile cvs rdiff -u -r1.3 -r0 src/usr.bin/make/unit-tests/comment \ src/usr.bin/make/unit-tests/varcmd cvs rdiff -u -r0 -r1.1 src/usr.bin/make/unit-tests/comment.exp \ src/usr.bin/make/unit-tests/comment.mk \ src/usr.bin/make/unit-tests/cond1.exp \ src/usr.bin/make/unit-tests/cond1.mk \ src/usr.bin/make/unit-tests/doterror.exp \ src/usr.bin/make/unit-tests/doterror.mk \ src/usr.bin/make/unit-tests/dotwait.exp \ src/usr.bin/make/unit-tests/dotwait.mk \ src/usr.bin/make/unit-tests/error.exp \ src/usr.bin/make/unit-tests/error.mk \ src/usr.bin/make/unit-tests/export-all.exp \ src/usr.bin/make/unit-tests/export-all.mk \ src/usr.bin/make/unit-tests/export-env.exp \ src/usr.bin/make/unit-tests/export-env.mk \ src/usr.bin/make/unit-tests/export.exp \ src/usr.bin/make/unit-tests/export.mk \ src/usr.bin/make/unit-tests/forloop.exp \ src/usr.bin/make/unit-tests/forloop.mk \ src/usr.bin/make/unit-tests/forsubst.exp \ src/usr.bin/make/unit-tests/forsubst.mk \ src/usr.bin/make/unit-tests/hash.exp src/usr.bin/make/unit-tests/hash.mk \ src/usr.bin/make/unit-tests/misc.exp src/usr.bin/make/unit-tests/misc.mk \ src/usr.bin/make/unit-tests/moderrs.exp \ src/usr.bin/make/unit-tests/moderrs.mk \ src/usr.bin/make/unit-tests/modmatch.exp \ src/usr.bin/make/unit-tests/modmatch.mk \ src/usr.bin/make/unit-tests/modmisc.exp \ src/usr.bin/make/unit-tests/modmisc.mk \ src/usr.bin/make/unit-tests/modorder.exp \ src/usr.bin/make/unit-tests/modorder.mk \ src/usr.bin/make/unit-tests/modts.exp \ src/usr.bin/make/unit-tests/modts.mk \ src/usr.bin/make/unit-tests/modword.exp \ src/usr.bin/make/unit-tests/modword.mk \ src/usr.bin/make/unit-tests/order.exp \ src/usr.bin/make/unit-tests/order.mk \ src/usr.bin/make/unit-tests/phony-end.exp \ src/usr.bin/make/unit-tests/phony-end.mk \ src/usr.bin/make/unit-tests/posix.exp \ src/usr.bin/make/unit-tests/posix.mk \ src/usr.bin/make/unit-tests/qequals.exp \ src/usr.bin/make/unit-tests/qequals.mk \ src/usr.bin/make/unit-tests/sunshcmd.exp \ src/usr.bin/make/unit-tests/sunshcmd.mk \ src/usr.bin/make/unit-tests/sysv.exp src/usr.bin/make/unit-tests/sysv.mk \ src/usr.bin/make/unit-tests/ternary.exp \ src/usr.bin/make/unit-tests/ternary.mk \ src/usr.bin/make/unit-tests/unexport-env.exp \ src/usr.bin/make/unit-tests/unexport-env.mk \ src/usr.bin/make/unit-tests/unexport.exp \ src/usr.bin/make/unit-tests/unexport.mk \ src/usr.bin/make/unit-tests/varcmd.exp \ src/usr.bin/make/unit-tests/varcmd.mk \ src/usr.bin/make/unit-tests/varshell.exp \ src/usr.bin/make/unit-tests/varshell.mk cvs rdiff -u -r1.5 -r0 src/usr.bin/make/unit-tests/cond1 cvs rdiff -u -r1.1 -r0 src/usr.bin/make/unit-tests/doterror \ src/usr.bin/make/unit-tests/dotwait src/usr.bin/make/unit-tests/export \ src/usr.bin/make/unit-tests/export-env \ src/usr.bin/make/unit-tests/forloop src/usr.bin/make/unit-tests/forsubst \ src/usr.bin/make/unit-tests/hash src/usr.bin/make/unit-tests/misc \ src/usr.bin/make/unit-tests/modword src/usr.bin/make/unit-tests/order \ src/usr.bin/make/unit-tests/phony-end src/usr.bin/make/unit-tests/posix \ src/usr.bin/make/unit-tests/qequals src/usr.bin/make/unit-tests/sunshcmd \ src/usr.bin/make/unit-tests/unexport \ src/usr.bin/make/unit-tests/unexport-env \ src/usr.bin/make/unit-tests/varshell cvs rdiff -u -r1.2 -r0 src/usr.bin/make/unit-tests/error \ src/usr.bin/make/unit-tests/export-all \ src/usr.bin/make/unit-tests/moderrs src/usr.bin/make/unit-tests/modmatch \ src/usr.bin/make/unit-tests/modorder src/usr.bin/make/unit-tests/modts \ src/usr.bin/make/unit-tests/sysv src/usr.bin/make/unit-tests/ternary cvs rdiff -u -r1.7 -r0 src/usr.bin/make/unit-tests/modmisc cvs rdiff -u -r1.44 -r0 src/usr.bin/make/unit-tests/test.exp Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.