| @@ -1,14 +1,14 @@ | | | @@ -1,14 +1,14 @@ |
| 1 | # $NetBSD: Makefile,v 1.301 2022/01/27 02:24:46 sjg Exp $ | | 1 | # $NetBSD: Makefile,v 1.302 2022/01/27 21:50:50 sjg 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 |
| @@ -493,26 +493,27 @@ SED_CMDS.job-output-long-lines= \ | | | @@ -493,26 +493,27 @@ SED_CMDS.job-output-long-lines= \ |
| 493 | -e '/^--- job-[ab] ---$$/d' \ | | 493 | -e '/^--- job-[ab] ---$$/d' \ |
| 494 | ${:D Plain output lines are ok as well. } \ | | 494 | ${:D Plain output lines are ok as well. } \ |
| 495 | ${:D They may come in multiples of 1024 or as 10000. } \ | | 495 | ${:D They may come in multiples of 1024 or as 10000. } \ |
| 496 | -e '/^aa*$$/d' \ | | 496 | -e '/^aa*$$/d' \ |
| 497 | -e '/^bb*$$/d' \ | | 497 | -e '/^bb*$$/d' \ |
| 498 | ${:D The following lines should rather not occur since the job } \ | | 498 | ${:D The following lines should rather not occur since the job } \ |
| 499 | ${:D marker should always be at the beginning of the line. } \ | | 499 | ${:D marker should always be at the beginning of the line. } \ |
| 500 | -e '/^aa*--- job-b ---$$/d' \ | | 500 | -e '/^aa*--- job-b ---$$/d' \ |
| 501 | -e '/^bb*--- job-a ---$$/d' | | 501 | -e '/^bb*--- job-a ---$$/d' |
| 502 | SED_CMDS.opt-chdir= -e 's,\(nonexistent\).[1-9][0-9]*,\1,' | | 502 | SED_CMDS.opt-chdir= -e 's,\(nonexistent\).[1-9][0-9]*,\1,' |
| 503 | SED_CMDS.opt-debug-graph1= ${STD_SED_CMDS.dg1} | | 503 | SED_CMDS.opt-debug-graph1= ${STD_SED_CMDS.dg1} |
| 504 | SED_CMDS.opt-debug-graph2= ${STD_SED_CMDS.dg2} | | 504 | SED_CMDS.opt-debug-graph2= ${STD_SED_CMDS.dg2} |
| 505 | SED_CMDS.opt-debug-graph3= ${STD_SED_CMDS.dg3} | | 505 | SED_CMDS.opt-debug-graph3= ${STD_SED_CMDS.dg3} |
| | | 506 | SED_CMDS.opt-debug-hash= -e 's,\(numEntries\)=[1-9][0-9],\1=<entries>,' |
| 506 | SED_CMDS.opt-debug-jobs= -e 's,([0-9][0-9]*),(<pid>),' | | 507 | SED_CMDS.opt-debug-jobs= -e 's,([0-9][0-9]*),(<pid>),' |
| 507 | SED_CMDS.opt-debug-jobs+= -e 's,pid [0-9][0-9]*,pid <pid>,' | | 508 | SED_CMDS.opt-debug-jobs+= -e 's,pid [0-9][0-9]*,pid <pid>,' |
| 508 | SED_CMDS.opt-debug-jobs+= -e 's,Process [0-9][0-9]*,Process <pid>,' | | 509 | SED_CMDS.opt-debug-jobs+= -e 's,Process [0-9][0-9]*,Process <pid>,' |
| 509 | SED_CMDS.opt-debug-jobs+= -e 's,JobFinish: [0-9][0-9]*,JobFinish: <pid>,' | | 510 | SED_CMDS.opt-debug-jobs+= -e 's,JobFinish: [0-9][0-9]*,JobFinish: <pid>,' |
| 510 | SED_CMDS.opt-debug-jobs+= -e 's,Command: ${.SHELL:T},Command: <shell>,' | | 511 | SED_CMDS.opt-debug-jobs+= -e 's,Command: ${.SHELL:T},Command: <shell>,' |
| 511 | # The "-q" may be there or not, see jobs.c, variable shells. | | 512 | # The "-q" may be there or not, see jobs.c, variable shells. |
| 512 | SED_CMDS.opt-debug-jobs+= -e 's,^\(.Command: <shell>\) -q,\1,' | | 513 | SED_CMDS.opt-debug-jobs+= -e 's,^\(.Command: <shell>\) -q,\1,' |
| 513 | SED_CMDS.opt-debug-lint+= ${STD_SED_CMDS.regex} | | 514 | SED_CMDS.opt-debug-lint+= ${STD_SED_CMDS.regex} |
| 514 | SED_CMDS.opt-jobs-no-action= ${STD_SED_CMDS.hide-from-output} | | 515 | SED_CMDS.opt-jobs-no-action= ${STD_SED_CMDS.hide-from-output} |
| 515 | SED_CMDS.opt-no-action-runflags= ${STD_SED_CMDS.hide-from-output} | | 516 | SED_CMDS.opt-no-action-runflags= ${STD_SED_CMDS.hide-from-output} |
| 516 | SED_CMDS.opt-where-am-i= -e '/usr.obj/d' | | 517 | SED_CMDS.opt-where-am-i= -e '/usr.obj/d' |
| 517 | # For Compat_RunCommand, useShell == false. | | 518 | # For Compat_RunCommand, useShell == false. |
| 518 | SED_CMDS.sh-dots= -e 's,^.*\.\.\.:.*,<not found: ...>,' | | 519 | SED_CMDS.sh-dots= -e 's,^.*\.\.\.:.*,<not found: ...>,' |