From 13de33a5dc2304b13d595d75d48c51793958474f Mon Sep 17 00:00:00 2001 From: Julio Merino Date: Wed, 11 Dec 2013 04:09:17 +0000 Subject: [PATCH] Migrate tools/regression/bin/ tests to the new layout. This change is a proof of concept on how to easily integrate existing tests from the tools/regression/ hierarchy into the /usr/tests/ test suite and on how to adapt them to the new layout for src. To achieve these goals, this change: - Moves tests from tools/regression/bin// to bin//tests/. - Renames the previous regress.sh files to legacy_test.sh. - Adds Makefiles to build and install the tests and all their supporting data files into /usr/tests/bin/. - Plugs the legacy_test test programs into the test suite using the new TAP backend for Kyua (appearing in 0.8) so that the code of the test programs does not have to change. - Registers the new directories in the BSD.test.dist mtree file. Reviewed by: freebsd-testing Approved by: rpaulo (mentor) --- bin/Makefile | 4 + bin/date/Makefile | 6 + bin/date/tests/Makefile | 9 ++ .../date/tests/legacy_test.sh | 0 bin/mv/Makefile | 6 + bin/mv/tests/Makefile | 9 ++ .../regress.sh => bin/mv/tests/legacy_test.sh | 0 bin/pax/Makefile | 6 + bin/pax/tests/Makefile | 9 ++ .../regress.t => bin/pax/tests/legacy_test.sh | 0 bin/sh/Makefile | 7 +- bin/sh/tests/Makefile | 12 ++ bin/sh/tests/builtins/Makefile | 147 ++++++++++++++++++ .../bin/sh => bin/sh/tests}/builtins/alias.0 | 0 .../sh/tests}/builtins/alias.0.stdout | 0 .../bin/sh => bin/sh/tests}/builtins/alias.1 | 0 .../sh/tests}/builtins/alias.1.stderr | 0 .../bin/sh => bin/sh/tests}/builtins/alias3.0 | 0 .../sh/tests}/builtins/alias3.0.stdout | 0 .../bin/sh => bin/sh/tests}/builtins/alias4.0 | 0 .../bin/sh => bin/sh/tests}/builtins/break1.0 | 0 .../bin/sh => bin/sh/tests}/builtins/break2.0 | 0 .../sh/tests}/builtins/break2.0.stdout | 0 .../bin/sh => bin/sh/tests}/builtins/break3.0 | 0 .../bin/sh => bin/sh/tests}/builtins/break4.4 | 0 .../bin/sh => bin/sh/tests}/builtins/break5.4 | 0 .../sh => bin/sh/tests}/builtins/builtin1.0 | 0 .../bin/sh => bin/sh/tests}/builtins/case1.0 | 0 .../bin/sh => bin/sh/tests}/builtins/case10.0 | 0 .../bin/sh => bin/sh/tests}/builtins/case11.0 | 0 .../bin/sh => bin/sh/tests}/builtins/case12.0 | 0 .../bin/sh => bin/sh/tests}/builtins/case13.0 | 0 .../bin/sh => bin/sh/tests}/builtins/case14.0 | 0 .../bin/sh => bin/sh/tests}/builtins/case15.0 | 0 .../bin/sh => bin/sh/tests}/builtins/case16.0 | 0 .../bin/sh => bin/sh/tests}/builtins/case17.0 | 0 .../bin/sh => bin/sh/tests}/builtins/case18.0 | 0 .../bin/sh => bin/sh/tests}/builtins/case19.0 | 0 .../bin/sh => bin/sh/tests}/builtins/case2.0 | 0 .../bin/sh => bin/sh/tests}/builtins/case3.0 | 0 .../bin/sh => bin/sh/tests}/builtins/case4.0 | 0 .../bin/sh => bin/sh/tests}/builtins/case5.0 | 0 .../bin/sh => bin/sh/tests}/builtins/case6.0 | 0 .../bin/sh => bin/sh/tests}/builtins/case7.0 | 0 .../bin/sh => bin/sh/tests}/builtins/case8.0 | 0 .../bin/sh => bin/sh/tests}/builtins/case9.0 | 0 .../bin/sh => bin/sh/tests}/builtins/cd1.0 | 0 .../bin/sh => bin/sh/tests}/builtins/cd2.0 | 0 .../bin/sh => bin/sh/tests}/builtins/cd3.0 | 0 .../bin/sh => bin/sh/tests}/builtins/cd4.0 | 0 .../bin/sh => bin/sh/tests}/builtins/cd5.0 | 0 .../bin/sh => bin/sh/tests}/builtins/cd6.0 | 0 .../bin/sh => bin/sh/tests}/builtins/cd7.0 | 0 .../bin/sh => bin/sh/tests}/builtins/cd8.0 | 0 .../sh => bin/sh/tests}/builtins/command1.0 | 0 .../sh => bin/sh/tests}/builtins/command10.0 | 0 .../sh => bin/sh/tests}/builtins/command11.0 | 0 .../sh => bin/sh/tests}/builtins/command12.0 | 0 .../sh => bin/sh/tests}/builtins/command2.0 | 0 .../sh => bin/sh/tests}/builtins/command3.0 | 0 .../sh/tests}/builtins/command3.0.stdout | 0 .../sh => bin/sh/tests}/builtins/command4.0 | 0 .../sh => bin/sh/tests}/builtins/command5.0 | 0 .../sh/tests}/builtins/command5.0.stdout | 0 .../sh => bin/sh/tests}/builtins/command6.0 | 0 .../sh/tests}/builtins/command6.0.stdout | 0 .../sh => bin/sh/tests}/builtins/command7.0 | 0 .../sh => bin/sh/tests}/builtins/command8.0 | 0 .../sh => bin/sh/tests}/builtins/command9.0 | 0 .../bin/sh => bin/sh/tests}/builtins/dot1.0 | 0 .../bin/sh => bin/sh/tests}/builtins/dot2.0 | 0 .../bin/sh => bin/sh/tests}/builtins/dot3.0 | 0 .../bin/sh => bin/sh/tests}/builtins/dot4.0 | 0 .../bin/sh => bin/sh/tests}/builtins/eval1.0 | 0 .../bin/sh => bin/sh/tests}/builtins/eval2.0 | 0 .../bin/sh => bin/sh/tests}/builtins/eval3.0 | 0 .../bin/sh => bin/sh/tests}/builtins/eval4.0 | 0 .../bin/sh => bin/sh/tests}/builtins/eval5.0 | 0 .../bin/sh => bin/sh/tests}/builtins/eval6.0 | 0 .../bin/sh => bin/sh/tests}/builtins/exec1.0 | 0 .../bin/sh => bin/sh/tests}/builtins/exec2.0 | 0 .../bin/sh => bin/sh/tests}/builtins/exit1.0 | 0 .../bin/sh => bin/sh/tests}/builtins/exit2.8 | 0 .../bin/sh => bin/sh/tests}/builtins/exit3.0 | 0 .../sh => bin/sh/tests}/builtins/export1.0 | 0 .../bin/sh => bin/sh/tests}/builtins/fc1.0 | 0 .../bin/sh => bin/sh/tests}/builtins/fc2.0 | 0 .../bin/sh => bin/sh/tests}/builtins/for1.0 | 0 .../bin/sh => bin/sh/tests}/builtins/for2.0 | 0 .../bin/sh => bin/sh/tests}/builtins/for3.0 | 0 .../sh => bin/sh/tests}/builtins/getopts1.0 | 0 .../sh/tests}/builtins/getopts1.0.stdout | 0 .../sh => bin/sh/tests}/builtins/getopts2.0 | 0 .../sh/tests}/builtins/getopts2.0.stdout | 0 .../bin/sh => bin/sh/tests}/builtins/hash1.0 | 0 .../sh/tests}/builtins/hash1.0.stdout | 0 .../bin/sh => bin/sh/tests}/builtins/hash2.0 | 0 .../sh/tests}/builtins/hash2.0.stdout | 0 .../bin/sh => bin/sh/tests}/builtins/hash3.0 | 0 .../sh/tests}/builtins/hash3.0.stdout | 0 .../bin/sh => bin/sh/tests}/builtins/hash4.0 | 0 .../bin/sh => bin/sh/tests}/builtins/jobid1.0 | 0 .../bin/sh => bin/sh/tests}/builtins/jobid2.0 | 0 .../bin/sh => bin/sh/tests}/builtins/lineno.0 | 0 .../sh/tests}/builtins/lineno.0.stdout | 0 .../bin/sh => bin/sh/tests}/builtins/local1.0 | 0 .../bin/sh => bin/sh/tests}/builtins/local2.0 | 0 .../bin/sh => bin/sh/tests}/builtins/local3.0 | 0 .../bin/sh => bin/sh/tests}/builtins/local4.0 | 0 .../sh => bin/sh/tests}/builtins/locale1.0 | 0 .../sh => bin/sh/tests}/builtins/printf1.0 | 0 .../sh => bin/sh/tests}/builtins/printf2.0 | 0 .../sh => bin/sh/tests}/builtins/printf3.0 | 0 .../sh => bin/sh/tests}/builtins/printf4.0 | 0 .../bin/sh => bin/sh/tests}/builtins/read1.0 | 0 .../sh/tests}/builtins/read1.0.stdout | 0 .../bin/sh => bin/sh/tests}/builtins/read2.0 | 0 .../bin/sh => bin/sh/tests}/builtins/read3.0 | 0 .../sh/tests}/builtins/read3.0.stdout | 0 .../bin/sh => bin/sh/tests}/builtins/read4.0 | 0 .../sh/tests}/builtins/read4.0.stdout | 0 .../bin/sh => bin/sh/tests}/builtins/read5.0 | 0 .../bin/sh => bin/sh/tests}/builtins/read6.0 | 0 .../bin/sh => bin/sh/tests}/builtins/read7.0 | 0 .../sh => bin/sh/tests}/builtins/return1.0 | 0 .../sh => bin/sh/tests}/builtins/return2.1 | 0 .../sh => bin/sh/tests}/builtins/return3.1 | 0 .../sh => bin/sh/tests}/builtins/return4.0 | 0 .../sh => bin/sh/tests}/builtins/return5.0 | 0 .../sh => bin/sh/tests}/builtins/return6.4 | 0 .../sh => bin/sh/tests}/builtins/return7.4 | 0 .../sh => bin/sh/tests}/builtins/return8.0 | 0 .../bin/sh => bin/sh/tests}/builtins/set1.0 | 0 .../bin/sh => bin/sh/tests}/builtins/set2.0 | 0 .../bin/sh => bin/sh/tests}/builtins/trap1.0 | 0 .../bin/sh => bin/sh/tests}/builtins/trap10.0 | 0 .../bin/sh => bin/sh/tests}/builtins/trap11.0 | 0 .../bin/sh => bin/sh/tests}/builtins/trap12.0 | 0 .../bin/sh => bin/sh/tests}/builtins/trap13.0 | 0 .../bin/sh => bin/sh/tests}/builtins/trap14.0 | 0 .../bin/sh => bin/sh/tests}/builtins/trap2.0 | 0 .../bin/sh => bin/sh/tests}/builtins/trap3.0 | 0 .../bin/sh => bin/sh/tests}/builtins/trap4.0 | 0 .../bin/sh => bin/sh/tests}/builtins/trap5.0 | 0 .../bin/sh => bin/sh/tests}/builtins/trap6.0 | 0 .../bin/sh => bin/sh/tests}/builtins/trap7.0 | 0 .../bin/sh => bin/sh/tests}/builtins/trap8.0 | 0 .../bin/sh => bin/sh/tests}/builtins/trap9.0 | 0 .../bin/sh => bin/sh/tests}/builtins/type1.0 | 0 .../sh/tests}/builtins/type1.0.stderr | 0 .../bin/sh => bin/sh/tests}/builtins/type2.0 | 0 .../bin/sh => bin/sh/tests}/builtins/type3.0 | 0 .../sh => bin/sh/tests}/builtins/unalias.0 | 0 .../sh => bin/sh/tests}/builtins/var-assign.0 | 0 .../sh/tests}/builtins/var-assign2.0 | 0 .../bin/sh => bin/sh/tests}/builtins/wait1.0 | 0 .../bin/sh => bin/sh/tests}/builtins/wait10.0 | 0 .../bin/sh => bin/sh/tests}/builtins/wait2.0 | 0 .../bin/sh => bin/sh/tests}/builtins/wait3.0 | 0 .../bin/sh => bin/sh/tests}/builtins/wait4.0 | 0 .../bin/sh => bin/sh/tests}/builtins/wait5.0 | 0 .../bin/sh => bin/sh/tests}/builtins/wait6.0 | 0 .../bin/sh => bin/sh/tests}/builtins/wait7.0 | 0 .../bin/sh => bin/sh/tests}/builtins/wait8.0 | 0 .../sh => bin/sh/tests}/builtins/wait9.127 | 0 bin/sh/tests/errors/Makefile | 30 ++++ .../sh/tests}/errors/assignment-error1.0 | 0 .../sh/tests}/errors/assignment-error2.0 | 0 .../sh/tests}/errors/backquote-error1.0 | 0 .../sh/tests}/errors/backquote-error2.0 | 0 .../sh/tests}/errors/bad-binary1.126 | 0 .../sh => bin/sh/tests}/errors/bad-keyword1.0 | 0 .../sh/tests}/errors/bad-parm-exp1.0 | 0 .../sh/tests}/errors/bad-parm-exp2.2 | 0 .../sh/tests}/errors/bad-parm-exp2.2.stderr | 0 .../sh/tests}/errors/bad-parm-exp3.2 | 0 .../sh/tests}/errors/bad-parm-exp3.2.stderr | 0 .../sh/tests}/errors/bad-parm-exp4.2 | 0 .../sh/tests}/errors/bad-parm-exp4.2.stderr | 0 .../sh/tests}/errors/bad-parm-exp5.2 | 0 .../sh/tests}/errors/bad-parm-exp5.2.stderr | 0 .../sh/tests}/errors/bad-parm-exp6.2 | 0 .../sh/tests}/errors/bad-parm-exp6.2.stderr | 0 .../sh => bin/sh/tests}/errors/option-error.0 | 0 .../sh/tests}/errors/redirection-error.0 | 0 .../sh/tests}/errors/redirection-error2.2 | 0 .../sh/tests}/errors/redirection-error3.0 | 0 .../sh/tests}/errors/redirection-error4.0 | 0 .../sh/tests}/errors/redirection-error5.0 | 0 .../sh/tests}/errors/redirection-error6.0 | 0 .../sh/tests}/errors/redirection-error7.0 | 0 .../sh => bin/sh/tests}/errors/write-error1.0 | 0 bin/sh/tests/execution/Makefile | 53 +++++++ .../bin/sh => bin/sh/tests}/execution/bg1.0 | 0 .../bin/sh => bin/sh/tests}/execution/bg10.0 | 0 .../sh/tests}/execution/bg10.0.stdout | 0 .../bin/sh => bin/sh/tests}/execution/bg2.0 | 0 .../bin/sh => bin/sh/tests}/execution/bg3.0 | 0 .../bin/sh => bin/sh/tests}/execution/bg4.0 | 0 .../bin/sh => bin/sh/tests}/execution/bg5.0 | 0 .../bin/sh => bin/sh/tests}/execution/bg6.0 | 0 .../sh/tests}/execution/bg6.0.stdout | 0 .../bin/sh => bin/sh/tests}/execution/bg7.0 | 0 .../bin/sh => bin/sh/tests}/execution/bg8.0 | 0 .../bin/sh => bin/sh/tests}/execution/bg9.0 | 0 .../bin/sh => bin/sh/tests}/execution/fork1.0 | 0 .../bin/sh => bin/sh/tests}/execution/fork2.0 | 0 .../bin/sh => bin/sh/tests}/execution/fork3.0 | 0 .../bin/sh => bin/sh/tests}/execution/func1.0 | 0 .../bin/sh => bin/sh/tests}/execution/func2.0 | 0 .../bin/sh => bin/sh/tests}/execution/func3.0 | 0 .../bin/sh => bin/sh/tests}/execution/hash1.0 | 0 .../sh => bin/sh/tests}/execution/int-cmd1.0 | 0 .../sh => bin/sh/tests}/execution/killed1.0 | 0 .../sh => bin/sh/tests}/execution/killed2.0 | 0 .../bin/sh => bin/sh/tests}/execution/not1.0 | 0 .../bin/sh => bin/sh/tests}/execution/not2.0 | 0 .../bin/sh => bin/sh/tests}/execution/path1.0 | 0 .../sh => bin/sh/tests}/execution/redir1.0 | 0 .../sh => bin/sh/tests}/execution/redir2.0 | 0 .../sh => bin/sh/tests}/execution/redir3.0 | 0 .../sh => bin/sh/tests}/execution/redir4.0 | 0 .../sh => bin/sh/tests}/execution/redir5.0 | 0 .../sh => bin/sh/tests}/execution/redir6.0 | 0 .../sh => bin/sh/tests}/execution/redir7.0 | 0 .../sh => bin/sh/tests}/execution/set-n1.0 | 0 .../sh => bin/sh/tests}/execution/set-n2.0 | 0 .../sh => bin/sh/tests}/execution/set-n3.0 | 0 .../sh => bin/sh/tests}/execution/set-n4.0 | 0 .../sh => bin/sh/tests}/execution/set-x1.0 | 0 .../sh => bin/sh/tests}/execution/set-x2.0 | 0 .../sh => bin/sh/tests}/execution/set-x3.0 | 0 .../sh/tests}/execution/shellproc1.0 | 0 .../sh => bin/sh/tests}/execution/subshell1.0 | 0 .../sh/tests}/execution/subshell1.0.stdout | 0 .../sh => bin/sh/tests}/execution/subshell2.0 | 0 .../sh => bin/sh/tests}/execution/subshell3.0 | 0 .../sh => bin/sh/tests}/execution/subshell4.0 | 0 .../sh => bin/sh/tests}/execution/unknown1.0 | 0 .../sh/tests}/execution/var-assign1.0 | 0 bin/sh/tests/expansion/Makefile | 86 ++++++++++ .../sh => bin/sh/tests}/expansion/arith1.0 | 0 .../sh => bin/sh/tests}/expansion/arith10.0 | 0 .../sh => bin/sh/tests}/expansion/arith11.0 | 0 .../sh => bin/sh/tests}/expansion/arith12.0 | 0 .../sh => bin/sh/tests}/expansion/arith13.0 | 0 .../sh => bin/sh/tests}/expansion/arith2.0 | 0 .../sh => bin/sh/tests}/expansion/arith3.0 | 0 .../sh => bin/sh/tests}/expansion/arith4.0 | 0 .../sh => bin/sh/tests}/expansion/arith5.0 | 0 .../sh => bin/sh/tests}/expansion/arith6.0 | 0 .../sh => bin/sh/tests}/expansion/arith7.0 | 0 .../sh => bin/sh/tests}/expansion/arith8.0 | 0 .../sh => bin/sh/tests}/expansion/arith9.0 | 0 .../sh => bin/sh/tests}/expansion/assign1.0 | 0 .../sh => bin/sh/tests}/expansion/cmdsubst1.0 | 0 .../sh/tests}/expansion/cmdsubst10.0 | 0 .../sh/tests}/expansion/cmdsubst11.0 | 0 .../sh/tests}/expansion/cmdsubst12.0 | 0 .../sh/tests}/expansion/cmdsubst13.0 | 0 .../sh/tests}/expansion/cmdsubst14.0 | 0 .../sh/tests}/expansion/cmdsubst15.0 | 0 .../sh/tests}/expansion/cmdsubst16.0 | 0 .../sh/tests}/expansion/cmdsubst17.0 | 0 .../sh => bin/sh/tests}/expansion/cmdsubst2.0 | 0 .../sh => bin/sh/tests}/expansion/cmdsubst3.0 | 0 .../sh => bin/sh/tests}/expansion/cmdsubst4.0 | 0 .../sh => bin/sh/tests}/expansion/cmdsubst5.0 | 0 .../sh => bin/sh/tests}/expansion/cmdsubst6.0 | 0 .../sh => bin/sh/tests}/expansion/cmdsubst7.0 | 0 .../sh => bin/sh/tests}/expansion/cmdsubst8.0 | 0 .../sh => bin/sh/tests}/expansion/cmdsubst9.0 | 0 .../sh => bin/sh/tests}/expansion/export1.0 | 0 .../sh => bin/sh/tests}/expansion/export2.0 | 0 .../sh => bin/sh/tests}/expansion/export3.0 | 0 .../sh => bin/sh/tests}/expansion/heredoc1.0 | 0 .../sh => bin/sh/tests}/expansion/heredoc2.0 | 0 .../bin/sh => bin/sh/tests}/expansion/ifs1.0 | 0 .../bin/sh => bin/sh/tests}/expansion/ifs2.0 | 0 .../bin/sh => bin/sh/tests}/expansion/ifs3.0 | 0 .../bin/sh => bin/sh/tests}/expansion/ifs4.0 | 0 .../sh => bin/sh/tests}/expansion/length1.0 | 0 .../sh => bin/sh/tests}/expansion/length2.0 | 0 .../sh => bin/sh/tests}/expansion/length3.0 | 0 .../sh => bin/sh/tests}/expansion/length4.0 | 0 .../sh => bin/sh/tests}/expansion/length5.0 | 0 .../sh => bin/sh/tests}/expansion/length6.0 | 0 .../sh => bin/sh/tests}/expansion/length7.0 | 0 .../sh => bin/sh/tests}/expansion/length8.0 | 0 .../sh => bin/sh/tests}/expansion/local1.0 | 0 .../sh => bin/sh/tests}/expansion/local2.0 | 0 .../sh => bin/sh/tests}/expansion/pathname1.0 | 0 .../sh => bin/sh/tests}/expansion/pathname2.0 | 0 .../sh => bin/sh/tests}/expansion/pathname3.0 | 0 .../sh => bin/sh/tests}/expansion/pathname4.0 | 0 .../sh/tests}/expansion/plus-minus1.0 | 0 .../sh/tests}/expansion/plus-minus2.0 | 0 .../sh/tests}/expansion/plus-minus3.0 | 0 .../sh/tests}/expansion/plus-minus4.0 | 0 .../sh/tests}/expansion/plus-minus5.0 | 0 .../sh/tests}/expansion/plus-minus6.0 | 0 .../sh/tests}/expansion/plus-minus7.0 | 0 .../sh/tests}/expansion/plus-minus8.0 | 0 .../sh => bin/sh/tests}/expansion/question1.0 | 0 .../sh => bin/sh/tests}/expansion/readonly1.0 | 0 .../sh => bin/sh/tests}/expansion/set-u1.0 | 0 .../sh => bin/sh/tests}/expansion/set-u2.0 | 0 .../sh => bin/sh/tests}/expansion/set-u3.0 | 0 .../sh => bin/sh/tests}/expansion/tilde1.0 | 0 .../sh => bin/sh/tests}/expansion/tilde2.0 | 0 .../bin/sh => bin/sh/tests}/expansion/trim1.0 | 0 .../bin/sh => bin/sh/tests}/expansion/trim2.0 | 0 .../bin/sh => bin/sh/tests}/expansion/trim3.0 | 0 .../bin/sh => bin/sh/tests}/expansion/trim4.0 | 0 .../bin/sh => bin/sh/tests}/expansion/trim5.0 | 0 .../bin/sh => bin/sh/tests}/expansion/trim6.0 | 0 .../bin/sh => bin/sh/tests}/expansion/trim7.0 | 0 .../bin/sh => bin/sh/tests}/expansion/trim8.0 | 0 .../regress.sh => bin/sh/tests/legacy_test.sh | 16 +- bin/sh/tests/parameters/Makefile | 18 +++ .../bin/sh => bin/sh/tests}/parameters/env1.0 | 0 .../sh/tests}/parameters/exitstatus1.0 | 0 .../sh => bin/sh/tests}/parameters/mail1.0 | 0 .../sh => bin/sh/tests}/parameters/mail2.0 | 0 .../sh => bin/sh/tests}/parameters/optind1.0 | 0 .../sh/tests}/parameters/positional1.0 | 0 .../sh/tests}/parameters/positional2.0 | 0 .../bin/sh => bin/sh/tests}/parameters/pwd1.0 | 0 .../bin/sh => bin/sh/tests}/parameters/pwd2.0 | 0 bin/sh/tests/parser/Makefile | 59 +++++++ .../bin/sh => bin/sh/tests}/parser/alias1.0 | 0 .../bin/sh => bin/sh/tests}/parser/alias10.0 | 0 .../bin/sh => bin/sh/tests}/parser/alias2.0 | 0 .../bin/sh => bin/sh/tests}/parser/alias3.0 | 0 .../bin/sh => bin/sh/tests}/parser/alias4.0 | 0 .../bin/sh => bin/sh/tests}/parser/alias5.0 | 0 .../bin/sh => bin/sh/tests}/parser/alias6.0 | 0 .../bin/sh => bin/sh/tests}/parser/alias7.0 | 0 .../bin/sh => bin/sh/tests}/parser/alias8.0 | 0 .../bin/sh => bin/sh/tests}/parser/alias9.0 | 0 .../sh => bin/sh/tests}/parser/and-pipe-not.0 | 0 .../bin/sh => bin/sh/tests}/parser/case1.0 | 0 .../bin/sh => bin/sh/tests}/parser/case2.0 | 0 .../sh/tests}/parser/dollar-quote1.0 | 0 .../sh/tests}/parser/dollar-quote10.0 | 0 .../sh/tests}/parser/dollar-quote11.0 | 0 .../sh/tests}/parser/dollar-quote2.0 | 0 .../sh/tests}/parser/dollar-quote3.0 | 0 .../sh/tests}/parser/dollar-quote4.0 | 0 .../sh/tests}/parser/dollar-quote5.0 | 0 .../sh/tests}/parser/dollar-quote6.0 | 0 .../sh/tests}/parser/dollar-quote7.0 | 0 .../sh/tests}/parser/dollar-quote8.0 | 0 .../sh/tests}/parser/dollar-quote9.0 | 0 .../sh/tests}/parser/empty-braces1.0 | 0 .../sh => bin/sh/tests}/parser/empty-cmd1.0 | 0 .../bin/sh => bin/sh/tests}/parser/for1.0 | 0 .../bin/sh => bin/sh/tests}/parser/for2.0 | 0 .../bin/sh => bin/sh/tests}/parser/func1.0 | 0 .../bin/sh => bin/sh/tests}/parser/func2.0 | 0 .../bin/sh => bin/sh/tests}/parser/func3.0 | 0 .../bin/sh => bin/sh/tests}/parser/heredoc1.0 | 0 .../sh => bin/sh/tests}/parser/heredoc10.0 | 0 .../sh => bin/sh/tests}/parser/heredoc11.0 | 0 .../bin/sh => bin/sh/tests}/parser/heredoc2.0 | 0 .../bin/sh => bin/sh/tests}/parser/heredoc3.0 | 0 .../bin/sh => bin/sh/tests}/parser/heredoc4.0 | 0 .../bin/sh => bin/sh/tests}/parser/heredoc5.0 | 0 .../bin/sh => bin/sh/tests}/parser/heredoc6.0 | 0 .../bin/sh => bin/sh/tests}/parser/heredoc7.0 | 0 .../bin/sh => bin/sh/tests}/parser/heredoc8.0 | 0 .../bin/sh => bin/sh/tests}/parser/heredoc9.0 | 0 .../sh => bin/sh/tests}/parser/no-space1.0 | 0 .../sh => bin/sh/tests}/parser/no-space2.0 | 0 .../sh => bin/sh/tests}/parser/only-redir1.0 | 0 .../sh => bin/sh/tests}/parser/only-redir2.0 | 0 .../sh => bin/sh/tests}/parser/only-redir3.0 | 0 .../sh => bin/sh/tests}/parser/only-redir4.0 | 0 .../sh => bin/sh/tests}/parser/pipe-not1.0 | 0 .../sh => bin/sh/tests}/parser/var-assign1.0 | 0 bin/sh/tests/set-e/Makefile | 44 ++++++ .../bin/sh => bin/sh/tests}/set-e/and1.0 | 0 .../bin/sh => bin/sh/tests}/set-e/and2.1 | 0 .../bin/sh => bin/sh/tests}/set-e/and3.0 | 0 .../bin/sh => bin/sh/tests}/set-e/and4.0 | 0 .../sh => bin/sh/tests}/set-e/background1.0 | 0 .../bin/sh => bin/sh/tests}/set-e/cmd1.0 | 0 .../bin/sh => bin/sh/tests}/set-e/cmd2.1 | 0 .../bin/sh => bin/sh/tests}/set-e/elif1.0 | 0 .../bin/sh => bin/sh/tests}/set-e/elif2.0 | 0 .../bin/sh => bin/sh/tests}/set-e/eval1.0 | 0 .../bin/sh => bin/sh/tests}/set-e/eval2.1 | 0 .../bin/sh => bin/sh/tests}/set-e/for1.0 | 0 .../bin/sh => bin/sh/tests}/set-e/func1.0 | 0 .../bin/sh => bin/sh/tests}/set-e/func2.1 | 0 .../bin/sh => bin/sh/tests}/set-e/if1.0 | 0 .../bin/sh => bin/sh/tests}/set-e/if2.0 | 0 .../bin/sh => bin/sh/tests}/set-e/if3.0 | 0 .../bin/sh => bin/sh/tests}/set-e/not1.0 | 0 .../bin/sh => bin/sh/tests}/set-e/not2.0 | 0 .../bin/sh => bin/sh/tests}/set-e/or1.0 | 0 .../bin/sh => bin/sh/tests}/set-e/or2.0 | 0 .../bin/sh => bin/sh/tests}/set-e/or3.1 | 0 .../bin/sh => bin/sh/tests}/set-e/pipe1.1 | 0 .../bin/sh => bin/sh/tests}/set-e/pipe2.0 | 0 .../bin/sh => bin/sh/tests}/set-e/return1.0 | 0 .../bin/sh => bin/sh/tests}/set-e/semi1.1 | 0 .../bin/sh => bin/sh/tests}/set-e/semi2.1 | 0 .../bin/sh => bin/sh/tests}/set-e/subshell1.0 | 0 .../bin/sh => bin/sh/tests}/set-e/subshell2.1 | 0 .../bin/sh => bin/sh/tests}/set-e/until1.0 | 0 .../bin/sh => bin/sh/tests}/set-e/until2.0 | 0 .../bin/sh => bin/sh/tests}/set-e/until3.0 | 0 .../bin/sh => bin/sh/tests}/set-e/while1.0 | 0 .../bin/sh => bin/sh/tests}/set-e/while2.0 | 0 .../bin/sh => bin/sh/tests}/set-e/while3.0 | 0 bin/test/Makefile | 6 + bin/test/tests/Makefile | 9 ++ .../test/tests/legacy_test.sh | 0 bin/tests/Makefile | 10 ++ etc/mtree/BSD.tests.dist | 26 ++++ tools/regression/bin/Makefile | 5 - tools/regression/bin/date/Makefile | 4 - tools/regression/bin/date/regress.t | 6 - tools/regression/bin/mv/Makefile | 4 - tools/regression/bin/mv/regress.t | 6 - tools/regression/bin/pax/Makefile | 8 - tools/regression/bin/sh/Makefile | 7 - tools/regression/bin/sh/regress.t | 8 - tools/regression/bin/test/Makefile | 4 - tools/regression/bin/test/regress.t | 6 - 431 files changed, 564 insertions(+), 66 deletions(-) create mode 100644 bin/date/tests/Makefile rename tools/regression/bin/date/regress.sh => bin/date/tests/legacy_test.sh (100%) create mode 100644 bin/mv/tests/Makefile rename tools/regression/bin/mv/regress.sh => bin/mv/tests/legacy_test.sh (100%) create mode 100644 bin/pax/tests/Makefile rename tools/regression/bin/pax/regress.t => bin/pax/tests/legacy_test.sh (100%) mode change 100755 => 100644 create mode 100644 bin/sh/tests/Makefile create mode 100644 bin/sh/tests/builtins/Makefile rename {tools/regression/bin/sh => bin/sh/tests}/builtins/alias.0 (100%) rename {tools/regression/bin/sh => bin/sh/tests}/builtins/alias.0.stdout (100%) rename {tools/regression/bin/sh => bin/sh/tests}/builtins/alias.1 (100%) rename {tools/regression/bin/sh => bin/sh/tests}/builtins/alias.1.stderr (100%) rename {tools/regression/bin/sh => bin/sh/tests}/builtins/alias3.0 (100%) rename {tools/regression/bin/sh => bin/sh/tests}/builtins/alias3.0.stdout (100%) rename {tools/regression/bin/sh => bin/sh/tests}/builtins/alias4.0 (100%) rename {tools/regression/bin/sh => bin/sh/tests}/builtins/break1.0 (100%) rename {tools/regression/bin/sh => bin/sh/tests}/builtins/break2.0 (100%) rename {tools/regression/bin/sh => bin/sh/tests}/builtins/break2.0.stdout (100%) rename {tools/regression/bin/sh => bin/sh/tests}/builtins/break3.0 (100%) rename {tools/regression/bin/sh => bin/sh/tests}/builtins/break4.4 (100%) rename {tools/regression/bin/sh => bin/sh/tests}/builtins/break5.4 (100%) rename {tools/regression/bin/sh => bin/sh/tests}/builtins/builtin1.0 (100%) rename {tools/regression/bin/sh => bin/sh/tests}/builtins/case1.0 (100%) rename {tools/regression/bin/sh => bin/sh/tests}/builtins/case10.0 (100%) rename {tools/regression/bin/sh => bin/sh/tests}/builtins/case11.0 (100%) rename {tools/regression/bin/sh => bin/sh/tests}/builtins/case12.0 (100%) rename {tools/regression/bin/sh => bin/sh/tests}/builtins/case13.0 (100%) rename {tools/regression/bin/sh => bin/sh/tests}/builtins/case14.0 (100%) rename {tools/regression/bin/sh => bin/sh/tests}/builtins/case15.0 (100%) rename {tools/regression/bin/sh => bin/sh/tests}/builtins/case16.0 (100%) rename {tools/regression/bin/sh => bin/sh/tests}/builtins/case17.0 (100%) rename {tools/regression/bin/sh => bin/sh/tests}/builtins/case18.0 (100%) rename {tools/regression/bin/sh => bin/sh/tests}/builtins/case19.0 (100%) rename {tools/regression/bin/sh => bin/sh/tests}/builtins/case2.0 (100%) rename {tools/regression/bin/sh => bin/sh/tests}/builtins/case3.0 (100%) rename {tools/regression/bin/sh => bin/sh/tests}/builtins/case4.0 (100%) rename {tools/regression/bin/sh => bin/sh/tests}/builtins/case5.0 (100%) rename {tools/regression/bin/sh => bin/sh/tests}/builtins/case6.0 (100%) rename {tools/regression/bin/sh => bin/sh/tests}/builtins/case7.0 (100%) rename {tools/regression/bin/sh => bin/sh/tests}/builtins/case8.0 (100%) rename {tools/regression/bin/sh => bin/sh/tests}/builtins/case9.0 (100%) rename {tools/regression/bin/sh => bin/sh/tests}/builtins/cd1.0 (100%) rename {tools/regression/bin/sh => bin/sh/tests}/builtins/cd2.0 (100%) rename {tools/regression/bin/sh => bin/sh/tests}/builtins/cd3.0 (100%) rename {tools/regression/bin/sh => bin/sh/tests}/builtins/cd4.0 (100%) rename {tools/regression/bin/sh => bin/sh/tests}/builtins/cd5.0 (100%) rename {tools/regression/bin/sh => bin/sh/tests}/builtins/cd6.0 (100%) rename {tools/regression/bin/sh => bin/sh/tests}/builtins/cd7.0 (100%) rename {tools/regression/bin/sh => bin/sh/tests}/builtins/cd8.0 (100%) rename {tools/regression/bin/sh => bin/sh/tests}/builtins/command1.0 (100%) rename {tools/regression/bin/sh => bin/sh/tests}/builtins/command10.0 (100%) rename {tools/regression/bin/sh => bin/sh/tests}/builtins/command11.0 (100%) rename {tools/regression/bin/sh => bin/sh/tests}/builtins/command12.0 (100%) rename {tools/regression/bin/sh => bin/sh/tests}/builtins/command2.0 (100%) rename {tools/regression/bin/sh => bin/sh/tests}/builtins/command3.0 (100%) rename {tools/regression/bin/sh => bin/sh/tests}/builtins/command3.0.stdout (100%) rename {tools/regression/bin/sh => bin/sh/tests}/builtins/command4.0 (100%) rename {tools/regression/bin/sh => bin/sh/tests}/builtins/command5.0 (100%) rename {tools/regression/bin/sh => bin/sh/tests}/builtins/command5.0.stdout (100%) rename {tools/regression/bin/sh => bin/sh/tests}/builtins/command6.0 (100%) rename {tools/regression/bin/sh => bin/sh/tests}/builtins/command6.0.stdout (100%) rename {tools/regression/bin/sh => bin/sh/tests}/builtins/command7.0 (100%) rename {tools/regression/bin/sh => bin/sh/tests}/builtins/command8.0 (100%) rename {tools/regression/bin/sh => bin/sh/tests}/builtins/command9.0 (100%) rename {tools/regression/bin/sh => bin/sh/tests}/builtins/dot1.0 (100%) rename {tools/regression/bin/sh => bin/sh/tests}/builtins/dot2.0 (100%) rename {tools/regression/bin/sh => bin/sh/tests}/builtins/dot3.0 (100%) rename {tools/regression/bin/sh => bin/sh/tests}/builtins/dot4.0 (100%) rename {tools/regression/bin/sh => bin/sh/tests}/builtins/eval1.0 (100%) rename {tools/regression/bin/sh => bin/sh/tests}/builtins/eval2.0 (100%) rename {tools/regression/bin/sh => bin/sh/tests}/builtins/eval3.0 (100%) rename {tools/regression/bin/sh => bin/sh/tests}/builtins/eval4.0 (100%) rename {tools/regression/bin/sh => bin/sh/tests}/builtins/eval5.0 (100%) rename {tools/regression/bin/sh => bin/sh/tests}/builtins/eval6.0 (100%) rename {tools/regression/bin/sh => bin/sh/tests}/builtins/exec1.0 (100%) rename {tools/regression/bin/sh => bin/sh/tests}/builtins/exec2.0 (100%) rename {tools/regression/bin/sh => bin/sh/tests}/builtins/exit1.0 (100%) rename {tools/regression/bin/sh => bin/sh/tests}/builtins/exit2.8 (100%) rename {tools/regression/bin/sh => bin/sh/tests}/builtins/exit3.0 (100%) rename {tools/regression/bin/sh => bin/sh/tests}/builtins/export1.0 (100%) rename {tools/regression/bin/sh => bin/sh/tests}/builtins/fc1.0 (100%) rename {tools/regression/bin/sh => bin/sh/tests}/builtins/fc2.0 (100%) rename {tools/regression/bin/sh => bin/sh/tests}/builtins/for1.0 (100%) rename {tools/regression/bin/sh => bin/sh/tests}/builtins/for2.0 (100%) rename {tools/regression/bin/sh => bin/sh/tests}/builtins/for3.0 (100%) rename {tools/regression/bin/sh => bin/sh/tests}/builtins/getopts1.0 (100%) rename {tools/regression/bin/sh => bin/sh/tests}/builtins/getopts1.0.stdout (100%) rename {tools/regression/bin/sh => bin/sh/tests}/builtins/getopts2.0 (100%) rename {tools/regression/bin/sh => bin/sh/tests}/builtins/getopts2.0.stdout (100%) rename {tools/regression/bin/sh => bin/sh/tests}/builtins/hash1.0 (100%) rename {tools/regression/bin/sh => bin/sh/tests}/builtins/hash1.0.stdout (100%) rename {tools/regression/bin/sh => bin/sh/tests}/builtins/hash2.0 (100%) rename {tools/regression/bin/sh => bin/sh/tests}/builtins/hash2.0.stdout (100%) rename {tools/regression/bin/sh => bin/sh/tests}/builtins/hash3.0 (100%) rename {tools/regression/bin/sh => bin/sh/tests}/builtins/hash3.0.stdout (100%) rename {tools/regression/bin/sh => bin/sh/tests}/builtins/hash4.0 (100%) rename {tools/regression/bin/sh => bin/sh/tests}/builtins/jobid1.0 (100%) rename {tools/regression/bin/sh => bin/sh/tests}/builtins/jobid2.0 (100%) rename {tools/regression/bin/sh => bin/sh/tests}/builtins/lineno.0 (100%) rename {tools/regression/bin/sh => bin/sh/tests}/builtins/lineno.0.stdout (100%) rename {tools/regression/bin/sh => bin/sh/tests}/builtins/local1.0 (100%) rename {tools/regression/bin/sh => bin/sh/tests}/builtins/local2.0 (100%) rename {tools/regression/bin/sh => bin/sh/tests}/builtins/local3.0 (100%) rename {tools/regression/bin/sh => bin/sh/tests}/builtins/local4.0 (100%) rename {tools/regression/bin/sh => bin/sh/tests}/builtins/locale1.0 (100%) rename {tools/regression/bin/sh => bin/sh/tests}/builtins/printf1.0 (100%) rename {tools/regression/bin/sh => bin/sh/tests}/builtins/printf2.0 (100%) rename {tools/regression/bin/sh => bin/sh/tests}/builtins/printf3.0 (100%) rename {tools/regression/bin/sh => bin/sh/tests}/builtins/printf4.0 (100%) rename {tools/regression/bin/sh => bin/sh/tests}/builtins/read1.0 (100%) rename {tools/regression/bin/sh => bin/sh/tests}/builtins/read1.0.stdout (100%) rename {tools/regression/bin/sh => bin/sh/tests}/builtins/read2.0 (100%) rename {tools/regression/bin/sh => bin/sh/tests}/builtins/read3.0 (100%) rename {tools/regression/bin/sh => bin/sh/tests}/builtins/read3.0.stdout (100%) rename {tools/regression/bin/sh => bin/sh/tests}/builtins/read4.0 (100%) rename {tools/regression/bin/sh => bin/sh/tests}/builtins/read4.0.stdout (100%) rename {tools/regression/bin/sh => bin/sh/tests}/builtins/read5.0 (100%) rename {tools/regression/bin/sh => bin/sh/tests}/builtins/read6.0 (100%) rename {tools/regression/bin/sh => bin/sh/tests}/builtins/read7.0 (100%) rename {tools/regression/bin/sh => bin/sh/tests}/builtins/return1.0 (100%) rename {tools/regression/bin/sh => bin/sh/tests}/builtins/return2.1 (100%) rename {tools/regression/bin/sh => bin/sh/tests}/builtins/return3.1 (100%) rename {tools/regression/bin/sh => bin/sh/tests}/builtins/return4.0 (100%) rename {tools/regression/bin/sh => bin/sh/tests}/builtins/return5.0 (100%) rename {tools/regression/bin/sh => bin/sh/tests}/builtins/return6.4 (100%) rename {tools/regression/bin/sh => bin/sh/tests}/builtins/return7.4 (100%) rename {tools/regression/bin/sh => bin/sh/tests}/builtins/return8.0 (100%) rename {tools/regression/bin/sh => bin/sh/tests}/builtins/set1.0 (100%) rename {tools/regression/bin/sh => bin/sh/tests}/builtins/set2.0 (100%) rename {tools/regression/bin/sh => bin/sh/tests}/builtins/trap1.0 (100%) rename {tools/regression/bin/sh => bin/sh/tests}/builtins/trap10.0 (100%) rename {tools/regression/bin/sh => bin/sh/tests}/builtins/trap11.0 (100%) rename {tools/regression/bin/sh => bin/sh/tests}/builtins/trap12.0 (100%) rename {tools/regression/bin/sh => bin/sh/tests}/builtins/trap13.0 (100%) rename {tools/regression/bin/sh => bin/sh/tests}/builtins/trap14.0 (100%) rename {tools/regression/bin/sh => bin/sh/tests}/builtins/trap2.0 (100%) rename {tools/regression/bin/sh => bin/sh/tests}/builtins/trap3.0 (100%) rename {tools/regression/bin/sh => bin/sh/tests}/builtins/trap4.0 (100%) rename {tools/regression/bin/sh => bin/sh/tests}/builtins/trap5.0 (100%) rename {tools/regression/bin/sh => bin/sh/tests}/builtins/trap6.0 (100%) rename {tools/regression/bin/sh => bin/sh/tests}/builtins/trap7.0 (100%) rename {tools/regression/bin/sh => bin/sh/tests}/builtins/trap8.0 (100%) rename {tools/regression/bin/sh => bin/sh/tests}/builtins/trap9.0 (100%) rename {tools/regression/bin/sh => bin/sh/tests}/builtins/type1.0 (100%) rename {tools/regression/bin/sh => bin/sh/tests}/builtins/type1.0.stderr (100%) rename {tools/regression/bin/sh => bin/sh/tests}/builtins/type2.0 (100%) rename {tools/regression/bin/sh => bin/sh/tests}/builtins/type3.0 (100%) rename {tools/regression/bin/sh => bin/sh/tests}/builtins/unalias.0 (100%) rename {tools/regression/bin/sh => bin/sh/tests}/builtins/var-assign.0 (100%) rename {tools/regression/bin/sh => bin/sh/tests}/builtins/var-assign2.0 (100%) rename {tools/regression/bin/sh => bin/sh/tests}/builtins/wait1.0 (100%) rename {tools/regression/bin/sh => bin/sh/tests}/builtins/wait10.0 (100%) rename {tools/regression/bin/sh => bin/sh/tests}/builtins/wait2.0 (100%) rename {tools/regression/bin/sh => bin/sh/tests}/builtins/wait3.0 (100%) rename {tools/regression/bin/sh => bin/sh/tests}/builtins/wait4.0 (100%) rename {tools/regression/bin/sh => bin/sh/tests}/builtins/wait5.0 (100%) rename {tools/regression/bin/sh => bin/sh/tests}/builtins/wait6.0 (100%) rename {tools/regression/bin/sh => bin/sh/tests}/builtins/wait7.0 (100%) rename {tools/regression/bin/sh => bin/sh/tests}/builtins/wait8.0 (100%) rename {tools/regression/bin/sh => bin/sh/tests}/builtins/wait9.127 (100%) create mode 100644 bin/sh/tests/errors/Makefile rename {tools/regression/bin/sh => bin/sh/tests}/errors/assignment-error1.0 (100%) rename {tools/regression/bin/sh => bin/sh/tests}/errors/assignment-error2.0 (100%) rename {tools/regression/bin/sh => bin/sh/tests}/errors/backquote-error1.0 (100%) rename {tools/regression/bin/sh => bin/sh/tests}/errors/backquote-error2.0 (100%) rename {tools/regression/bin/sh => bin/sh/tests}/errors/bad-binary1.126 (100%) rename {tools/regression/bin/sh => bin/sh/tests}/errors/bad-keyword1.0 (100%) rename {tools/regression/bin/sh => bin/sh/tests}/errors/bad-parm-exp1.0 (100%) rename {tools/regression/bin/sh => bin/sh/tests}/errors/bad-parm-exp2.2 (100%) rename {tools/regression/bin/sh => bin/sh/tests}/errors/bad-parm-exp2.2.stderr (100%) rename {tools/regression/bin/sh => bin/sh/tests}/errors/bad-parm-exp3.2 (100%) rename {tools/regression/bin/sh => bin/sh/tests}/errors/bad-parm-exp3.2.stderr (100%) rename {tools/regression/bin/sh => bin/sh/tests}/errors/bad-parm-exp4.2 (100%) rename {tools/regression/bin/sh => bin/sh/tests}/errors/bad-parm-exp4.2.stderr (100%) rename {tools/regression/bin/sh => bin/sh/tests}/errors/bad-parm-exp5.2 (100%) rename {tools/regression/bin/sh => bin/sh/tests}/errors/bad-parm-exp5.2.stderr (100%) rename {tools/regression/bin/sh => bin/sh/tests}/errors/bad-parm-exp6.2 (100%) rename {tools/regression/bin/sh => bin/sh/tests}/errors/bad-parm-exp6.2.stderr (100%) rename {tools/regression/bin/sh => bin/sh/tests}/errors/option-error.0 (100%) rename {tools/regression/bin/sh => bin/sh/tests}/errors/redirection-error.0 (100%) rename {tools/regression/bin/sh => bin/sh/tests}/errors/redirection-error2.2 (100%) rename {tools/regression/bin/sh => bin/sh/tests}/errors/redirection-error3.0 (100%) rename {tools/regression/bin/sh => bin/sh/tests}/errors/redirection-error4.0 (100%) rename {tools/regression/bin/sh => bin/sh/tests}/errors/redirection-error5.0 (100%) rename {tools/regression/bin/sh => bin/sh/tests}/errors/redirection-error6.0 (100%) rename {tools/regression/bin/sh => bin/sh/tests}/errors/redirection-error7.0 (100%) rename {tools/regression/bin/sh => bin/sh/tests}/errors/write-error1.0 (100%) create mode 100644 bin/sh/tests/execution/Makefile rename {tools/regression/bin/sh => bin/sh/tests}/execution/bg1.0 (100%) rename {tools/regression/bin/sh => bin/sh/tests}/execution/bg10.0 (100%) rename {tools/regression/bin/sh => bin/sh/tests}/execution/bg10.0.stdout (100%) rename {tools/regression/bin/sh => bin/sh/tests}/execution/bg2.0 (100%) rename {tools/regression/bin/sh => bin/sh/tests}/execution/bg3.0 (100%) rename {tools/regression/bin/sh => bin/sh/tests}/execution/bg4.0 (100%) rename {tools/regression/bin/sh => bin/sh/tests}/execution/bg5.0 (100%) rename {tools/regression/bin/sh => bin/sh/tests}/execution/bg6.0 (100%) rename {tools/regression/bin/sh => bin/sh/tests}/execution/bg6.0.stdout (100%) rename {tools/regression/bin/sh => bin/sh/tests}/execution/bg7.0 (100%) rename {tools/regression/bin/sh => bin/sh/tests}/execution/bg8.0 (100%) rename {tools/regression/bin/sh => bin/sh/tests}/execution/bg9.0 (100%) rename {tools/regression/bin/sh => bin/sh/tests}/execution/fork1.0 (100%) rename {tools/regression/bin/sh => bin/sh/tests}/execution/fork2.0 (100%) rename {tools/regression/bin/sh => bin/sh/tests}/execution/fork3.0 (100%) rename {tools/regression/bin/sh => bin/sh/tests}/execution/func1.0 (100%) rename {tools/regression/bin/sh => bin/sh/tests}/execution/func2.0 (100%) rename {tools/regression/bin/sh => bin/sh/tests}/execution/func3.0 (100%) rename {tools/regression/bin/sh => bin/sh/tests}/execution/hash1.0 (100%) rename {tools/regression/bin/sh => bin/sh/tests}/execution/int-cmd1.0 (100%) rename {tools/regression/bin/sh => bin/sh/tests}/execution/killed1.0 (100%) rename {tools/regression/bin/sh => bin/sh/tests}/execution/killed2.0 (100%) rename {tools/regression/bin/sh => bin/sh/tests}/execution/not1.0 (100%) rename {tools/regression/bin/sh => bin/sh/tests}/execution/not2.0 (100%) rename {tools/regression/bin/sh => bin/sh/tests}/execution/path1.0 (100%) rename {tools/regression/bin/sh => bin/sh/tests}/execution/redir1.0 (100%) rename {tools/regression/bin/sh => bin/sh/tests}/execution/redir2.0 (100%) rename {tools/regression/bin/sh => bin/sh/tests}/execution/redir3.0 (100%) rename {tools/regression/bin/sh => bin/sh/tests}/execution/redir4.0 (100%) rename {tools/regression/bin/sh => bin/sh/tests}/execution/redir5.0 (100%) rename {tools/regression/bin/sh => bin/sh/tests}/execution/redir6.0 (100%) rename {tools/regression/bin/sh => bin/sh/tests}/execution/redir7.0 (100%) rename {tools/regression/bin/sh => bin/sh/tests}/execution/set-n1.0 (100%) rename {tools/regression/bin/sh => bin/sh/tests}/execution/set-n2.0 (100%) rename {tools/regression/bin/sh => bin/sh/tests}/execution/set-n3.0 (100%) rename {tools/regression/bin/sh => bin/sh/tests}/execution/set-n4.0 (100%) rename {tools/regression/bin/sh => bin/sh/tests}/execution/set-x1.0 (100%) rename {tools/regression/bin/sh => bin/sh/tests}/execution/set-x2.0 (100%) rename {tools/regression/bin/sh => bin/sh/tests}/execution/set-x3.0 (100%) rename {tools/regression/bin/sh => bin/sh/tests}/execution/shellproc1.0 (100%) rename {tools/regression/bin/sh => bin/sh/tests}/execution/subshell1.0 (100%) rename {tools/regression/bin/sh => bin/sh/tests}/execution/subshell1.0.stdout (100%) rename {tools/regression/bin/sh => bin/sh/tests}/execution/subshell2.0 (100%) rename {tools/regression/bin/sh => bin/sh/tests}/execution/subshell3.0 (100%) rename {tools/regression/bin/sh => bin/sh/tests}/execution/subshell4.0 (100%) rename {tools/regression/bin/sh => bin/sh/tests}/execution/unknown1.0 (100%) rename {tools/regression/bin/sh => bin/sh/tests}/execution/var-assign1.0 (100%) create mode 100644 bin/sh/tests/expansion/Makefile rename {tools/regression/bin/sh => bin/sh/tests}/expansion/arith1.0 (100%) rename {tools/regression/bin/sh => bin/sh/tests}/expansion/arith10.0 (100%) rename {tools/regression/bin/sh => bin/sh/tests}/expansion/arith11.0 (100%) rename {tools/regression/bin/sh => bin/sh/tests}/expansion/arith12.0 (100%) rename {tools/regression/bin/sh => bin/sh/tests}/expansion/arith13.0 (100%) rename {tools/regression/bin/sh => bin/sh/tests}/expansion/arith2.0 (100%) rename {tools/regression/bin/sh => bin/sh/tests}/expansion/arith3.0 (100%) rename {tools/regression/bin/sh => bin/sh/tests}/expansion/arith4.0 (100%) rename {tools/regression/bin/sh => bin/sh/tests}/expansion/arith5.0 (100%) rename {tools/regression/bin/sh => bin/sh/tests}/expansion/arith6.0 (100%) rename {tools/regression/bin/sh => bin/sh/tests}/expansion/arith7.0 (100%) rename {tools/regression/bin/sh => bin/sh/tests}/expansion/arith8.0 (100%) rename {tools/regression/bin/sh => bin/sh/tests}/expansion/arith9.0 (100%) rename {tools/regression/bin/sh => bin/sh/tests}/expansion/assign1.0 (100%) rename {tools/regression/bin/sh => bin/sh/tests}/expansion/cmdsubst1.0 (100%) rename {tools/regression/bin/sh => bin/sh/tests}/expansion/cmdsubst10.0 (100%) rename {tools/regression/bin/sh => bin/sh/tests}/expansion/cmdsubst11.0 (100%) rename {tools/regression/bin/sh => bin/sh/tests}/expansion/cmdsubst12.0 (100%) rename {tools/regression/bin/sh => bin/sh/tests}/expansion/cmdsubst13.0 (100%) rename {tools/regression/bin/sh => bin/sh/tests}/expansion/cmdsubst14.0 (100%) rename {tools/regression/bin/sh => bin/sh/tests}/expansion/cmdsubst15.0 (100%) rename {tools/regression/bin/sh => bin/sh/tests}/expansion/cmdsubst16.0 (100%) rename {tools/regression/bin/sh => bin/sh/tests}/expansion/cmdsubst17.0 (100%) rename {tools/regression/bin/sh => bin/sh/tests}/expansion/cmdsubst2.0 (100%) rename {tools/regression/bin/sh => bin/sh/tests}/expansion/cmdsubst3.0 (100%) rename {tools/regression/bin/sh => bin/sh/tests}/expansion/cmdsubst4.0 (100%) rename {tools/regression/bin/sh => bin/sh/tests}/expansion/cmdsubst5.0 (100%) rename {tools/regression/bin/sh => bin/sh/tests}/expansion/cmdsubst6.0 (100%) rename {tools/regression/bin/sh => bin/sh/tests}/expansion/cmdsubst7.0 (100%) rename {tools/regression/bin/sh => bin/sh/tests}/expansion/cmdsubst8.0 (100%) rename {tools/regression/bin/sh => bin/sh/tests}/expansion/cmdsubst9.0 (100%) rename {tools/regression/bin/sh => bin/sh/tests}/expansion/export1.0 (100%) rename {tools/regression/bin/sh => bin/sh/tests}/expansion/export2.0 (100%) rename {tools/regression/bin/sh => bin/sh/tests}/expansion/export3.0 (100%) rename {tools/regression/bin/sh => bin/sh/tests}/expansion/heredoc1.0 (100%) rename {tools/regression/bin/sh => bin/sh/tests}/expansion/heredoc2.0 (100%) rename {tools/regression/bin/sh => bin/sh/tests}/expansion/ifs1.0 (100%) rename {tools/regression/bin/sh => bin/sh/tests}/expansion/ifs2.0 (100%) rename {tools/regression/bin/sh => bin/sh/tests}/expansion/ifs3.0 (100%) rename {tools/regression/bin/sh => bin/sh/tests}/expansion/ifs4.0 (100%) rename {tools/regression/bin/sh => bin/sh/tests}/expansion/length1.0 (100%) rename {tools/regression/bin/sh => bin/sh/tests}/expansion/length2.0 (100%) rename {tools/regression/bin/sh => bin/sh/tests}/expansion/length3.0 (100%) rename {tools/regression/bin/sh => bin/sh/tests}/expansion/length4.0 (100%) rename {tools/regression/bin/sh => bin/sh/tests}/expansion/length5.0 (100%) rename {tools/regression/bin/sh => bin/sh/tests}/expansion/length6.0 (100%) rename {tools/regression/bin/sh => bin/sh/tests}/expansion/length7.0 (100%) rename {tools/regression/bin/sh => bin/sh/tests}/expansion/length8.0 (100%) rename {tools/regression/bin/sh => bin/sh/tests}/expansion/local1.0 (100%) rename {tools/regression/bin/sh => bin/sh/tests}/expansion/local2.0 (100%) rename {tools/regression/bin/sh => bin/sh/tests}/expansion/pathname1.0 (100%) rename {tools/regression/bin/sh => bin/sh/tests}/expansion/pathname2.0 (100%) rename {tools/regression/bin/sh => bin/sh/tests}/expansion/pathname3.0 (100%) rename {tools/regression/bin/sh => bin/sh/tests}/expansion/pathname4.0 (100%) rename {tools/regression/bin/sh => bin/sh/tests}/expansion/plus-minus1.0 (100%) rename {tools/regression/bin/sh => bin/sh/tests}/expansion/plus-minus2.0 (100%) rename {tools/regression/bin/sh => bin/sh/tests}/expansion/plus-minus3.0 (100%) rename {tools/regression/bin/sh => bin/sh/tests}/expansion/plus-minus4.0 (100%) rename {tools/regression/bin/sh => bin/sh/tests}/expansion/plus-minus5.0 (100%) rename {tools/regression/bin/sh => bin/sh/tests}/expansion/plus-minus6.0 (100%) rename {tools/regression/bin/sh => bin/sh/tests}/expansion/plus-minus7.0 (100%) rename {tools/regression/bin/sh => bin/sh/tests}/expansion/plus-minus8.0 (100%) rename {tools/regression/bin/sh => bin/sh/tests}/expansion/question1.0 (100%) rename {tools/regression/bin/sh => bin/sh/tests}/expansion/readonly1.0 (100%) rename {tools/regression/bin/sh => bin/sh/tests}/expansion/set-u1.0 (100%) rename {tools/regression/bin/sh => bin/sh/tests}/expansion/set-u2.0 (100%) rename {tools/regression/bin/sh => bin/sh/tests}/expansion/set-u3.0 (100%) rename {tools/regression/bin/sh => bin/sh/tests}/expansion/tilde1.0 (100%) rename {tools/regression/bin/sh => bin/sh/tests}/expansion/tilde2.0 (100%) rename {tools/regression/bin/sh => bin/sh/tests}/expansion/trim1.0 (100%) rename {tools/regression/bin/sh => bin/sh/tests}/expansion/trim2.0 (100%) rename {tools/regression/bin/sh => bin/sh/tests}/expansion/trim3.0 (100%) rename {tools/regression/bin/sh => bin/sh/tests}/expansion/trim4.0 (100%) rename {tools/regression/bin/sh => bin/sh/tests}/expansion/trim5.0 (100%) rename {tools/regression/bin/sh => bin/sh/tests}/expansion/trim6.0 (100%) rename {tools/regression/bin/sh => bin/sh/tests}/expansion/trim7.0 (100%) rename {tools/regression/bin/sh => bin/sh/tests}/expansion/trim8.0 (100%) rename tools/regression/bin/sh/regress.sh => bin/sh/tests/legacy_test.sh (64%) create mode 100644 bin/sh/tests/parameters/Makefile rename {tools/regression/bin/sh => bin/sh/tests}/parameters/env1.0 (100%) rename {tools/regression/bin/sh => bin/sh/tests}/parameters/exitstatus1.0 (100%) rename {tools/regression/bin/sh => bin/sh/tests}/parameters/mail1.0 (100%) rename {tools/regression/bin/sh => bin/sh/tests}/parameters/mail2.0 (100%) rename {tools/regression/bin/sh => bin/sh/tests}/parameters/optind1.0 (100%) rename {tools/regression/bin/sh => bin/sh/tests}/parameters/positional1.0 (100%) rename {tools/regression/bin/sh => bin/sh/tests}/parameters/positional2.0 (100%) rename {tools/regression/bin/sh => bin/sh/tests}/parameters/pwd1.0 (100%) rename {tools/regression/bin/sh => bin/sh/tests}/parameters/pwd2.0 (100%) create mode 100644 bin/sh/tests/parser/Makefile rename {tools/regression/bin/sh => bin/sh/tests}/parser/alias1.0 (100%) rename {tools/regression/bin/sh => bin/sh/tests}/parser/alias10.0 (100%) rename {tools/regression/bin/sh => bin/sh/tests}/parser/alias2.0 (100%) rename {tools/regression/bin/sh => bin/sh/tests}/parser/alias3.0 (100%) rename {tools/regression/bin/sh => bin/sh/tests}/parser/alias4.0 (100%) rename {tools/regression/bin/sh => bin/sh/tests}/parser/alias5.0 (100%) rename {tools/regression/bin/sh => bin/sh/tests}/parser/alias6.0 (100%) rename {tools/regression/bin/sh => bin/sh/tests}/parser/alias7.0 (100%) rename {tools/regression/bin/sh => bin/sh/tests}/parser/alias8.0 (100%) rename {tools/regression/bin/sh => bin/sh/tests}/parser/alias9.0 (100%) rename {tools/regression/bin/sh => bin/sh/tests}/parser/and-pipe-not.0 (100%) rename {tools/regression/bin/sh => bin/sh/tests}/parser/case1.0 (100%) rename {tools/regression/bin/sh => bin/sh/tests}/parser/case2.0 (100%) rename {tools/regression/bin/sh => bin/sh/tests}/parser/dollar-quote1.0 (100%) rename {tools/regression/bin/sh => bin/sh/tests}/parser/dollar-quote10.0 (100%) rename {tools/regression/bin/sh => bin/sh/tests}/parser/dollar-quote11.0 (100%) rename {tools/regression/bin/sh => bin/sh/tests}/parser/dollar-quote2.0 (100%) rename {tools/regression/bin/sh => bin/sh/tests}/parser/dollar-quote3.0 (100%) rename {tools/regression/bin/sh => bin/sh/tests}/parser/dollar-quote4.0 (100%) rename {tools/regression/bin/sh => bin/sh/tests}/parser/dollar-quote5.0 (100%) rename {tools/regression/bin/sh => bin/sh/tests}/parser/dollar-quote6.0 (100%) rename {tools/regression/bin/sh => bin/sh/tests}/parser/dollar-quote7.0 (100%) rename {tools/regression/bin/sh => bin/sh/tests}/parser/dollar-quote8.0 (100%) rename {tools/regression/bin/sh => bin/sh/tests}/parser/dollar-quote9.0 (100%) rename {tools/regression/bin/sh => bin/sh/tests}/parser/empty-braces1.0 (100%) rename {tools/regression/bin/sh => bin/sh/tests}/parser/empty-cmd1.0 (100%) rename {tools/regression/bin/sh => bin/sh/tests}/parser/for1.0 (100%) rename {tools/regression/bin/sh => bin/sh/tests}/parser/for2.0 (100%) rename {tools/regression/bin/sh => bin/sh/tests}/parser/func1.0 (100%) rename {tools/regression/bin/sh => bin/sh/tests}/parser/func2.0 (100%) rename {tools/regression/bin/sh => bin/sh/tests}/parser/func3.0 (100%) rename {tools/regression/bin/sh => bin/sh/tests}/parser/heredoc1.0 (100%) rename {tools/regression/bin/sh => bin/sh/tests}/parser/heredoc10.0 (100%) rename {tools/regression/bin/sh => bin/sh/tests}/parser/heredoc11.0 (100%) rename {tools/regression/bin/sh => bin/sh/tests}/parser/heredoc2.0 (100%) rename {tools/regression/bin/sh => bin/sh/tests}/parser/heredoc3.0 (100%) rename {tools/regression/bin/sh => bin/sh/tests}/parser/heredoc4.0 (100%) rename {tools/regression/bin/sh => bin/sh/tests}/parser/heredoc5.0 (100%) rename {tools/regression/bin/sh => bin/sh/tests}/parser/heredoc6.0 (100%) rename {tools/regression/bin/sh => bin/sh/tests}/parser/heredoc7.0 (100%) rename {tools/regression/bin/sh => bin/sh/tests}/parser/heredoc8.0 (100%) rename {tools/regression/bin/sh => bin/sh/tests}/parser/heredoc9.0 (100%) rename {tools/regression/bin/sh => bin/sh/tests}/parser/no-space1.0 (100%) rename {tools/regression/bin/sh => bin/sh/tests}/parser/no-space2.0 (100%) rename {tools/regression/bin/sh => bin/sh/tests}/parser/only-redir1.0 (100%) rename {tools/regression/bin/sh => bin/sh/tests}/parser/only-redir2.0 (100%) rename {tools/regression/bin/sh => bin/sh/tests}/parser/only-redir3.0 (100%) rename {tools/regression/bin/sh => bin/sh/tests}/parser/only-redir4.0 (100%) rename {tools/regression/bin/sh => bin/sh/tests}/parser/pipe-not1.0 (100%) rename {tools/regression/bin/sh => bin/sh/tests}/parser/var-assign1.0 (100%) create mode 100644 bin/sh/tests/set-e/Makefile rename {tools/regression/bin/sh => bin/sh/tests}/set-e/and1.0 (100%) rename {tools/regression/bin/sh => bin/sh/tests}/set-e/and2.1 (100%) rename {tools/regression/bin/sh => bin/sh/tests}/set-e/and3.0 (100%) rename {tools/regression/bin/sh => bin/sh/tests}/set-e/and4.0 (100%) rename {tools/regression/bin/sh => bin/sh/tests}/set-e/background1.0 (100%) rename {tools/regression/bin/sh => bin/sh/tests}/set-e/cmd1.0 (100%) rename {tools/regression/bin/sh => bin/sh/tests}/set-e/cmd2.1 (100%) rename {tools/regression/bin/sh => bin/sh/tests}/set-e/elif1.0 (100%) rename {tools/regression/bin/sh => bin/sh/tests}/set-e/elif2.0 (100%) rename {tools/regression/bin/sh => bin/sh/tests}/set-e/eval1.0 (100%) rename {tools/regression/bin/sh => bin/sh/tests}/set-e/eval2.1 (100%) rename {tools/regression/bin/sh => bin/sh/tests}/set-e/for1.0 (100%) rename {tools/regression/bin/sh => bin/sh/tests}/set-e/func1.0 (100%) rename {tools/regression/bin/sh => bin/sh/tests}/set-e/func2.1 (100%) rename {tools/regression/bin/sh => bin/sh/tests}/set-e/if1.0 (100%) rename {tools/regression/bin/sh => bin/sh/tests}/set-e/if2.0 (100%) rename {tools/regression/bin/sh => bin/sh/tests}/set-e/if3.0 (100%) rename {tools/regression/bin/sh => bin/sh/tests}/set-e/not1.0 (100%) rename {tools/regression/bin/sh => bin/sh/tests}/set-e/not2.0 (100%) rename {tools/regression/bin/sh => bin/sh/tests}/set-e/or1.0 (100%) rename {tools/regression/bin/sh => bin/sh/tests}/set-e/or2.0 (100%) rename {tools/regression/bin/sh => bin/sh/tests}/set-e/or3.1 (100%) rename {tools/regression/bin/sh => bin/sh/tests}/set-e/pipe1.1 (100%) rename {tools/regression/bin/sh => bin/sh/tests}/set-e/pipe2.0 (100%) rename {tools/regression/bin/sh => bin/sh/tests}/set-e/return1.0 (100%) rename {tools/regression/bin/sh => bin/sh/tests}/set-e/semi1.1 (100%) rename {tools/regression/bin/sh => bin/sh/tests}/set-e/semi2.1 (100%) rename {tools/regression/bin/sh => bin/sh/tests}/set-e/subshell1.0 (100%) rename {tools/regression/bin/sh => bin/sh/tests}/set-e/subshell2.1 (100%) rename {tools/regression/bin/sh => bin/sh/tests}/set-e/until1.0 (100%) rename {tools/regression/bin/sh => bin/sh/tests}/set-e/until2.0 (100%) rename {tools/regression/bin/sh => bin/sh/tests}/set-e/until3.0 (100%) rename {tools/regression/bin/sh => bin/sh/tests}/set-e/while1.0 (100%) rename {tools/regression/bin/sh => bin/sh/tests}/set-e/while2.0 (100%) rename {tools/regression/bin/sh => bin/sh/tests}/set-e/while3.0 (100%) create mode 100644 bin/test/tests/Makefile rename tools/regression/bin/test/regress.sh => bin/test/tests/legacy_test.sh (100%) create mode 100644 bin/tests/Makefile delete mode 100644 tools/regression/bin/Makefile delete mode 100644 tools/regression/bin/date/Makefile delete mode 100644 tools/regression/bin/date/regress.t delete mode 100644 tools/regression/bin/mv/Makefile delete mode 100644 tools/regression/bin/mv/regress.t delete mode 100644 tools/regression/bin/pax/Makefile delete mode 100644 tools/regression/bin/sh/Makefile delete mode 100644 tools/regression/bin/sh/regress.t delete mode 100644 tools/regression/bin/test/Makefile delete mode 100644 tools/regression/bin/test/regress.t diff --git a/bin/Makefile b/bin/Makefile index 7b6a4ab8c8c0..e4bc281db638 100644 --- a/bin/Makefile +++ b/bin/Makefile @@ -52,6 +52,10 @@ SUBDIR+= rmail SUBDIR+= csh .endif +.if ${MK_TESTS} != "no" +SUBDIR+= tests +.endif + .include SUBDIR:= ${SUBDIR:O} diff --git a/bin/date/Makefile b/bin/date/Makefile index 4f5c3fea3a58..6da5848e16ab 100644 --- a/bin/date/Makefile +++ b/bin/date/Makefile @@ -1,7 +1,13 @@ # @(#)Makefile 8.1 (Berkeley) 5/31/93 # $FreeBSD$ +.include + PROG= date SRCS= date.c netdate.c vary.c +.if ${MK_TESTS} != "no" +SUBDIR+= tests +.endif + .include diff --git a/bin/date/tests/Makefile b/bin/date/tests/Makefile new file mode 100644 index 000000000000..540008be2899 --- /dev/null +++ b/bin/date/tests/Makefile @@ -0,0 +1,9 @@ +# $FreeBSD$ + +.include + +TESTSDIR= ${TESTSBASE}/bin/date + +TAP_TESTS_SH= legacy_test + +.include diff --git a/tools/regression/bin/date/regress.sh b/bin/date/tests/legacy_test.sh similarity index 100% rename from tools/regression/bin/date/regress.sh rename to bin/date/tests/legacy_test.sh diff --git a/bin/mv/Makefile b/bin/mv/Makefile index 840578276d5a..ad8cc4f02d44 100644 --- a/bin/mv/Makefile +++ b/bin/mv/Makefile @@ -1,6 +1,12 @@ # @(#)Makefile 8.2 (Berkeley) 4/2/94 # $FreeBSD$ +.include + PROG= mv +.if ${MK_TESTS} != "no" +SUBDIR+= tests +.endif + .include diff --git a/bin/mv/tests/Makefile b/bin/mv/tests/Makefile new file mode 100644 index 000000000000..051a3b6177e9 --- /dev/null +++ b/bin/mv/tests/Makefile @@ -0,0 +1,9 @@ +# $FreeBSD$ + +.include + +TESTSDIR= ${TESTSBASE}/bin/mv + +TAP_TESTS_SH= legacy_test + +.include diff --git a/tools/regression/bin/mv/regress.sh b/bin/mv/tests/legacy_test.sh similarity index 100% rename from tools/regression/bin/mv/regress.sh rename to bin/mv/tests/legacy_test.sh diff --git a/bin/pax/Makefile b/bin/pax/Makefile index 9e8d4e111862..95f18bba1c06 100644 --- a/bin/pax/Makefile +++ b/bin/pax/Makefile @@ -1,6 +1,8 @@ # @(#)Makefile 8.1 (Berkeley) 5/31/93 # $FreeBSD$ +.include + # To install on versions prior to BSD 4.4 the following may have to be # defined with CFLAGS += # @@ -30,4 +32,8 @@ SRCS= ar_io.c ar_subs.c buf_subs.c cache.c cpio.c file_subs.c ftree.c \ gen_subs.c getoldopt.c options.c pat_rep.c pax.c sel_subs.c \ tables.c tar.c tty_subs.c +.if ${MK_TESTS} != "no" +SUBDIR+= tests +.endif + .include diff --git a/bin/pax/tests/Makefile b/bin/pax/tests/Makefile new file mode 100644 index 000000000000..b3c4b85d7175 --- /dev/null +++ b/bin/pax/tests/Makefile @@ -0,0 +1,9 @@ +# $FreeBSD$ + +.include + +TESTSDIR= ${TESTSBASE}/bin/pax + +TAP_TESTS_SH= legacy_test + +.include diff --git a/tools/regression/bin/pax/regress.t b/bin/pax/tests/legacy_test.sh old mode 100755 new mode 100644 similarity index 100% rename from tools/regression/bin/pax/regress.t rename to bin/pax/tests/legacy_test.sh diff --git a/bin/sh/Makefile b/bin/sh/Makefile index 00d34fa749da..e1ce5feb1851 100644 --- a/bin/sh/Makefile +++ b/bin/sh/Makefile @@ -1,6 +1,8 @@ # @(#)Makefile 8.4 (Berkeley) 5/5/95 # $FreeBSD$ +.include + PROG= sh INSTALLFLAGS= -S SHSRCS= alias.c arith_yacc.c arith_yylex.c cd.c echo.c error.c eval.c \ @@ -59,7 +61,8 @@ syntax.c syntax.h: mksyntax token.h: mktokens sh ${.CURDIR}/mktokens -regress: - cd ${.CURDIR}/../../tools/regression/bin/sh && ${MAKE} SH=${.OBJDIR}/sh +.if ${MK_TESTS} != "no" +SUBDIR+= tests +.endif .include diff --git a/bin/sh/tests/Makefile b/bin/sh/tests/Makefile new file mode 100644 index 000000000000..cd8b7a2958bc --- /dev/null +++ b/bin/sh/tests/Makefile @@ -0,0 +1,12 @@ +# $FreeBSD$ + +.include + +TESTSDIR= ${TESTSBASE}/bin/sh + +TAP_TESTS_SH= legacy_test +TAP_TESTS_SH_SED_legacy_test= -e 's,__SH__,/bin/sh,g' + +SUBDIR+= builtins errors execution expansion parameters parser set-e + +.include diff --git a/bin/sh/tests/builtins/Makefile b/bin/sh/tests/builtins/Makefile new file mode 100644 index 000000000000..3b1d24b2a959 --- /dev/null +++ b/bin/sh/tests/builtins/Makefile @@ -0,0 +1,147 @@ +# $FreeBSD$ + +.include + +FILESDIR= ${TESTSBASE}/bin/sh/builtins +KYUAFILE= no + +FILES= alias.0 alias.0.stdout +FILES+= alias.1 alias.1.stderr +FILES+= alias3.0 alias3.0.stdout +FILES+= alias4.0 +FILES+= break1.0 +FILES+= break2.0 break2.0.stdout +FILES+= break3.0 +FILES+= break4.4 +FILES+= break5.4 +FILES+= builtin1.0 +FILES+= case1.0 +FILES+= case2.0 +FILES+= case3.0 +FILES+= case4.0 +FILES+= case5.0 +FILES+= case6.0 +FILES+= case7.0 +FILES+= case8.0 +FILES+= case9.0 +FILES+= case10.0 +FILES+= case11.0 +FILES+= case12.0 +FILES+= case13.0 +FILES+= case14.0 +FILES+= case15.0 +FILES+= case16.0 +FILES+= case17.0 +FILES+= case18.0 +FILES+= case19.0 +FILES+= cd1.0 +FILES+= cd2.0 +FILES+= cd3.0 +FILES+= cd4.0 +FILES+= cd5.0 +FILES+= cd6.0 +FILES+= cd7.0 +FILES+= cd8.0 +FILES+= command1.0 +FILES+= command2.0 +FILES+= command3.0 +FILES+= command3.0.stdout +FILES+= command4.0 +FILES+= command5.0 +FILES+= command5.0.stdout +FILES+= command6.0 +FILES+= command6.0.stdout +FILES+= command7.0 +FILES+= command8.0 +FILES+= command9.0 +FILES+= command10.0 +FILES+= command11.0 +FILES+= command12.0 +FILES+= dot1.0 +FILES+= dot2.0 +FILES+= dot3.0 +FILES+= dot4.0 +FILES+= eval1.0 +FILES+= eval2.0 +FILES+= eval3.0 +FILES+= eval4.0 +FILES+= eval5.0 +FILES+= eval6.0 +FILES+= exec1.0 +FILES+= exec2.0 +FILES+= exit1.0 +FILES+= exit2.8 +FILES+= exit3.0 +FILES+= export1.0 +FILES+= fc1.0 +FILES+= fc2.0 +FILES+= for1.0 +FILES+= for2.0 +FILES+= for3.0 +FILES+= getopts1.0 getopts1.0.stdout +FILES+= getopts2.0 getopts2.0.stdout +FILES+= hash1.0 hash1.0.stdout +FILES+= hash2.0 hash2.0.stdout +FILES+= hash3.0 hash3.0.stdout +FILES+= hash4.0 +FILES+= jobid1.0 +FILES+= jobid2.0 +FILES+= lineno.0 lineno.0.stdout +FILES+= local1.0 +FILES+= local2.0 +FILES+= local3.0 +FILES+= local4.0 +FILES+= locale1.0 +FILES+= printf1.0 +FILES+= printf2.0 +FILES+= printf3.0 +FILES+= printf4.0 +FILES+= read1.0 read1.0.stdout +FILES+= read2.0 +FILES+= read3.0 read3.0.stdout +FILES+= read4.0 read4.0.stdout +FILES+= read5.0 +FILES+= read6.0 +FILES+= read7.0 +FILES+= return1.0 +FILES+= return2.1 +FILES+= return3.1 +FILES+= return4.0 +FILES+= return5.0 +FILES+= return6.4 +FILES+= return7.4 +FILES+= return8.0 +FILES+= set1.0 +FILES+= set2.0 +FILES+= trap1.0 +FILES+= trap10.0 +FILES+= trap11.0 +FILES+= trap12.0 +FILES+= trap13.0 +FILES+= trap14.0 +FILES+= trap2.0 +FILES+= trap3.0 +FILES+= trap4.0 +FILES+= trap5.0 +FILES+= trap6.0 +FILES+= trap7.0 +FILES+= trap8.0 +FILES+= trap9.0 +FILES+= type1.0 type1.0.stderr +FILES+= type2.0 +FILES+= type3.0 +FILES+= unalias.0 +FILES+= var-assign.0 +FILES+= var-assign2.0 +FILES+= wait1.0 +FILES+= wait2.0 +FILES+= wait3.0 +FILES+= wait4.0 +FILES+= wait5.0 +FILES+= wait6.0 +FILES+= wait7.0 +FILES+= wait8.0 +FILES+= wait9.127 +FILES+= wait10.0 + +.include diff --git a/tools/regression/bin/sh/builtins/alias.0 b/bin/sh/tests/builtins/alias.0 similarity index 100% rename from tools/regression/bin/sh/builtins/alias.0 rename to bin/sh/tests/builtins/alias.0 diff --git a/tools/regression/bin/sh/builtins/alias.0.stdout b/bin/sh/tests/builtins/alias.0.stdout similarity index 100% rename from tools/regression/bin/sh/builtins/alias.0.stdout rename to bin/sh/tests/builtins/alias.0.stdout diff --git a/tools/regression/bin/sh/builtins/alias.1 b/bin/sh/tests/builtins/alias.1 similarity index 100% rename from tools/regression/bin/sh/builtins/alias.1 rename to bin/sh/tests/builtins/alias.1 diff --git a/tools/regression/bin/sh/builtins/alias.1.stderr b/bin/sh/tests/builtins/alias.1.stderr similarity index 100% rename from tools/regression/bin/sh/builtins/alias.1.stderr rename to bin/sh/tests/builtins/alias.1.stderr diff --git a/tools/regression/bin/sh/builtins/alias3.0 b/bin/sh/tests/builtins/alias3.0 similarity index 100% rename from tools/regression/bin/sh/builtins/alias3.0 rename to bin/sh/tests/builtins/alias3.0 diff --git a/tools/regression/bin/sh/builtins/alias3.0.stdout b/bin/sh/tests/builtins/alias3.0.stdout similarity index 100% rename from tools/regression/bin/sh/builtins/alias3.0.stdout rename to bin/sh/tests/builtins/alias3.0.stdout diff --git a/tools/regression/bin/sh/builtins/alias4.0 b/bin/sh/tests/builtins/alias4.0 similarity index 100% rename from tools/regression/bin/sh/builtins/alias4.0 rename to bin/sh/tests/builtins/alias4.0 diff --git a/tools/regression/bin/sh/builtins/break1.0 b/bin/sh/tests/builtins/break1.0 similarity index 100% rename from tools/regression/bin/sh/builtins/break1.0 rename to bin/sh/tests/builtins/break1.0 diff --git a/tools/regression/bin/sh/builtins/break2.0 b/bin/sh/tests/builtins/break2.0 similarity index 100% rename from tools/regression/bin/sh/builtins/break2.0 rename to bin/sh/tests/builtins/break2.0 diff --git a/tools/regression/bin/sh/builtins/break2.0.stdout b/bin/sh/tests/builtins/break2.0.stdout similarity index 100% rename from tools/regression/bin/sh/builtins/break2.0.stdout rename to bin/sh/tests/builtins/break2.0.stdout diff --git a/tools/regression/bin/sh/builtins/break3.0 b/bin/sh/tests/builtins/break3.0 similarity index 100% rename from tools/regression/bin/sh/builtins/break3.0 rename to bin/sh/tests/builtins/break3.0 diff --git a/tools/regression/bin/sh/builtins/break4.4 b/bin/sh/tests/builtins/break4.4 similarity index 100% rename from tools/regression/bin/sh/builtins/break4.4 rename to bin/sh/tests/builtins/break4.4 diff --git a/tools/regression/bin/sh/builtins/break5.4 b/bin/sh/tests/builtins/break5.4 similarity index 100% rename from tools/regression/bin/sh/builtins/break5.4 rename to bin/sh/tests/builtins/break5.4 diff --git a/tools/regression/bin/sh/builtins/builtin1.0 b/bin/sh/tests/builtins/builtin1.0 similarity index 100% rename from tools/regression/bin/sh/builtins/builtin1.0 rename to bin/sh/tests/builtins/builtin1.0 diff --git a/tools/regression/bin/sh/builtins/case1.0 b/bin/sh/tests/builtins/case1.0 similarity index 100% rename from tools/regression/bin/sh/builtins/case1.0 rename to bin/sh/tests/builtins/case1.0 diff --git a/tools/regression/bin/sh/builtins/case10.0 b/bin/sh/tests/builtins/case10.0 similarity index 100% rename from tools/regression/bin/sh/builtins/case10.0 rename to bin/sh/tests/builtins/case10.0 diff --git a/tools/regression/bin/sh/builtins/case11.0 b/bin/sh/tests/builtins/case11.0 similarity index 100% rename from tools/regression/bin/sh/builtins/case11.0 rename to bin/sh/tests/builtins/case11.0 diff --git a/tools/regression/bin/sh/builtins/case12.0 b/bin/sh/tests/builtins/case12.0 similarity index 100% rename from tools/regression/bin/sh/builtins/case12.0 rename to bin/sh/tests/builtins/case12.0 diff --git a/tools/regression/bin/sh/builtins/case13.0 b/bin/sh/tests/builtins/case13.0 similarity index 100% rename from tools/regression/bin/sh/builtins/case13.0 rename to bin/sh/tests/builtins/case13.0 diff --git a/tools/regression/bin/sh/builtins/case14.0 b/bin/sh/tests/builtins/case14.0 similarity index 100% rename from tools/regression/bin/sh/builtins/case14.0 rename to bin/sh/tests/builtins/case14.0 diff --git a/tools/regression/bin/sh/builtins/case15.0 b/bin/sh/tests/builtins/case15.0 similarity index 100% rename from tools/regression/bin/sh/builtins/case15.0 rename to bin/sh/tests/builtins/case15.0 diff --git a/tools/regression/bin/sh/builtins/case16.0 b/bin/sh/tests/builtins/case16.0 similarity index 100% rename from tools/regression/bin/sh/builtins/case16.0 rename to bin/sh/tests/builtins/case16.0 diff --git a/tools/regression/bin/sh/builtins/case17.0 b/bin/sh/tests/builtins/case17.0 similarity index 100% rename from tools/regression/bin/sh/builtins/case17.0 rename to bin/sh/tests/builtins/case17.0 diff --git a/tools/regression/bin/sh/builtins/case18.0 b/bin/sh/tests/builtins/case18.0 similarity index 100% rename from tools/regression/bin/sh/builtins/case18.0 rename to bin/sh/tests/builtins/case18.0 diff --git a/tools/regression/bin/sh/builtins/case19.0 b/bin/sh/tests/builtins/case19.0 similarity index 100% rename from tools/regression/bin/sh/builtins/case19.0 rename to bin/sh/tests/builtins/case19.0 diff --git a/tools/regression/bin/sh/builtins/case2.0 b/bin/sh/tests/builtins/case2.0 similarity index 100% rename from tools/regression/bin/sh/builtins/case2.0 rename to bin/sh/tests/builtins/case2.0 diff --git a/tools/regression/bin/sh/builtins/case3.0 b/bin/sh/tests/builtins/case3.0 similarity index 100% rename from tools/regression/bin/sh/builtins/case3.0 rename to bin/sh/tests/builtins/case3.0 diff --git a/tools/regression/bin/sh/builtins/case4.0 b/bin/sh/tests/builtins/case4.0 similarity index 100% rename from tools/regression/bin/sh/builtins/case4.0 rename to bin/sh/tests/builtins/case4.0 diff --git a/tools/regression/bin/sh/builtins/case5.0 b/bin/sh/tests/builtins/case5.0 similarity index 100% rename from tools/regression/bin/sh/builtins/case5.0 rename to bin/sh/tests/builtins/case5.0 diff --git a/tools/regression/bin/sh/builtins/case6.0 b/bin/sh/tests/builtins/case6.0 similarity index 100% rename from tools/regression/bin/sh/builtins/case6.0 rename to bin/sh/tests/builtins/case6.0 diff --git a/tools/regression/bin/sh/builtins/case7.0 b/bin/sh/tests/builtins/case7.0 similarity index 100% rename from tools/regression/bin/sh/builtins/case7.0 rename to bin/sh/tests/builtins/case7.0 diff --git a/tools/regression/bin/sh/builtins/case8.0 b/bin/sh/tests/builtins/case8.0 similarity index 100% rename from tools/regression/bin/sh/builtins/case8.0 rename to bin/sh/tests/builtins/case8.0 diff --git a/tools/regression/bin/sh/builtins/case9.0 b/bin/sh/tests/builtins/case9.0 similarity index 100% rename from tools/regression/bin/sh/builtins/case9.0 rename to bin/sh/tests/builtins/case9.0 diff --git a/tools/regression/bin/sh/builtins/cd1.0 b/bin/sh/tests/builtins/cd1.0 similarity index 100% rename from tools/regression/bin/sh/builtins/cd1.0 rename to bin/sh/tests/builtins/cd1.0 diff --git a/tools/regression/bin/sh/builtins/cd2.0 b/bin/sh/tests/builtins/cd2.0 similarity index 100% rename from tools/regression/bin/sh/builtins/cd2.0 rename to bin/sh/tests/builtins/cd2.0 diff --git a/tools/regression/bin/sh/builtins/cd3.0 b/bin/sh/tests/builtins/cd3.0 similarity index 100% rename from tools/regression/bin/sh/builtins/cd3.0 rename to bin/sh/tests/builtins/cd3.0 diff --git a/tools/regression/bin/sh/builtins/cd4.0 b/bin/sh/tests/builtins/cd4.0 similarity index 100% rename from tools/regression/bin/sh/builtins/cd4.0 rename to bin/sh/tests/builtins/cd4.0 diff --git a/tools/regression/bin/sh/builtins/cd5.0 b/bin/sh/tests/builtins/cd5.0 similarity index 100% rename from tools/regression/bin/sh/builtins/cd5.0 rename to bin/sh/tests/builtins/cd5.0 diff --git a/tools/regression/bin/sh/builtins/cd6.0 b/bin/sh/tests/builtins/cd6.0 similarity index 100% rename from tools/regression/bin/sh/builtins/cd6.0 rename to bin/sh/tests/builtins/cd6.0 diff --git a/tools/regression/bin/sh/builtins/cd7.0 b/bin/sh/tests/builtins/cd7.0 similarity index 100% rename from tools/regression/bin/sh/builtins/cd7.0 rename to bin/sh/tests/builtins/cd7.0 diff --git a/tools/regression/bin/sh/builtins/cd8.0 b/bin/sh/tests/builtins/cd8.0 similarity index 100% rename from tools/regression/bin/sh/builtins/cd8.0 rename to bin/sh/tests/builtins/cd8.0 diff --git a/tools/regression/bin/sh/builtins/command1.0 b/bin/sh/tests/builtins/command1.0 similarity index 100% rename from tools/regression/bin/sh/builtins/command1.0 rename to bin/sh/tests/builtins/command1.0 diff --git a/tools/regression/bin/sh/builtins/command10.0 b/bin/sh/tests/builtins/command10.0 similarity index 100% rename from tools/regression/bin/sh/builtins/command10.0 rename to bin/sh/tests/builtins/command10.0 diff --git a/tools/regression/bin/sh/builtins/command11.0 b/bin/sh/tests/builtins/command11.0 similarity index 100% rename from tools/regression/bin/sh/builtins/command11.0 rename to bin/sh/tests/builtins/command11.0 diff --git a/tools/regression/bin/sh/builtins/command12.0 b/bin/sh/tests/builtins/command12.0 similarity index 100% rename from tools/regression/bin/sh/builtins/command12.0 rename to bin/sh/tests/builtins/command12.0 diff --git a/tools/regression/bin/sh/builtins/command2.0 b/bin/sh/tests/builtins/command2.0 similarity index 100% rename from tools/regression/bin/sh/builtins/command2.0 rename to bin/sh/tests/builtins/command2.0 diff --git a/tools/regression/bin/sh/builtins/command3.0 b/bin/sh/tests/builtins/command3.0 similarity index 100% rename from tools/regression/bin/sh/builtins/command3.0 rename to bin/sh/tests/builtins/command3.0 diff --git a/tools/regression/bin/sh/builtins/command3.0.stdout b/bin/sh/tests/builtins/command3.0.stdout similarity index 100% rename from tools/regression/bin/sh/builtins/command3.0.stdout rename to bin/sh/tests/builtins/command3.0.stdout diff --git a/tools/regression/bin/sh/builtins/command4.0 b/bin/sh/tests/builtins/command4.0 similarity index 100% rename from tools/regression/bin/sh/builtins/command4.0 rename to bin/sh/tests/builtins/command4.0 diff --git a/tools/regression/bin/sh/builtins/command5.0 b/bin/sh/tests/builtins/command5.0 similarity index 100% rename from tools/regression/bin/sh/builtins/command5.0 rename to bin/sh/tests/builtins/command5.0 diff --git a/tools/regression/bin/sh/builtins/command5.0.stdout b/bin/sh/tests/builtins/command5.0.stdout similarity index 100% rename from tools/regression/bin/sh/builtins/command5.0.stdout rename to bin/sh/tests/builtins/command5.0.stdout diff --git a/tools/regression/bin/sh/builtins/command6.0 b/bin/sh/tests/builtins/command6.0 similarity index 100% rename from tools/regression/bin/sh/builtins/command6.0 rename to bin/sh/tests/builtins/command6.0 diff --git a/tools/regression/bin/sh/builtins/command6.0.stdout b/bin/sh/tests/builtins/command6.0.stdout similarity index 100% rename from tools/regression/bin/sh/builtins/command6.0.stdout rename to bin/sh/tests/builtins/command6.0.stdout diff --git a/tools/regression/bin/sh/builtins/command7.0 b/bin/sh/tests/builtins/command7.0 similarity index 100% rename from tools/regression/bin/sh/builtins/command7.0 rename to bin/sh/tests/builtins/command7.0 diff --git a/tools/regression/bin/sh/builtins/command8.0 b/bin/sh/tests/builtins/command8.0 similarity index 100% rename from tools/regression/bin/sh/builtins/command8.0 rename to bin/sh/tests/builtins/command8.0 diff --git a/tools/regression/bin/sh/builtins/command9.0 b/bin/sh/tests/builtins/command9.0 similarity index 100% rename from tools/regression/bin/sh/builtins/command9.0 rename to bin/sh/tests/builtins/command9.0 diff --git a/tools/regression/bin/sh/builtins/dot1.0 b/bin/sh/tests/builtins/dot1.0 similarity index 100% rename from tools/regression/bin/sh/builtins/dot1.0 rename to bin/sh/tests/builtins/dot1.0 diff --git a/tools/regression/bin/sh/builtins/dot2.0 b/bin/sh/tests/builtins/dot2.0 similarity index 100% rename from tools/regression/bin/sh/builtins/dot2.0 rename to bin/sh/tests/builtins/dot2.0 diff --git a/tools/regression/bin/sh/builtins/dot3.0 b/bin/sh/tests/builtins/dot3.0 similarity index 100% rename from tools/regression/bin/sh/builtins/dot3.0 rename to bin/sh/tests/builtins/dot3.0 diff --git a/tools/regression/bin/sh/builtins/dot4.0 b/bin/sh/tests/builtins/dot4.0 similarity index 100% rename from tools/regression/bin/sh/builtins/dot4.0 rename to bin/sh/tests/builtins/dot4.0 diff --git a/tools/regression/bin/sh/builtins/eval1.0 b/bin/sh/tests/builtins/eval1.0 similarity index 100% rename from tools/regression/bin/sh/builtins/eval1.0 rename to bin/sh/tests/builtins/eval1.0 diff --git a/tools/regression/bin/sh/builtins/eval2.0 b/bin/sh/tests/builtins/eval2.0 similarity index 100% rename from tools/regression/bin/sh/builtins/eval2.0 rename to bin/sh/tests/builtins/eval2.0 diff --git a/tools/regression/bin/sh/builtins/eval3.0 b/bin/sh/tests/builtins/eval3.0 similarity index 100% rename from tools/regression/bin/sh/builtins/eval3.0 rename to bin/sh/tests/builtins/eval3.0 diff --git a/tools/regression/bin/sh/builtins/eval4.0 b/bin/sh/tests/builtins/eval4.0 similarity index 100% rename from tools/regression/bin/sh/builtins/eval4.0 rename to bin/sh/tests/builtins/eval4.0 diff --git a/tools/regression/bin/sh/builtins/eval5.0 b/bin/sh/tests/builtins/eval5.0 similarity index 100% rename from tools/regression/bin/sh/builtins/eval5.0 rename to bin/sh/tests/builtins/eval5.0 diff --git a/tools/regression/bin/sh/builtins/eval6.0 b/bin/sh/tests/builtins/eval6.0 similarity index 100% rename from tools/regression/bin/sh/builtins/eval6.0 rename to bin/sh/tests/builtins/eval6.0 diff --git a/tools/regression/bin/sh/builtins/exec1.0 b/bin/sh/tests/builtins/exec1.0 similarity index 100% rename from tools/regression/bin/sh/builtins/exec1.0 rename to bin/sh/tests/builtins/exec1.0 diff --git a/tools/regression/bin/sh/builtins/exec2.0 b/bin/sh/tests/builtins/exec2.0 similarity index 100% rename from tools/regression/bin/sh/builtins/exec2.0 rename to bin/sh/tests/builtins/exec2.0 diff --git a/tools/regression/bin/sh/builtins/exit1.0 b/bin/sh/tests/builtins/exit1.0 similarity index 100% rename from tools/regression/bin/sh/builtins/exit1.0 rename to bin/sh/tests/builtins/exit1.0 diff --git a/tools/regression/bin/sh/builtins/exit2.8 b/bin/sh/tests/builtins/exit2.8 similarity index 100% rename from tools/regression/bin/sh/builtins/exit2.8 rename to bin/sh/tests/builtins/exit2.8 diff --git a/tools/regression/bin/sh/builtins/exit3.0 b/bin/sh/tests/builtins/exit3.0 similarity index 100% rename from tools/regression/bin/sh/builtins/exit3.0 rename to bin/sh/tests/builtins/exit3.0 diff --git a/tools/regression/bin/sh/builtins/export1.0 b/bin/sh/tests/builtins/export1.0 similarity index 100% rename from tools/regression/bin/sh/builtins/export1.0 rename to bin/sh/tests/builtins/export1.0 diff --git a/tools/regression/bin/sh/builtins/fc1.0 b/bin/sh/tests/builtins/fc1.0 similarity index 100% rename from tools/regression/bin/sh/builtins/fc1.0 rename to bin/sh/tests/builtins/fc1.0 diff --git a/tools/regression/bin/sh/builtins/fc2.0 b/bin/sh/tests/builtins/fc2.0 similarity index 100% rename from tools/regression/bin/sh/builtins/fc2.0 rename to bin/sh/tests/builtins/fc2.0 diff --git a/tools/regression/bin/sh/builtins/for1.0 b/bin/sh/tests/builtins/for1.0 similarity index 100% rename from tools/regression/bin/sh/builtins/for1.0 rename to bin/sh/tests/builtins/for1.0 diff --git a/tools/regression/bin/sh/builtins/for2.0 b/bin/sh/tests/builtins/for2.0 similarity index 100% rename from tools/regression/bin/sh/builtins/for2.0 rename to bin/sh/tests/builtins/for2.0 diff --git a/tools/regression/bin/sh/builtins/for3.0 b/bin/sh/tests/builtins/for3.0 similarity index 100% rename from tools/regression/bin/sh/builtins/for3.0 rename to bin/sh/tests/builtins/for3.0 diff --git a/tools/regression/bin/sh/builtins/getopts1.0 b/bin/sh/tests/builtins/getopts1.0 similarity index 100% rename from tools/regression/bin/sh/builtins/getopts1.0 rename to bin/sh/tests/builtins/getopts1.0 diff --git a/tools/regression/bin/sh/builtins/getopts1.0.stdout b/bin/sh/tests/builtins/getopts1.0.stdout similarity index 100% rename from tools/regression/bin/sh/builtins/getopts1.0.stdout rename to bin/sh/tests/builtins/getopts1.0.stdout diff --git a/tools/regression/bin/sh/builtins/getopts2.0 b/bin/sh/tests/builtins/getopts2.0 similarity index 100% rename from tools/regression/bin/sh/builtins/getopts2.0 rename to bin/sh/tests/builtins/getopts2.0 diff --git a/tools/regression/bin/sh/builtins/getopts2.0.stdout b/bin/sh/tests/builtins/getopts2.0.stdout similarity index 100% rename from tools/regression/bin/sh/builtins/getopts2.0.stdout rename to bin/sh/tests/builtins/getopts2.0.stdout diff --git a/tools/regression/bin/sh/builtins/hash1.0 b/bin/sh/tests/builtins/hash1.0 similarity index 100% rename from tools/regression/bin/sh/builtins/hash1.0 rename to bin/sh/tests/builtins/hash1.0 diff --git a/tools/regression/bin/sh/builtins/hash1.0.stdout b/bin/sh/tests/builtins/hash1.0.stdout similarity index 100% rename from tools/regression/bin/sh/builtins/hash1.0.stdout rename to bin/sh/tests/builtins/hash1.0.stdout diff --git a/tools/regression/bin/sh/builtins/hash2.0 b/bin/sh/tests/builtins/hash2.0 similarity index 100% rename from tools/regression/bin/sh/builtins/hash2.0 rename to bin/sh/tests/builtins/hash2.0 diff --git a/tools/regression/bin/sh/builtins/hash2.0.stdout b/bin/sh/tests/builtins/hash2.0.stdout similarity index 100% rename from tools/regression/bin/sh/builtins/hash2.0.stdout rename to bin/sh/tests/builtins/hash2.0.stdout diff --git a/tools/regression/bin/sh/builtins/hash3.0 b/bin/sh/tests/builtins/hash3.0 similarity index 100% rename from tools/regression/bin/sh/builtins/hash3.0 rename to bin/sh/tests/builtins/hash3.0 diff --git a/tools/regression/bin/sh/builtins/hash3.0.stdout b/bin/sh/tests/builtins/hash3.0.stdout similarity index 100% rename from tools/regression/bin/sh/builtins/hash3.0.stdout rename to bin/sh/tests/builtins/hash3.0.stdout diff --git a/tools/regression/bin/sh/builtins/hash4.0 b/bin/sh/tests/builtins/hash4.0 similarity index 100% rename from tools/regression/bin/sh/builtins/hash4.0 rename to bin/sh/tests/builtins/hash4.0 diff --git a/tools/regression/bin/sh/builtins/jobid1.0 b/bin/sh/tests/builtins/jobid1.0 similarity index 100% rename from tools/regression/bin/sh/builtins/jobid1.0 rename to bin/sh/tests/builtins/jobid1.0 diff --git a/tools/regression/bin/sh/builtins/jobid2.0 b/bin/sh/tests/builtins/jobid2.0 similarity index 100% rename from tools/regression/bin/sh/builtins/jobid2.0 rename to bin/sh/tests/builtins/jobid2.0 diff --git a/tools/regression/bin/sh/builtins/lineno.0 b/bin/sh/tests/builtins/lineno.0 similarity index 100% rename from tools/regression/bin/sh/builtins/lineno.0 rename to bin/sh/tests/builtins/lineno.0 diff --git a/tools/regression/bin/sh/builtins/lineno.0.stdout b/bin/sh/tests/builtins/lineno.0.stdout similarity index 100% rename from tools/regression/bin/sh/builtins/lineno.0.stdout rename to bin/sh/tests/builtins/lineno.0.stdout diff --git a/tools/regression/bin/sh/builtins/local1.0 b/bin/sh/tests/builtins/local1.0 similarity index 100% rename from tools/regression/bin/sh/builtins/local1.0 rename to bin/sh/tests/builtins/local1.0 diff --git a/tools/regression/bin/sh/builtins/local2.0 b/bin/sh/tests/builtins/local2.0 similarity index 100% rename from tools/regression/bin/sh/builtins/local2.0 rename to bin/sh/tests/builtins/local2.0 diff --git a/tools/regression/bin/sh/builtins/local3.0 b/bin/sh/tests/builtins/local3.0 similarity index 100% rename from tools/regression/bin/sh/builtins/local3.0 rename to bin/sh/tests/builtins/local3.0 diff --git a/tools/regression/bin/sh/builtins/local4.0 b/bin/sh/tests/builtins/local4.0 similarity index 100% rename from tools/regression/bin/sh/builtins/local4.0 rename to bin/sh/tests/builtins/local4.0 diff --git a/tools/regression/bin/sh/builtins/locale1.0 b/bin/sh/tests/builtins/locale1.0 similarity index 100% rename from tools/regression/bin/sh/builtins/locale1.0 rename to bin/sh/tests/builtins/locale1.0 diff --git a/tools/regression/bin/sh/builtins/printf1.0 b/bin/sh/tests/builtins/printf1.0 similarity index 100% rename from tools/regression/bin/sh/builtins/printf1.0 rename to bin/sh/tests/builtins/printf1.0 diff --git a/tools/regression/bin/sh/builtins/printf2.0 b/bin/sh/tests/builtins/printf2.0 similarity index 100% rename from tools/regression/bin/sh/builtins/printf2.0 rename to bin/sh/tests/builtins/printf2.0 diff --git a/tools/regression/bin/sh/builtins/printf3.0 b/bin/sh/tests/builtins/printf3.0 similarity index 100% rename from tools/regression/bin/sh/builtins/printf3.0 rename to bin/sh/tests/builtins/printf3.0 diff --git a/tools/regression/bin/sh/builtins/printf4.0 b/bin/sh/tests/builtins/printf4.0 similarity index 100% rename from tools/regression/bin/sh/builtins/printf4.0 rename to bin/sh/tests/builtins/printf4.0 diff --git a/tools/regression/bin/sh/builtins/read1.0 b/bin/sh/tests/builtins/read1.0 similarity index 100% rename from tools/regression/bin/sh/builtins/read1.0 rename to bin/sh/tests/builtins/read1.0 diff --git a/tools/regression/bin/sh/builtins/read1.0.stdout b/bin/sh/tests/builtins/read1.0.stdout similarity index 100% rename from tools/regression/bin/sh/builtins/read1.0.stdout rename to bin/sh/tests/builtins/read1.0.stdout diff --git a/tools/regression/bin/sh/builtins/read2.0 b/bin/sh/tests/builtins/read2.0 similarity index 100% rename from tools/regression/bin/sh/builtins/read2.0 rename to bin/sh/tests/builtins/read2.0 diff --git a/tools/regression/bin/sh/builtins/read3.0 b/bin/sh/tests/builtins/read3.0 similarity index 100% rename from tools/regression/bin/sh/builtins/read3.0 rename to bin/sh/tests/builtins/read3.0 diff --git a/tools/regression/bin/sh/builtins/read3.0.stdout b/bin/sh/tests/builtins/read3.0.stdout similarity index 100% rename from tools/regression/bin/sh/builtins/read3.0.stdout rename to bin/sh/tests/builtins/read3.0.stdout diff --git a/tools/regression/bin/sh/builtins/read4.0 b/bin/sh/tests/builtins/read4.0 similarity index 100% rename from tools/regression/bin/sh/builtins/read4.0 rename to bin/sh/tests/builtins/read4.0 diff --git a/tools/regression/bin/sh/builtins/read4.0.stdout b/bin/sh/tests/builtins/read4.0.stdout similarity index 100% rename from tools/regression/bin/sh/builtins/read4.0.stdout rename to bin/sh/tests/builtins/read4.0.stdout diff --git a/tools/regression/bin/sh/builtins/read5.0 b/bin/sh/tests/builtins/read5.0 similarity index 100% rename from tools/regression/bin/sh/builtins/read5.0 rename to bin/sh/tests/builtins/read5.0 diff --git a/tools/regression/bin/sh/builtins/read6.0 b/bin/sh/tests/builtins/read6.0 similarity index 100% rename from tools/regression/bin/sh/builtins/read6.0 rename to bin/sh/tests/builtins/read6.0 diff --git a/tools/regression/bin/sh/builtins/read7.0 b/bin/sh/tests/builtins/read7.0 similarity index 100% rename from tools/regression/bin/sh/builtins/read7.0 rename to bin/sh/tests/builtins/read7.0 diff --git a/tools/regression/bin/sh/builtins/return1.0 b/bin/sh/tests/builtins/return1.0 similarity index 100% rename from tools/regression/bin/sh/builtins/return1.0 rename to bin/sh/tests/builtins/return1.0 diff --git a/tools/regression/bin/sh/builtins/return2.1 b/bin/sh/tests/builtins/return2.1 similarity index 100% rename from tools/regression/bin/sh/builtins/return2.1 rename to bin/sh/tests/builtins/return2.1 diff --git a/tools/regression/bin/sh/builtins/return3.1 b/bin/sh/tests/builtins/return3.1 similarity index 100% rename from tools/regression/bin/sh/builtins/return3.1 rename to bin/sh/tests/builtins/return3.1 diff --git a/tools/regression/bin/sh/builtins/return4.0 b/bin/sh/tests/builtins/return4.0 similarity index 100% rename from tools/regression/bin/sh/builtins/return4.0 rename to bin/sh/tests/builtins/return4.0 diff --git a/tools/regression/bin/sh/builtins/return5.0 b/bin/sh/tests/builtins/return5.0 similarity index 100% rename from tools/regression/bin/sh/builtins/return5.0 rename to bin/sh/tests/builtins/return5.0 diff --git a/tools/regression/bin/sh/builtins/return6.4 b/bin/sh/tests/builtins/return6.4 similarity index 100% rename from tools/regression/bin/sh/builtins/return6.4 rename to bin/sh/tests/builtins/return6.4 diff --git a/tools/regression/bin/sh/builtins/return7.4 b/bin/sh/tests/builtins/return7.4 similarity index 100% rename from tools/regression/bin/sh/builtins/return7.4 rename to bin/sh/tests/builtins/return7.4 diff --git a/tools/regression/bin/sh/builtins/return8.0 b/bin/sh/tests/builtins/return8.0 similarity index 100% rename from tools/regression/bin/sh/builtins/return8.0 rename to bin/sh/tests/builtins/return8.0 diff --git a/tools/regression/bin/sh/builtins/set1.0 b/bin/sh/tests/builtins/set1.0 similarity index 100% rename from tools/regression/bin/sh/builtins/set1.0 rename to bin/sh/tests/builtins/set1.0 diff --git a/tools/regression/bin/sh/builtins/set2.0 b/bin/sh/tests/builtins/set2.0 similarity index 100% rename from tools/regression/bin/sh/builtins/set2.0 rename to bin/sh/tests/builtins/set2.0 diff --git a/tools/regression/bin/sh/builtins/trap1.0 b/bin/sh/tests/builtins/trap1.0 similarity index 100% rename from tools/regression/bin/sh/builtins/trap1.0 rename to bin/sh/tests/builtins/trap1.0 diff --git a/tools/regression/bin/sh/builtins/trap10.0 b/bin/sh/tests/builtins/trap10.0 similarity index 100% rename from tools/regression/bin/sh/builtins/trap10.0 rename to bin/sh/tests/builtins/trap10.0 diff --git a/tools/regression/bin/sh/builtins/trap11.0 b/bin/sh/tests/builtins/trap11.0 similarity index 100% rename from tools/regression/bin/sh/builtins/trap11.0 rename to bin/sh/tests/builtins/trap11.0 diff --git a/tools/regression/bin/sh/builtins/trap12.0 b/bin/sh/tests/builtins/trap12.0 similarity index 100% rename from tools/regression/bin/sh/builtins/trap12.0 rename to bin/sh/tests/builtins/trap12.0 diff --git a/tools/regression/bin/sh/builtins/trap13.0 b/bin/sh/tests/builtins/trap13.0 similarity index 100% rename from tools/regression/bin/sh/builtins/trap13.0 rename to bin/sh/tests/builtins/trap13.0 diff --git a/tools/regression/bin/sh/builtins/trap14.0 b/bin/sh/tests/builtins/trap14.0 similarity index 100% rename from tools/regression/bin/sh/builtins/trap14.0 rename to bin/sh/tests/builtins/trap14.0 diff --git a/tools/regression/bin/sh/builtins/trap2.0 b/bin/sh/tests/builtins/trap2.0 similarity index 100% rename from tools/regression/bin/sh/builtins/trap2.0 rename to bin/sh/tests/builtins/trap2.0 diff --git a/tools/regression/bin/sh/builtins/trap3.0 b/bin/sh/tests/builtins/trap3.0 similarity index 100% rename from tools/regression/bin/sh/builtins/trap3.0 rename to bin/sh/tests/builtins/trap3.0 diff --git a/tools/regression/bin/sh/builtins/trap4.0 b/bin/sh/tests/builtins/trap4.0 similarity index 100% rename from tools/regression/bin/sh/builtins/trap4.0 rename to bin/sh/tests/builtins/trap4.0 diff --git a/tools/regression/bin/sh/builtins/trap5.0 b/bin/sh/tests/builtins/trap5.0 similarity index 100% rename from tools/regression/bin/sh/builtins/trap5.0 rename to bin/sh/tests/builtins/trap5.0 diff --git a/tools/regression/bin/sh/builtins/trap6.0 b/bin/sh/tests/builtins/trap6.0 similarity index 100% rename from tools/regression/bin/sh/builtins/trap6.0 rename to bin/sh/tests/builtins/trap6.0 diff --git a/tools/regression/bin/sh/builtins/trap7.0 b/bin/sh/tests/builtins/trap7.0 similarity index 100% rename from tools/regression/bin/sh/builtins/trap7.0 rename to bin/sh/tests/builtins/trap7.0 diff --git a/tools/regression/bin/sh/builtins/trap8.0 b/bin/sh/tests/builtins/trap8.0 similarity index 100% rename from tools/regression/bin/sh/builtins/trap8.0 rename to bin/sh/tests/builtins/trap8.0 diff --git a/tools/regression/bin/sh/builtins/trap9.0 b/bin/sh/tests/builtins/trap9.0 similarity index 100% rename from tools/regression/bin/sh/builtins/trap9.0 rename to bin/sh/tests/builtins/trap9.0 diff --git a/tools/regression/bin/sh/builtins/type1.0 b/bin/sh/tests/builtins/type1.0 similarity index 100% rename from tools/regression/bin/sh/builtins/type1.0 rename to bin/sh/tests/builtins/type1.0 diff --git a/tools/regression/bin/sh/builtins/type1.0.stderr b/bin/sh/tests/builtins/type1.0.stderr similarity index 100% rename from tools/regression/bin/sh/builtins/type1.0.stderr rename to bin/sh/tests/builtins/type1.0.stderr diff --git a/tools/regression/bin/sh/builtins/type2.0 b/bin/sh/tests/builtins/type2.0 similarity index 100% rename from tools/regression/bin/sh/builtins/type2.0 rename to bin/sh/tests/builtins/type2.0 diff --git a/tools/regression/bin/sh/builtins/type3.0 b/bin/sh/tests/builtins/type3.0 similarity index 100% rename from tools/regression/bin/sh/builtins/type3.0 rename to bin/sh/tests/builtins/type3.0 diff --git a/tools/regression/bin/sh/builtins/unalias.0 b/bin/sh/tests/builtins/unalias.0 similarity index 100% rename from tools/regression/bin/sh/builtins/unalias.0 rename to bin/sh/tests/builtins/unalias.0 diff --git a/tools/regression/bin/sh/builtins/var-assign.0 b/bin/sh/tests/builtins/var-assign.0 similarity index 100% rename from tools/regression/bin/sh/builtins/var-assign.0 rename to bin/sh/tests/builtins/var-assign.0 diff --git a/tools/regression/bin/sh/builtins/var-assign2.0 b/bin/sh/tests/builtins/var-assign2.0 similarity index 100% rename from tools/regression/bin/sh/builtins/var-assign2.0 rename to bin/sh/tests/builtins/var-assign2.0 diff --git a/tools/regression/bin/sh/builtins/wait1.0 b/bin/sh/tests/builtins/wait1.0 similarity index 100% rename from tools/regression/bin/sh/builtins/wait1.0 rename to bin/sh/tests/builtins/wait1.0 diff --git a/tools/regression/bin/sh/builtins/wait10.0 b/bin/sh/tests/builtins/wait10.0 similarity index 100% rename from tools/regression/bin/sh/builtins/wait10.0 rename to bin/sh/tests/builtins/wait10.0 diff --git a/tools/regression/bin/sh/builtins/wait2.0 b/bin/sh/tests/builtins/wait2.0 similarity index 100% rename from tools/regression/bin/sh/builtins/wait2.0 rename to bin/sh/tests/builtins/wait2.0 diff --git a/tools/regression/bin/sh/builtins/wait3.0 b/bin/sh/tests/builtins/wait3.0 similarity index 100% rename from tools/regression/bin/sh/builtins/wait3.0 rename to bin/sh/tests/builtins/wait3.0 diff --git a/tools/regression/bin/sh/builtins/wait4.0 b/bin/sh/tests/builtins/wait4.0 similarity index 100% rename from tools/regression/bin/sh/builtins/wait4.0 rename to bin/sh/tests/builtins/wait4.0 diff --git a/tools/regression/bin/sh/builtins/wait5.0 b/bin/sh/tests/builtins/wait5.0 similarity index 100% rename from tools/regression/bin/sh/builtins/wait5.0 rename to bin/sh/tests/builtins/wait5.0 diff --git a/tools/regression/bin/sh/builtins/wait6.0 b/bin/sh/tests/builtins/wait6.0 similarity index 100% rename from tools/regression/bin/sh/builtins/wait6.0 rename to bin/sh/tests/builtins/wait6.0 diff --git a/tools/regression/bin/sh/builtins/wait7.0 b/bin/sh/tests/builtins/wait7.0 similarity index 100% rename from tools/regression/bin/sh/builtins/wait7.0 rename to bin/sh/tests/builtins/wait7.0 diff --git a/tools/regression/bin/sh/builtins/wait8.0 b/bin/sh/tests/builtins/wait8.0 similarity index 100% rename from tools/regression/bin/sh/builtins/wait8.0 rename to bin/sh/tests/builtins/wait8.0 diff --git a/tools/regression/bin/sh/builtins/wait9.127 b/bin/sh/tests/builtins/wait9.127 similarity index 100% rename from tools/regression/bin/sh/builtins/wait9.127 rename to bin/sh/tests/builtins/wait9.127 diff --git a/bin/sh/tests/errors/Makefile b/bin/sh/tests/errors/Makefile new file mode 100644 index 000000000000..9f8b0f2045d9 --- /dev/null +++ b/bin/sh/tests/errors/Makefile @@ -0,0 +1,30 @@ +# $FreeBSD$ + +.include + +FILESDIR= ${TESTSBASE}/bin/sh/errors +KYUAFILE= no + +FILES= assignment-error1.0 +FILES+= assignment-error2.0 +FILES+= backquote-error1.0 +FILES+= backquote-error2.0 +FILES+= bad-binary1.126 +FILES+= bad-keyword1.0 +FILES+= bad-parm-exp1.0 +FILES+= bad-parm-exp2.2 bad-parm-exp2.2.stderr +FILES+= bad-parm-exp3.2 bad-parm-exp3.2.stderr +FILES+= bad-parm-exp4.2 bad-parm-exp4.2.stderr +FILES+= bad-parm-exp5.2 bad-parm-exp5.2.stderr +FILES+= bad-parm-exp6.2 bad-parm-exp6.2.stderr +FILES+= option-error.0 +FILES+= redirection-error.0 +FILES+= redirection-error2.2 +FILES+= redirection-error3.0 +FILES+= redirection-error4.0 +FILES+= redirection-error5.0 +FILES+= redirection-error6.0 +FILES+= redirection-error7.0 +FILES+= write-error1.0 + +.include diff --git a/tools/regression/bin/sh/errors/assignment-error1.0 b/bin/sh/tests/errors/assignment-error1.0 similarity index 100% rename from tools/regression/bin/sh/errors/assignment-error1.0 rename to bin/sh/tests/errors/assignment-error1.0 diff --git a/tools/regression/bin/sh/errors/assignment-error2.0 b/bin/sh/tests/errors/assignment-error2.0 similarity index 100% rename from tools/regression/bin/sh/errors/assignment-error2.0 rename to bin/sh/tests/errors/assignment-error2.0 diff --git a/tools/regression/bin/sh/errors/backquote-error1.0 b/bin/sh/tests/errors/backquote-error1.0 similarity index 100% rename from tools/regression/bin/sh/errors/backquote-error1.0 rename to bin/sh/tests/errors/backquote-error1.0 diff --git a/tools/regression/bin/sh/errors/backquote-error2.0 b/bin/sh/tests/errors/backquote-error2.0 similarity index 100% rename from tools/regression/bin/sh/errors/backquote-error2.0 rename to bin/sh/tests/errors/backquote-error2.0 diff --git a/tools/regression/bin/sh/errors/bad-binary1.126 b/bin/sh/tests/errors/bad-binary1.126 similarity index 100% rename from tools/regression/bin/sh/errors/bad-binary1.126 rename to bin/sh/tests/errors/bad-binary1.126 diff --git a/tools/regression/bin/sh/errors/bad-keyword1.0 b/bin/sh/tests/errors/bad-keyword1.0 similarity index 100% rename from tools/regression/bin/sh/errors/bad-keyword1.0 rename to bin/sh/tests/errors/bad-keyword1.0 diff --git a/tools/regression/bin/sh/errors/bad-parm-exp1.0 b/bin/sh/tests/errors/bad-parm-exp1.0 similarity index 100% rename from tools/regression/bin/sh/errors/bad-parm-exp1.0 rename to bin/sh/tests/errors/bad-parm-exp1.0 diff --git a/tools/regression/bin/sh/errors/bad-parm-exp2.2 b/bin/sh/tests/errors/bad-parm-exp2.2 similarity index 100% rename from tools/regression/bin/sh/errors/bad-parm-exp2.2 rename to bin/sh/tests/errors/bad-parm-exp2.2 diff --git a/tools/regression/bin/sh/errors/bad-parm-exp2.2.stderr b/bin/sh/tests/errors/bad-parm-exp2.2.stderr similarity index 100% rename from tools/regression/bin/sh/errors/bad-parm-exp2.2.stderr rename to bin/sh/tests/errors/bad-parm-exp2.2.stderr diff --git a/tools/regression/bin/sh/errors/bad-parm-exp3.2 b/bin/sh/tests/errors/bad-parm-exp3.2 similarity index 100% rename from tools/regression/bin/sh/errors/bad-parm-exp3.2 rename to bin/sh/tests/errors/bad-parm-exp3.2 diff --git a/tools/regression/bin/sh/errors/bad-parm-exp3.2.stderr b/bin/sh/tests/errors/bad-parm-exp3.2.stderr similarity index 100% rename from tools/regression/bin/sh/errors/bad-parm-exp3.2.stderr rename to bin/sh/tests/errors/bad-parm-exp3.2.stderr diff --git a/tools/regression/bin/sh/errors/bad-parm-exp4.2 b/bin/sh/tests/errors/bad-parm-exp4.2 similarity index 100% rename from tools/regression/bin/sh/errors/bad-parm-exp4.2 rename to bin/sh/tests/errors/bad-parm-exp4.2 diff --git a/tools/regression/bin/sh/errors/bad-parm-exp4.2.stderr b/bin/sh/tests/errors/bad-parm-exp4.2.stderr similarity index 100% rename from tools/regression/bin/sh/errors/bad-parm-exp4.2.stderr rename to bin/sh/tests/errors/bad-parm-exp4.2.stderr diff --git a/tools/regression/bin/sh/errors/bad-parm-exp5.2 b/bin/sh/tests/errors/bad-parm-exp5.2 similarity index 100% rename from tools/regression/bin/sh/errors/bad-parm-exp5.2 rename to bin/sh/tests/errors/bad-parm-exp5.2 diff --git a/tools/regression/bin/sh/errors/bad-parm-exp5.2.stderr b/bin/sh/tests/errors/bad-parm-exp5.2.stderr similarity index 100% rename from tools/regression/bin/sh/errors/bad-parm-exp5.2.stderr rename to bin/sh/tests/errors/bad-parm-exp5.2.stderr diff --git a/tools/regression/bin/sh/errors/bad-parm-exp6.2 b/bin/sh/tests/errors/bad-parm-exp6.2 similarity index 100% rename from tools/regression/bin/sh/errors/bad-parm-exp6.2 rename to bin/sh/tests/errors/bad-parm-exp6.2 diff --git a/tools/regression/bin/sh/errors/bad-parm-exp6.2.stderr b/bin/sh/tests/errors/bad-parm-exp6.2.stderr similarity index 100% rename from tools/regression/bin/sh/errors/bad-parm-exp6.2.stderr rename to bin/sh/tests/errors/bad-parm-exp6.2.stderr diff --git a/tools/regression/bin/sh/errors/option-error.0 b/bin/sh/tests/errors/option-error.0 similarity index 100% rename from tools/regression/bin/sh/errors/option-error.0 rename to bin/sh/tests/errors/option-error.0 diff --git a/tools/regression/bin/sh/errors/redirection-error.0 b/bin/sh/tests/errors/redirection-error.0 similarity index 100% rename from tools/regression/bin/sh/errors/redirection-error.0 rename to bin/sh/tests/errors/redirection-error.0 diff --git a/tools/regression/bin/sh/errors/redirection-error2.2 b/bin/sh/tests/errors/redirection-error2.2 similarity index 100% rename from tools/regression/bin/sh/errors/redirection-error2.2 rename to bin/sh/tests/errors/redirection-error2.2 diff --git a/tools/regression/bin/sh/errors/redirection-error3.0 b/bin/sh/tests/errors/redirection-error3.0 similarity index 100% rename from tools/regression/bin/sh/errors/redirection-error3.0 rename to bin/sh/tests/errors/redirection-error3.0 diff --git a/tools/regression/bin/sh/errors/redirection-error4.0 b/bin/sh/tests/errors/redirection-error4.0 similarity index 100% rename from tools/regression/bin/sh/errors/redirection-error4.0 rename to bin/sh/tests/errors/redirection-error4.0 diff --git a/tools/regression/bin/sh/errors/redirection-error5.0 b/bin/sh/tests/errors/redirection-error5.0 similarity index 100% rename from tools/regression/bin/sh/errors/redirection-error5.0 rename to bin/sh/tests/errors/redirection-error5.0 diff --git a/tools/regression/bin/sh/errors/redirection-error6.0 b/bin/sh/tests/errors/redirection-error6.0 similarity index 100% rename from tools/regression/bin/sh/errors/redirection-error6.0 rename to bin/sh/tests/errors/redirection-error6.0 diff --git a/tools/regression/bin/sh/errors/redirection-error7.0 b/bin/sh/tests/errors/redirection-error7.0 similarity index 100% rename from tools/regression/bin/sh/errors/redirection-error7.0 rename to bin/sh/tests/errors/redirection-error7.0 diff --git a/tools/regression/bin/sh/errors/write-error1.0 b/bin/sh/tests/errors/write-error1.0 similarity index 100% rename from tools/regression/bin/sh/errors/write-error1.0 rename to bin/sh/tests/errors/write-error1.0 diff --git a/bin/sh/tests/execution/Makefile b/bin/sh/tests/execution/Makefile new file mode 100644 index 000000000000..302d0d824c41 --- /dev/null +++ b/bin/sh/tests/execution/Makefile @@ -0,0 +1,53 @@ +# $FreeBSD$ + +.include + +FILESDIR= ${TESTSBASE}/bin/sh/execution +KYUAFILE= no + +FILES= bg1.0 +FILES+= bg2.0 +FILES+= bg3.0 +FILES+= bg4.0 +FILES+= bg5.0 +FILES+= bg6.0 bg6.0.stdout +FILES+= bg7.0 +FILES+= bg8.0 +FILES+= bg9.0 +FILES+= bg10.0 bg10.0.stdout +FILES+= fork1.0 +FILES+= fork2.0 +FILES+= fork3.0 +FILES+= func1.0 +FILES+= func2.0 +FILES+= func3.0 +FILES+= hash1.0 +FILES+= int-cmd1.0 +FILES+= killed1.0 +FILES+= killed2.0 +FILES+= not1.0 +FILES+= not2.0 +FILES+= path1.0 +FILES+= redir1.0 +FILES+= redir2.0 +FILES+= redir3.0 +FILES+= redir4.0 +FILES+= redir5.0 +FILES+= redir6.0 +FILES+= redir7.0 +FILES+= set-n1.0 +FILES+= set-n2.0 +FILES+= set-n3.0 +FILES+= set-n4.0 +FILES+= set-x1.0 +FILES+= set-x2.0 +FILES+= set-x3.0 +FILES+= shellproc1.0 +FILES+= subshell1.0 subshell1.0.stdout +FILES+= subshell2.0 +FILES+= subshell3.0 +FILES+= subshell4.0 +FILES+= unknown1.0 +FILES+= var-assign1.0 + +.include diff --git a/tools/regression/bin/sh/execution/bg1.0 b/bin/sh/tests/execution/bg1.0 similarity index 100% rename from tools/regression/bin/sh/execution/bg1.0 rename to bin/sh/tests/execution/bg1.0 diff --git a/tools/regression/bin/sh/execution/bg10.0 b/bin/sh/tests/execution/bg10.0 similarity index 100% rename from tools/regression/bin/sh/execution/bg10.0 rename to bin/sh/tests/execution/bg10.0 diff --git a/tools/regression/bin/sh/execution/bg10.0.stdout b/bin/sh/tests/execution/bg10.0.stdout similarity index 100% rename from tools/regression/bin/sh/execution/bg10.0.stdout rename to bin/sh/tests/execution/bg10.0.stdout diff --git a/tools/regression/bin/sh/execution/bg2.0 b/bin/sh/tests/execution/bg2.0 similarity index 100% rename from tools/regression/bin/sh/execution/bg2.0 rename to bin/sh/tests/execution/bg2.0 diff --git a/tools/regression/bin/sh/execution/bg3.0 b/bin/sh/tests/execution/bg3.0 similarity index 100% rename from tools/regression/bin/sh/execution/bg3.0 rename to bin/sh/tests/execution/bg3.0 diff --git a/tools/regression/bin/sh/execution/bg4.0 b/bin/sh/tests/execution/bg4.0 similarity index 100% rename from tools/regression/bin/sh/execution/bg4.0 rename to bin/sh/tests/execution/bg4.0 diff --git a/tools/regression/bin/sh/execution/bg5.0 b/bin/sh/tests/execution/bg5.0 similarity index 100% rename from tools/regression/bin/sh/execution/bg5.0 rename to bin/sh/tests/execution/bg5.0 diff --git a/tools/regression/bin/sh/execution/bg6.0 b/bin/sh/tests/execution/bg6.0 similarity index 100% rename from tools/regression/bin/sh/execution/bg6.0 rename to bin/sh/tests/execution/bg6.0 diff --git a/tools/regression/bin/sh/execution/bg6.0.stdout b/bin/sh/tests/execution/bg6.0.stdout similarity index 100% rename from tools/regression/bin/sh/execution/bg6.0.stdout rename to bin/sh/tests/execution/bg6.0.stdout diff --git a/tools/regression/bin/sh/execution/bg7.0 b/bin/sh/tests/execution/bg7.0 similarity index 100% rename from tools/regression/bin/sh/execution/bg7.0 rename to bin/sh/tests/execution/bg7.0 diff --git a/tools/regression/bin/sh/execution/bg8.0 b/bin/sh/tests/execution/bg8.0 similarity index 100% rename from tools/regression/bin/sh/execution/bg8.0 rename to bin/sh/tests/execution/bg8.0 diff --git a/tools/regression/bin/sh/execution/bg9.0 b/bin/sh/tests/execution/bg9.0 similarity index 100% rename from tools/regression/bin/sh/execution/bg9.0 rename to bin/sh/tests/execution/bg9.0 diff --git a/tools/regression/bin/sh/execution/fork1.0 b/bin/sh/tests/execution/fork1.0 similarity index 100% rename from tools/regression/bin/sh/execution/fork1.0 rename to bin/sh/tests/execution/fork1.0 diff --git a/tools/regression/bin/sh/execution/fork2.0 b/bin/sh/tests/execution/fork2.0 similarity index 100% rename from tools/regression/bin/sh/execution/fork2.0 rename to bin/sh/tests/execution/fork2.0 diff --git a/tools/regression/bin/sh/execution/fork3.0 b/bin/sh/tests/execution/fork3.0 similarity index 100% rename from tools/regression/bin/sh/execution/fork3.0 rename to bin/sh/tests/execution/fork3.0 diff --git a/tools/regression/bin/sh/execution/func1.0 b/bin/sh/tests/execution/func1.0 similarity index 100% rename from tools/regression/bin/sh/execution/func1.0 rename to bin/sh/tests/execution/func1.0 diff --git a/tools/regression/bin/sh/execution/func2.0 b/bin/sh/tests/execution/func2.0 similarity index 100% rename from tools/regression/bin/sh/execution/func2.0 rename to bin/sh/tests/execution/func2.0 diff --git a/tools/regression/bin/sh/execution/func3.0 b/bin/sh/tests/execution/func3.0 similarity index 100% rename from tools/regression/bin/sh/execution/func3.0 rename to bin/sh/tests/execution/func3.0 diff --git a/tools/regression/bin/sh/execution/hash1.0 b/bin/sh/tests/execution/hash1.0 similarity index 100% rename from tools/regression/bin/sh/execution/hash1.0 rename to bin/sh/tests/execution/hash1.0 diff --git a/tools/regression/bin/sh/execution/int-cmd1.0 b/bin/sh/tests/execution/int-cmd1.0 similarity index 100% rename from tools/regression/bin/sh/execution/int-cmd1.0 rename to bin/sh/tests/execution/int-cmd1.0 diff --git a/tools/regression/bin/sh/execution/killed1.0 b/bin/sh/tests/execution/killed1.0 similarity index 100% rename from tools/regression/bin/sh/execution/killed1.0 rename to bin/sh/tests/execution/killed1.0 diff --git a/tools/regression/bin/sh/execution/killed2.0 b/bin/sh/tests/execution/killed2.0 similarity index 100% rename from tools/regression/bin/sh/execution/killed2.0 rename to bin/sh/tests/execution/killed2.0 diff --git a/tools/regression/bin/sh/execution/not1.0 b/bin/sh/tests/execution/not1.0 similarity index 100% rename from tools/regression/bin/sh/execution/not1.0 rename to bin/sh/tests/execution/not1.0 diff --git a/tools/regression/bin/sh/execution/not2.0 b/bin/sh/tests/execution/not2.0 similarity index 100% rename from tools/regression/bin/sh/execution/not2.0 rename to bin/sh/tests/execution/not2.0 diff --git a/tools/regression/bin/sh/execution/path1.0 b/bin/sh/tests/execution/path1.0 similarity index 100% rename from tools/regression/bin/sh/execution/path1.0 rename to bin/sh/tests/execution/path1.0 diff --git a/tools/regression/bin/sh/execution/redir1.0 b/bin/sh/tests/execution/redir1.0 similarity index 100% rename from tools/regression/bin/sh/execution/redir1.0 rename to bin/sh/tests/execution/redir1.0 diff --git a/tools/regression/bin/sh/execution/redir2.0 b/bin/sh/tests/execution/redir2.0 similarity index 100% rename from tools/regression/bin/sh/execution/redir2.0 rename to bin/sh/tests/execution/redir2.0 diff --git a/tools/regression/bin/sh/execution/redir3.0 b/bin/sh/tests/execution/redir3.0 similarity index 100% rename from tools/regression/bin/sh/execution/redir3.0 rename to bin/sh/tests/execution/redir3.0 diff --git a/tools/regression/bin/sh/execution/redir4.0 b/bin/sh/tests/execution/redir4.0 similarity index 100% rename from tools/regression/bin/sh/execution/redir4.0 rename to bin/sh/tests/execution/redir4.0 diff --git a/tools/regression/bin/sh/execution/redir5.0 b/bin/sh/tests/execution/redir5.0 similarity index 100% rename from tools/regression/bin/sh/execution/redir5.0 rename to bin/sh/tests/execution/redir5.0 diff --git a/tools/regression/bin/sh/execution/redir6.0 b/bin/sh/tests/execution/redir6.0 similarity index 100% rename from tools/regression/bin/sh/execution/redir6.0 rename to bin/sh/tests/execution/redir6.0 diff --git a/tools/regression/bin/sh/execution/redir7.0 b/bin/sh/tests/execution/redir7.0 similarity index 100% rename from tools/regression/bin/sh/execution/redir7.0 rename to bin/sh/tests/execution/redir7.0 diff --git a/tools/regression/bin/sh/execution/set-n1.0 b/bin/sh/tests/execution/set-n1.0 similarity index 100% rename from tools/regression/bin/sh/execution/set-n1.0 rename to bin/sh/tests/execution/set-n1.0 diff --git a/tools/regression/bin/sh/execution/set-n2.0 b/bin/sh/tests/execution/set-n2.0 similarity index 100% rename from tools/regression/bin/sh/execution/set-n2.0 rename to bin/sh/tests/execution/set-n2.0 diff --git a/tools/regression/bin/sh/execution/set-n3.0 b/bin/sh/tests/execution/set-n3.0 similarity index 100% rename from tools/regression/bin/sh/execution/set-n3.0 rename to bin/sh/tests/execution/set-n3.0 diff --git a/tools/regression/bin/sh/execution/set-n4.0 b/bin/sh/tests/execution/set-n4.0 similarity index 100% rename from tools/regression/bin/sh/execution/set-n4.0 rename to bin/sh/tests/execution/set-n4.0 diff --git a/tools/regression/bin/sh/execution/set-x1.0 b/bin/sh/tests/execution/set-x1.0 similarity index 100% rename from tools/regression/bin/sh/execution/set-x1.0 rename to bin/sh/tests/execution/set-x1.0 diff --git a/tools/regression/bin/sh/execution/set-x2.0 b/bin/sh/tests/execution/set-x2.0 similarity index 100% rename from tools/regression/bin/sh/execution/set-x2.0 rename to bin/sh/tests/execution/set-x2.0 diff --git a/tools/regression/bin/sh/execution/set-x3.0 b/bin/sh/tests/execution/set-x3.0 similarity index 100% rename from tools/regression/bin/sh/execution/set-x3.0 rename to bin/sh/tests/execution/set-x3.0 diff --git a/tools/regression/bin/sh/execution/shellproc1.0 b/bin/sh/tests/execution/shellproc1.0 similarity index 100% rename from tools/regression/bin/sh/execution/shellproc1.0 rename to bin/sh/tests/execution/shellproc1.0 diff --git a/tools/regression/bin/sh/execution/subshell1.0 b/bin/sh/tests/execution/subshell1.0 similarity index 100% rename from tools/regression/bin/sh/execution/subshell1.0 rename to bin/sh/tests/execution/subshell1.0 diff --git a/tools/regression/bin/sh/execution/subshell1.0.stdout b/bin/sh/tests/execution/subshell1.0.stdout similarity index 100% rename from tools/regression/bin/sh/execution/subshell1.0.stdout rename to bin/sh/tests/execution/subshell1.0.stdout diff --git a/tools/regression/bin/sh/execution/subshell2.0 b/bin/sh/tests/execution/subshell2.0 similarity index 100% rename from tools/regression/bin/sh/execution/subshell2.0 rename to bin/sh/tests/execution/subshell2.0 diff --git a/tools/regression/bin/sh/execution/subshell3.0 b/bin/sh/tests/execution/subshell3.0 similarity index 100% rename from tools/regression/bin/sh/execution/subshell3.0 rename to bin/sh/tests/execution/subshell3.0 diff --git a/tools/regression/bin/sh/execution/subshell4.0 b/bin/sh/tests/execution/subshell4.0 similarity index 100% rename from tools/regression/bin/sh/execution/subshell4.0 rename to bin/sh/tests/execution/subshell4.0 diff --git a/tools/regression/bin/sh/execution/unknown1.0 b/bin/sh/tests/execution/unknown1.0 similarity index 100% rename from tools/regression/bin/sh/execution/unknown1.0 rename to bin/sh/tests/execution/unknown1.0 diff --git a/tools/regression/bin/sh/execution/var-assign1.0 b/bin/sh/tests/execution/var-assign1.0 similarity index 100% rename from tools/regression/bin/sh/execution/var-assign1.0 rename to bin/sh/tests/execution/var-assign1.0 diff --git a/bin/sh/tests/expansion/Makefile b/bin/sh/tests/expansion/Makefile new file mode 100644 index 000000000000..bd2431971f4a --- /dev/null +++ b/bin/sh/tests/expansion/Makefile @@ -0,0 +1,86 @@ +# $FreeBSD$ + +.include + +FILESDIR= ${TESTSBASE}/bin/sh/expansion +KYUAFILE= no + +FILES= arith1.0 +FILES+= arith2.0 +FILES+= arith3.0 +FILES+= arith4.0 +FILES+= arith5.0 +FILES+= arith6.0 +FILES+= arith7.0 +FILES+= arith8.0 +FILES+= arith9.0 +FILES+= arith10.0 +FILES+= arith11.0 +FILES+= arith12.0 +FILES+= arith13.0 +FILES+= assign1.0 +FILES+= cmdsubst1.0 +FILES+= cmdsubst2.0 +FILES+= cmdsubst3.0 +FILES+= cmdsubst4.0 +FILES+= cmdsubst5.0 +FILES+= cmdsubst6.0 +FILES+= cmdsubst7.0 +FILES+= cmdsubst8.0 +FILES+= cmdsubst9.0 +FILES+= cmdsubst10.0 +FILES+= cmdsubst11.0 +FILES+= cmdsubst12.0 +FILES+= cmdsubst13.0 +FILES+= cmdsubst14.0 +FILES+= cmdsubst15.0 +FILES+= cmdsubst16.0 +FILES+= cmdsubst17.0 +FILES+= export1.0 +FILES+= export2.0 +FILES+= export3.0 +FILES+= heredoc1.0 +FILES+= heredoc2.0 +FILES+= ifs1.0 +FILES+= ifs2.0 +FILES+= ifs3.0 +FILES+= ifs4.0 +FILES+= length1.0 +FILES+= length2.0 +FILES+= length3.0 +FILES+= length4.0 +FILES+= length5.0 +FILES+= length6.0 +FILES+= length7.0 +FILES+= length8.0 +FILES+= local1.0 +FILES+= local2.0 +FILES+= pathname1.0 +FILES+= pathname2.0 +FILES+= pathname3.0 +FILES+= pathname4.0 +FILES+= plus-minus1.0 +FILES+= plus-minus2.0 +FILES+= plus-minus3.0 +FILES+= plus-minus4.0 +FILES+= plus-minus5.0 +FILES+= plus-minus6.0 +FILES+= plus-minus7.0 +FILES+= plus-minus8.0 +FILES+= question1.0 +FILES+= readonly1.0 +FILES+= set-u1.0 +FILES+= set-u2.0 +FILES+= set-u3.0 +FILES+= tilde1.0 +FILES+= tilde2.0 +FILES+= trim1.0 +FILES+= trim2.0 +FILES+= trim3.0 +FILES+= trim4.0 +FILES+= trim5.0 +FILES+= trim6.0 +FILES+= trim7.0 +FILES+= trim8.0 + +.include diff --git a/tools/regression/bin/sh/expansion/arith1.0 b/bin/sh/tests/expansion/arith1.0 similarity index 100% rename from tools/regression/bin/sh/expansion/arith1.0 rename to bin/sh/tests/expansion/arith1.0 diff --git a/tools/regression/bin/sh/expansion/arith10.0 b/bin/sh/tests/expansion/arith10.0 similarity index 100% rename from tools/regression/bin/sh/expansion/arith10.0 rename to bin/sh/tests/expansion/arith10.0 diff --git a/tools/regression/bin/sh/expansion/arith11.0 b/bin/sh/tests/expansion/arith11.0 similarity index 100% rename from tools/regression/bin/sh/expansion/arith11.0 rename to bin/sh/tests/expansion/arith11.0 diff --git a/tools/regression/bin/sh/expansion/arith12.0 b/bin/sh/tests/expansion/arith12.0 similarity index 100% rename from tools/regression/bin/sh/expansion/arith12.0 rename to bin/sh/tests/expansion/arith12.0 diff --git a/tools/regression/bin/sh/expansion/arith13.0 b/bin/sh/tests/expansion/arith13.0 similarity index 100% rename from tools/regression/bin/sh/expansion/arith13.0 rename to bin/sh/tests/expansion/arith13.0 diff --git a/tools/regression/bin/sh/expansion/arith2.0 b/bin/sh/tests/expansion/arith2.0 similarity index 100% rename from tools/regression/bin/sh/expansion/arith2.0 rename to bin/sh/tests/expansion/arith2.0 diff --git a/tools/regression/bin/sh/expansion/arith3.0 b/bin/sh/tests/expansion/arith3.0 similarity index 100% rename from tools/regression/bin/sh/expansion/arith3.0 rename to bin/sh/tests/expansion/arith3.0 diff --git a/tools/regression/bin/sh/expansion/arith4.0 b/bin/sh/tests/expansion/arith4.0 similarity index 100% rename from tools/regression/bin/sh/expansion/arith4.0 rename to bin/sh/tests/expansion/arith4.0 diff --git a/tools/regression/bin/sh/expansion/arith5.0 b/bin/sh/tests/expansion/arith5.0 similarity index 100% rename from tools/regression/bin/sh/expansion/arith5.0 rename to bin/sh/tests/expansion/arith5.0 diff --git a/tools/regression/bin/sh/expansion/arith6.0 b/bin/sh/tests/expansion/arith6.0 similarity index 100% rename from tools/regression/bin/sh/expansion/arith6.0 rename to bin/sh/tests/expansion/arith6.0 diff --git a/tools/regression/bin/sh/expansion/arith7.0 b/bin/sh/tests/expansion/arith7.0 similarity index 100% rename from tools/regression/bin/sh/expansion/arith7.0 rename to bin/sh/tests/expansion/arith7.0 diff --git a/tools/regression/bin/sh/expansion/arith8.0 b/bin/sh/tests/expansion/arith8.0 similarity index 100% rename from tools/regression/bin/sh/expansion/arith8.0 rename to bin/sh/tests/expansion/arith8.0 diff --git a/tools/regression/bin/sh/expansion/arith9.0 b/bin/sh/tests/expansion/arith9.0 similarity index 100% rename from tools/regression/bin/sh/expansion/arith9.0 rename to bin/sh/tests/expansion/arith9.0 diff --git a/tools/regression/bin/sh/expansion/assign1.0 b/bin/sh/tests/expansion/assign1.0 similarity index 100% rename from tools/regression/bin/sh/expansion/assign1.0 rename to bin/sh/tests/expansion/assign1.0 diff --git a/tools/regression/bin/sh/expansion/cmdsubst1.0 b/bin/sh/tests/expansion/cmdsubst1.0 similarity index 100% rename from tools/regression/bin/sh/expansion/cmdsubst1.0 rename to bin/sh/tests/expansion/cmdsubst1.0 diff --git a/tools/regression/bin/sh/expansion/cmdsubst10.0 b/bin/sh/tests/expansion/cmdsubst10.0 similarity index 100% rename from tools/regression/bin/sh/expansion/cmdsubst10.0 rename to bin/sh/tests/expansion/cmdsubst10.0 diff --git a/tools/regression/bin/sh/expansion/cmdsubst11.0 b/bin/sh/tests/expansion/cmdsubst11.0 similarity index 100% rename from tools/regression/bin/sh/expansion/cmdsubst11.0 rename to bin/sh/tests/expansion/cmdsubst11.0 diff --git a/tools/regression/bin/sh/expansion/cmdsubst12.0 b/bin/sh/tests/expansion/cmdsubst12.0 similarity index 100% rename from tools/regression/bin/sh/expansion/cmdsubst12.0 rename to bin/sh/tests/expansion/cmdsubst12.0 diff --git a/tools/regression/bin/sh/expansion/cmdsubst13.0 b/bin/sh/tests/expansion/cmdsubst13.0 similarity index 100% rename from tools/regression/bin/sh/expansion/cmdsubst13.0 rename to bin/sh/tests/expansion/cmdsubst13.0 diff --git a/tools/regression/bin/sh/expansion/cmdsubst14.0 b/bin/sh/tests/expansion/cmdsubst14.0 similarity index 100% rename from tools/regression/bin/sh/expansion/cmdsubst14.0 rename to bin/sh/tests/expansion/cmdsubst14.0 diff --git a/tools/regression/bin/sh/expansion/cmdsubst15.0 b/bin/sh/tests/expansion/cmdsubst15.0 similarity index 100% rename from tools/regression/bin/sh/expansion/cmdsubst15.0 rename to bin/sh/tests/expansion/cmdsubst15.0 diff --git a/tools/regression/bin/sh/expansion/cmdsubst16.0 b/bin/sh/tests/expansion/cmdsubst16.0 similarity index 100% rename from tools/regression/bin/sh/expansion/cmdsubst16.0 rename to bin/sh/tests/expansion/cmdsubst16.0 diff --git a/tools/regression/bin/sh/expansion/cmdsubst17.0 b/bin/sh/tests/expansion/cmdsubst17.0 similarity index 100% rename from tools/regression/bin/sh/expansion/cmdsubst17.0 rename to bin/sh/tests/expansion/cmdsubst17.0 diff --git a/tools/regression/bin/sh/expansion/cmdsubst2.0 b/bin/sh/tests/expansion/cmdsubst2.0 similarity index 100% rename from tools/regression/bin/sh/expansion/cmdsubst2.0 rename to bin/sh/tests/expansion/cmdsubst2.0 diff --git a/tools/regression/bin/sh/expansion/cmdsubst3.0 b/bin/sh/tests/expansion/cmdsubst3.0 similarity index 100% rename from tools/regression/bin/sh/expansion/cmdsubst3.0 rename to bin/sh/tests/expansion/cmdsubst3.0 diff --git a/tools/regression/bin/sh/expansion/cmdsubst4.0 b/bin/sh/tests/expansion/cmdsubst4.0 similarity index 100% rename from tools/regression/bin/sh/expansion/cmdsubst4.0 rename to bin/sh/tests/expansion/cmdsubst4.0 diff --git a/tools/regression/bin/sh/expansion/cmdsubst5.0 b/bin/sh/tests/expansion/cmdsubst5.0 similarity index 100% rename from tools/regression/bin/sh/expansion/cmdsubst5.0 rename to bin/sh/tests/expansion/cmdsubst5.0 diff --git a/tools/regression/bin/sh/expansion/cmdsubst6.0 b/bin/sh/tests/expansion/cmdsubst6.0 similarity index 100% rename from tools/regression/bin/sh/expansion/cmdsubst6.0 rename to bin/sh/tests/expansion/cmdsubst6.0 diff --git a/tools/regression/bin/sh/expansion/cmdsubst7.0 b/bin/sh/tests/expansion/cmdsubst7.0 similarity index 100% rename from tools/regression/bin/sh/expansion/cmdsubst7.0 rename to bin/sh/tests/expansion/cmdsubst7.0 diff --git a/tools/regression/bin/sh/expansion/cmdsubst8.0 b/bin/sh/tests/expansion/cmdsubst8.0 similarity index 100% rename from tools/regression/bin/sh/expansion/cmdsubst8.0 rename to bin/sh/tests/expansion/cmdsubst8.0 diff --git a/tools/regression/bin/sh/expansion/cmdsubst9.0 b/bin/sh/tests/expansion/cmdsubst9.0 similarity index 100% rename from tools/regression/bin/sh/expansion/cmdsubst9.0 rename to bin/sh/tests/expansion/cmdsubst9.0 diff --git a/tools/regression/bin/sh/expansion/export1.0 b/bin/sh/tests/expansion/export1.0 similarity index 100% rename from tools/regression/bin/sh/expansion/export1.0 rename to bin/sh/tests/expansion/export1.0 diff --git a/tools/regression/bin/sh/expansion/export2.0 b/bin/sh/tests/expansion/export2.0 similarity index 100% rename from tools/regression/bin/sh/expansion/export2.0 rename to bin/sh/tests/expansion/export2.0 diff --git a/tools/regression/bin/sh/expansion/export3.0 b/bin/sh/tests/expansion/export3.0 similarity index 100% rename from tools/regression/bin/sh/expansion/export3.0 rename to bin/sh/tests/expansion/export3.0 diff --git a/tools/regression/bin/sh/expansion/heredoc1.0 b/bin/sh/tests/expansion/heredoc1.0 similarity index 100% rename from tools/regression/bin/sh/expansion/heredoc1.0 rename to bin/sh/tests/expansion/heredoc1.0 diff --git a/tools/regression/bin/sh/expansion/heredoc2.0 b/bin/sh/tests/expansion/heredoc2.0 similarity index 100% rename from tools/regression/bin/sh/expansion/heredoc2.0 rename to bin/sh/tests/expansion/heredoc2.0 diff --git a/tools/regression/bin/sh/expansion/ifs1.0 b/bin/sh/tests/expansion/ifs1.0 similarity index 100% rename from tools/regression/bin/sh/expansion/ifs1.0 rename to bin/sh/tests/expansion/ifs1.0 diff --git a/tools/regression/bin/sh/expansion/ifs2.0 b/bin/sh/tests/expansion/ifs2.0 similarity index 100% rename from tools/regression/bin/sh/expansion/ifs2.0 rename to bin/sh/tests/expansion/ifs2.0 diff --git a/tools/regression/bin/sh/expansion/ifs3.0 b/bin/sh/tests/expansion/ifs3.0 similarity index 100% rename from tools/regression/bin/sh/expansion/ifs3.0 rename to bin/sh/tests/expansion/ifs3.0 diff --git a/tools/regression/bin/sh/expansion/ifs4.0 b/bin/sh/tests/expansion/ifs4.0 similarity index 100% rename from tools/regression/bin/sh/expansion/ifs4.0 rename to bin/sh/tests/expansion/ifs4.0 diff --git a/tools/regression/bin/sh/expansion/length1.0 b/bin/sh/tests/expansion/length1.0 similarity index 100% rename from tools/regression/bin/sh/expansion/length1.0 rename to bin/sh/tests/expansion/length1.0 diff --git a/tools/regression/bin/sh/expansion/length2.0 b/bin/sh/tests/expansion/length2.0 similarity index 100% rename from tools/regression/bin/sh/expansion/length2.0 rename to bin/sh/tests/expansion/length2.0 diff --git a/tools/regression/bin/sh/expansion/length3.0 b/bin/sh/tests/expansion/length3.0 similarity index 100% rename from tools/regression/bin/sh/expansion/length3.0 rename to bin/sh/tests/expansion/length3.0 diff --git a/tools/regression/bin/sh/expansion/length4.0 b/bin/sh/tests/expansion/length4.0 similarity index 100% rename from tools/regression/bin/sh/expansion/length4.0 rename to bin/sh/tests/expansion/length4.0 diff --git a/tools/regression/bin/sh/expansion/length5.0 b/bin/sh/tests/expansion/length5.0 similarity index 100% rename from tools/regression/bin/sh/expansion/length5.0 rename to bin/sh/tests/expansion/length5.0 diff --git a/tools/regression/bin/sh/expansion/length6.0 b/bin/sh/tests/expansion/length6.0 similarity index 100% rename from tools/regression/bin/sh/expansion/length6.0 rename to bin/sh/tests/expansion/length6.0 diff --git a/tools/regression/bin/sh/expansion/length7.0 b/bin/sh/tests/expansion/length7.0 similarity index 100% rename from tools/regression/bin/sh/expansion/length7.0 rename to bin/sh/tests/expansion/length7.0 diff --git a/tools/regression/bin/sh/expansion/length8.0 b/bin/sh/tests/expansion/length8.0 similarity index 100% rename from tools/regression/bin/sh/expansion/length8.0 rename to bin/sh/tests/expansion/length8.0 diff --git a/tools/regression/bin/sh/expansion/local1.0 b/bin/sh/tests/expansion/local1.0 similarity index 100% rename from tools/regression/bin/sh/expansion/local1.0 rename to bin/sh/tests/expansion/local1.0 diff --git a/tools/regression/bin/sh/expansion/local2.0 b/bin/sh/tests/expansion/local2.0 similarity index 100% rename from tools/regression/bin/sh/expansion/local2.0 rename to bin/sh/tests/expansion/local2.0 diff --git a/tools/regression/bin/sh/expansion/pathname1.0 b/bin/sh/tests/expansion/pathname1.0 similarity index 100% rename from tools/regression/bin/sh/expansion/pathname1.0 rename to bin/sh/tests/expansion/pathname1.0 diff --git a/tools/regression/bin/sh/expansion/pathname2.0 b/bin/sh/tests/expansion/pathname2.0 similarity index 100% rename from tools/regression/bin/sh/expansion/pathname2.0 rename to bin/sh/tests/expansion/pathname2.0 diff --git a/tools/regression/bin/sh/expansion/pathname3.0 b/bin/sh/tests/expansion/pathname3.0 similarity index 100% rename from tools/regression/bin/sh/expansion/pathname3.0 rename to bin/sh/tests/expansion/pathname3.0 diff --git a/tools/regression/bin/sh/expansion/pathname4.0 b/bin/sh/tests/expansion/pathname4.0 similarity index 100% rename from tools/regression/bin/sh/expansion/pathname4.0 rename to bin/sh/tests/expansion/pathname4.0 diff --git a/tools/regression/bin/sh/expansion/plus-minus1.0 b/bin/sh/tests/expansion/plus-minus1.0 similarity index 100% rename from tools/regression/bin/sh/expansion/plus-minus1.0 rename to bin/sh/tests/expansion/plus-minus1.0 diff --git a/tools/regression/bin/sh/expansion/plus-minus2.0 b/bin/sh/tests/expansion/plus-minus2.0 similarity index 100% rename from tools/regression/bin/sh/expansion/plus-minus2.0 rename to bin/sh/tests/expansion/plus-minus2.0 diff --git a/tools/regression/bin/sh/expansion/plus-minus3.0 b/bin/sh/tests/expansion/plus-minus3.0 similarity index 100% rename from tools/regression/bin/sh/expansion/plus-minus3.0 rename to bin/sh/tests/expansion/plus-minus3.0 diff --git a/tools/regression/bin/sh/expansion/plus-minus4.0 b/bin/sh/tests/expansion/plus-minus4.0 similarity index 100% rename from tools/regression/bin/sh/expansion/plus-minus4.0 rename to bin/sh/tests/expansion/plus-minus4.0 diff --git a/tools/regression/bin/sh/expansion/plus-minus5.0 b/bin/sh/tests/expansion/plus-minus5.0 similarity index 100% rename from tools/regression/bin/sh/expansion/plus-minus5.0 rename to bin/sh/tests/expansion/plus-minus5.0 diff --git a/tools/regression/bin/sh/expansion/plus-minus6.0 b/bin/sh/tests/expansion/plus-minus6.0 similarity index 100% rename from tools/regression/bin/sh/expansion/plus-minus6.0 rename to bin/sh/tests/expansion/plus-minus6.0 diff --git a/tools/regression/bin/sh/expansion/plus-minus7.0 b/bin/sh/tests/expansion/plus-minus7.0 similarity index 100% rename from tools/regression/bin/sh/expansion/plus-minus7.0 rename to bin/sh/tests/expansion/plus-minus7.0 diff --git a/tools/regression/bin/sh/expansion/plus-minus8.0 b/bin/sh/tests/expansion/plus-minus8.0 similarity index 100% rename from tools/regression/bin/sh/expansion/plus-minus8.0 rename to bin/sh/tests/expansion/plus-minus8.0 diff --git a/tools/regression/bin/sh/expansion/question1.0 b/bin/sh/tests/expansion/question1.0 similarity index 100% rename from tools/regression/bin/sh/expansion/question1.0 rename to bin/sh/tests/expansion/question1.0 diff --git a/tools/regression/bin/sh/expansion/readonly1.0 b/bin/sh/tests/expansion/readonly1.0 similarity index 100% rename from tools/regression/bin/sh/expansion/readonly1.0 rename to bin/sh/tests/expansion/readonly1.0 diff --git a/tools/regression/bin/sh/expansion/set-u1.0 b/bin/sh/tests/expansion/set-u1.0 similarity index 100% rename from tools/regression/bin/sh/expansion/set-u1.0 rename to bin/sh/tests/expansion/set-u1.0 diff --git a/tools/regression/bin/sh/expansion/set-u2.0 b/bin/sh/tests/expansion/set-u2.0 similarity index 100% rename from tools/regression/bin/sh/expansion/set-u2.0 rename to bin/sh/tests/expansion/set-u2.0 diff --git a/tools/regression/bin/sh/expansion/set-u3.0 b/bin/sh/tests/expansion/set-u3.0 similarity index 100% rename from tools/regression/bin/sh/expansion/set-u3.0 rename to bin/sh/tests/expansion/set-u3.0 diff --git a/tools/regression/bin/sh/expansion/tilde1.0 b/bin/sh/tests/expansion/tilde1.0 similarity index 100% rename from tools/regression/bin/sh/expansion/tilde1.0 rename to bin/sh/tests/expansion/tilde1.0 diff --git a/tools/regression/bin/sh/expansion/tilde2.0 b/bin/sh/tests/expansion/tilde2.0 similarity index 100% rename from tools/regression/bin/sh/expansion/tilde2.0 rename to bin/sh/tests/expansion/tilde2.0 diff --git a/tools/regression/bin/sh/expansion/trim1.0 b/bin/sh/tests/expansion/trim1.0 similarity index 100% rename from tools/regression/bin/sh/expansion/trim1.0 rename to bin/sh/tests/expansion/trim1.0 diff --git a/tools/regression/bin/sh/expansion/trim2.0 b/bin/sh/tests/expansion/trim2.0 similarity index 100% rename from tools/regression/bin/sh/expansion/trim2.0 rename to bin/sh/tests/expansion/trim2.0 diff --git a/tools/regression/bin/sh/expansion/trim3.0 b/bin/sh/tests/expansion/trim3.0 similarity index 100% rename from tools/regression/bin/sh/expansion/trim3.0 rename to bin/sh/tests/expansion/trim3.0 diff --git a/tools/regression/bin/sh/expansion/trim4.0 b/bin/sh/tests/expansion/trim4.0 similarity index 100% rename from tools/regression/bin/sh/expansion/trim4.0 rename to bin/sh/tests/expansion/trim4.0 diff --git a/tools/regression/bin/sh/expansion/trim5.0 b/bin/sh/tests/expansion/trim5.0 similarity index 100% rename from tools/regression/bin/sh/expansion/trim5.0 rename to bin/sh/tests/expansion/trim5.0 diff --git a/tools/regression/bin/sh/expansion/trim6.0 b/bin/sh/tests/expansion/trim6.0 similarity index 100% rename from tools/regression/bin/sh/expansion/trim6.0 rename to bin/sh/tests/expansion/trim6.0 diff --git a/tools/regression/bin/sh/expansion/trim7.0 b/bin/sh/tests/expansion/trim7.0 similarity index 100% rename from tools/regression/bin/sh/expansion/trim7.0 rename to bin/sh/tests/expansion/trim7.0 diff --git a/tools/regression/bin/sh/expansion/trim8.0 b/bin/sh/tests/expansion/trim8.0 similarity index 100% rename from tools/regression/bin/sh/expansion/trim8.0 rename to bin/sh/tests/expansion/trim8.0 diff --git a/tools/regression/bin/sh/regress.sh b/bin/sh/tests/legacy_test.sh similarity index 64% rename from tools/regression/bin/sh/regress.sh rename to bin/sh/tests/legacy_test.sh index 60e580589a54..d43f5ddd8aab 100644 --- a/tools/regression/bin/sh/regress.sh +++ b/bin/sh/tests/legacy_test.sh @@ -1,10 +1,13 @@ # $FreeBSD$ -if [ -z "${SH}" ]; then - echo '${SH} is not set, please correct and re-run.' - exit 1 -fi -export SH=${SH} +: ${SH:="__SH__"} +export SH + +# TODO(jmmv): The Kyua TAP interface should be passing us the value of +# "srcdir" as an environment variable, just as it does with the ATF +# interface in the form of a configuration variable. For now, just try +# to guess this. +: ${TESTS_DATA:=$(dirname ${0})} COUNTER=1 @@ -17,6 +20,7 @@ do_test() { rm tmp.stdout tmp.stderr return fi + sed -I '' -e "s|^${TESTS_DATA}|.|" tmp.stderr for i in stdout stderr; do if [ -f ${1}.${i} ]; then if ! cmp -s tmp.${i} ${1}.${i}; then @@ -34,7 +38,7 @@ do_test() { rm tmp.stdout tmp.stderr } -TESTS=$(find -Es . -regex ".*\.[0-9]+") +TESTS=$(find -Es ${TESTS_DATA} -regex ".*\.[0-9]+") printf "1..%d\n" $(echo ${TESTS} | wc -w) for i in ${TESTS} ; do diff --git a/bin/sh/tests/parameters/Makefile b/bin/sh/tests/parameters/Makefile new file mode 100644 index 000000000000..cb76474fa292 --- /dev/null +++ b/bin/sh/tests/parameters/Makefile @@ -0,0 +1,18 @@ +# $FreeBSD$ + +.include + +FILESDIR= ${TESTSBASE}/bin/sh/parameters +KYUAFILE= no + +FILES= env1.0 +FILES+= exitstatus1.0 +FILES+= mail1.0 +FILES+= mail2.0 +FILES+= optind1.0 +FILES+= positional1.0 +FILES+= positional2.0 +FILES+= pwd1.0 +FILES+= pwd2.0 + +.include diff --git a/tools/regression/bin/sh/parameters/env1.0 b/bin/sh/tests/parameters/env1.0 similarity index 100% rename from tools/regression/bin/sh/parameters/env1.0 rename to bin/sh/tests/parameters/env1.0 diff --git a/tools/regression/bin/sh/parameters/exitstatus1.0 b/bin/sh/tests/parameters/exitstatus1.0 similarity index 100% rename from tools/regression/bin/sh/parameters/exitstatus1.0 rename to bin/sh/tests/parameters/exitstatus1.0 diff --git a/tools/regression/bin/sh/parameters/mail1.0 b/bin/sh/tests/parameters/mail1.0 similarity index 100% rename from tools/regression/bin/sh/parameters/mail1.0 rename to bin/sh/tests/parameters/mail1.0 diff --git a/tools/regression/bin/sh/parameters/mail2.0 b/bin/sh/tests/parameters/mail2.0 similarity index 100% rename from tools/regression/bin/sh/parameters/mail2.0 rename to bin/sh/tests/parameters/mail2.0 diff --git a/tools/regression/bin/sh/parameters/optind1.0 b/bin/sh/tests/parameters/optind1.0 similarity index 100% rename from tools/regression/bin/sh/parameters/optind1.0 rename to bin/sh/tests/parameters/optind1.0 diff --git a/tools/regression/bin/sh/parameters/positional1.0 b/bin/sh/tests/parameters/positional1.0 similarity index 100% rename from tools/regression/bin/sh/parameters/positional1.0 rename to bin/sh/tests/parameters/positional1.0 diff --git a/tools/regression/bin/sh/parameters/positional2.0 b/bin/sh/tests/parameters/positional2.0 similarity index 100% rename from tools/regression/bin/sh/parameters/positional2.0 rename to bin/sh/tests/parameters/positional2.0 diff --git a/tools/regression/bin/sh/parameters/pwd1.0 b/bin/sh/tests/parameters/pwd1.0 similarity index 100% rename from tools/regression/bin/sh/parameters/pwd1.0 rename to bin/sh/tests/parameters/pwd1.0 diff --git a/tools/regression/bin/sh/parameters/pwd2.0 b/bin/sh/tests/parameters/pwd2.0 similarity index 100% rename from tools/regression/bin/sh/parameters/pwd2.0 rename to bin/sh/tests/parameters/pwd2.0 diff --git a/bin/sh/tests/parser/Makefile b/bin/sh/tests/parser/Makefile new file mode 100644 index 000000000000..71bd370b0206 --- /dev/null +++ b/bin/sh/tests/parser/Makefile @@ -0,0 +1,59 @@ +# $FreeBSD$ + +.include + +FILESDIR= ${TESTSBASE}/bin/sh/parser +KYUAFILE= no + +FILES= alias1.0 +FILES+= alias2.0 +FILES+= alias3.0 +FILES+= alias4.0 +FILES+= alias5.0 +FILES+= alias6.0 +FILES+= alias7.0 +FILES+= alias8.0 +FILES+= alias9.0 +FILES+= alias10.0 +FILES+= and-pipe-not.0 +FILES+= case1.0 +FILES+= case2.0 +FILES+= dollar-quote1.0 +FILES+= dollar-quote2.0 +FILES+= dollar-quote3.0 +FILES+= dollar-quote4.0 +FILES+= dollar-quote5.0 +FILES+= dollar-quote6.0 +FILES+= dollar-quote7.0 +FILES+= dollar-quote8.0 +FILES+= dollar-quote9.0 +FILES+= dollar-quote10.0 +FILES+= dollar-quote11.0 +FILES+= empty-braces1.0 +FILES+= empty-cmd1.0 +FILES+= for1.0 +FILES+= for2.0 +FILES+= func1.0 +FILES+= func2.0 +FILES+= func3.0 +FILES+= heredoc1.0 +FILES+= heredoc2.0 +FILES+= heredoc3.0 +FILES+= heredoc4.0 +FILES+= heredoc5.0 +FILES+= heredoc6.0 +FILES+= heredoc7.0 +FILES+= heredoc8.0 +FILES+= heredoc9.0 +FILES+= heredoc10.0 +FILES+= heredoc11.0 +FILES+= no-space1.0 +FILES+= no-space2.0 +FILES+= only-redir1.0 +FILES+= only-redir2.0 +FILES+= only-redir3.0 +FILES+= only-redir4.0 +FILES+= pipe-not1.0 +FILES+= var-assign1.0 + +.include diff --git a/tools/regression/bin/sh/parser/alias1.0 b/bin/sh/tests/parser/alias1.0 similarity index 100% rename from tools/regression/bin/sh/parser/alias1.0 rename to bin/sh/tests/parser/alias1.0 diff --git a/tools/regression/bin/sh/parser/alias10.0 b/bin/sh/tests/parser/alias10.0 similarity index 100% rename from tools/regression/bin/sh/parser/alias10.0 rename to bin/sh/tests/parser/alias10.0 diff --git a/tools/regression/bin/sh/parser/alias2.0 b/bin/sh/tests/parser/alias2.0 similarity index 100% rename from tools/regression/bin/sh/parser/alias2.0 rename to bin/sh/tests/parser/alias2.0 diff --git a/tools/regression/bin/sh/parser/alias3.0 b/bin/sh/tests/parser/alias3.0 similarity index 100% rename from tools/regression/bin/sh/parser/alias3.0 rename to bin/sh/tests/parser/alias3.0 diff --git a/tools/regression/bin/sh/parser/alias4.0 b/bin/sh/tests/parser/alias4.0 similarity index 100% rename from tools/regression/bin/sh/parser/alias4.0 rename to bin/sh/tests/parser/alias4.0 diff --git a/tools/regression/bin/sh/parser/alias5.0 b/bin/sh/tests/parser/alias5.0 similarity index 100% rename from tools/regression/bin/sh/parser/alias5.0 rename to bin/sh/tests/parser/alias5.0 diff --git a/tools/regression/bin/sh/parser/alias6.0 b/bin/sh/tests/parser/alias6.0 similarity index 100% rename from tools/regression/bin/sh/parser/alias6.0 rename to bin/sh/tests/parser/alias6.0 diff --git a/tools/regression/bin/sh/parser/alias7.0 b/bin/sh/tests/parser/alias7.0 similarity index 100% rename from tools/regression/bin/sh/parser/alias7.0 rename to bin/sh/tests/parser/alias7.0 diff --git a/tools/regression/bin/sh/parser/alias8.0 b/bin/sh/tests/parser/alias8.0 similarity index 100% rename from tools/regression/bin/sh/parser/alias8.0 rename to bin/sh/tests/parser/alias8.0 diff --git a/tools/regression/bin/sh/parser/alias9.0 b/bin/sh/tests/parser/alias9.0 similarity index 100% rename from tools/regression/bin/sh/parser/alias9.0 rename to bin/sh/tests/parser/alias9.0 diff --git a/tools/regression/bin/sh/parser/and-pipe-not.0 b/bin/sh/tests/parser/and-pipe-not.0 similarity index 100% rename from tools/regression/bin/sh/parser/and-pipe-not.0 rename to bin/sh/tests/parser/and-pipe-not.0 diff --git a/tools/regression/bin/sh/parser/case1.0 b/bin/sh/tests/parser/case1.0 similarity index 100% rename from tools/regression/bin/sh/parser/case1.0 rename to bin/sh/tests/parser/case1.0 diff --git a/tools/regression/bin/sh/parser/case2.0 b/bin/sh/tests/parser/case2.0 similarity index 100% rename from tools/regression/bin/sh/parser/case2.0 rename to bin/sh/tests/parser/case2.0 diff --git a/tools/regression/bin/sh/parser/dollar-quote1.0 b/bin/sh/tests/parser/dollar-quote1.0 similarity index 100% rename from tools/regression/bin/sh/parser/dollar-quote1.0 rename to bin/sh/tests/parser/dollar-quote1.0 diff --git a/tools/regression/bin/sh/parser/dollar-quote10.0 b/bin/sh/tests/parser/dollar-quote10.0 similarity index 100% rename from tools/regression/bin/sh/parser/dollar-quote10.0 rename to bin/sh/tests/parser/dollar-quote10.0 diff --git a/tools/regression/bin/sh/parser/dollar-quote11.0 b/bin/sh/tests/parser/dollar-quote11.0 similarity index 100% rename from tools/regression/bin/sh/parser/dollar-quote11.0 rename to bin/sh/tests/parser/dollar-quote11.0 diff --git a/tools/regression/bin/sh/parser/dollar-quote2.0 b/bin/sh/tests/parser/dollar-quote2.0 similarity index 100% rename from tools/regression/bin/sh/parser/dollar-quote2.0 rename to bin/sh/tests/parser/dollar-quote2.0 diff --git a/tools/regression/bin/sh/parser/dollar-quote3.0 b/bin/sh/tests/parser/dollar-quote3.0 similarity index 100% rename from tools/regression/bin/sh/parser/dollar-quote3.0 rename to bin/sh/tests/parser/dollar-quote3.0 diff --git a/tools/regression/bin/sh/parser/dollar-quote4.0 b/bin/sh/tests/parser/dollar-quote4.0 similarity index 100% rename from tools/regression/bin/sh/parser/dollar-quote4.0 rename to bin/sh/tests/parser/dollar-quote4.0 diff --git a/tools/regression/bin/sh/parser/dollar-quote5.0 b/bin/sh/tests/parser/dollar-quote5.0 similarity index 100% rename from tools/regression/bin/sh/parser/dollar-quote5.0 rename to bin/sh/tests/parser/dollar-quote5.0 diff --git a/tools/regression/bin/sh/parser/dollar-quote6.0 b/bin/sh/tests/parser/dollar-quote6.0 similarity index 100% rename from tools/regression/bin/sh/parser/dollar-quote6.0 rename to bin/sh/tests/parser/dollar-quote6.0 diff --git a/tools/regression/bin/sh/parser/dollar-quote7.0 b/bin/sh/tests/parser/dollar-quote7.0 similarity index 100% rename from tools/regression/bin/sh/parser/dollar-quote7.0 rename to bin/sh/tests/parser/dollar-quote7.0 diff --git a/tools/regression/bin/sh/parser/dollar-quote8.0 b/bin/sh/tests/parser/dollar-quote8.0 similarity index 100% rename from tools/regression/bin/sh/parser/dollar-quote8.0 rename to bin/sh/tests/parser/dollar-quote8.0 diff --git a/tools/regression/bin/sh/parser/dollar-quote9.0 b/bin/sh/tests/parser/dollar-quote9.0 similarity index 100% rename from tools/regression/bin/sh/parser/dollar-quote9.0 rename to bin/sh/tests/parser/dollar-quote9.0 diff --git a/tools/regression/bin/sh/parser/empty-braces1.0 b/bin/sh/tests/parser/empty-braces1.0 similarity index 100% rename from tools/regression/bin/sh/parser/empty-braces1.0 rename to bin/sh/tests/parser/empty-braces1.0 diff --git a/tools/regression/bin/sh/parser/empty-cmd1.0 b/bin/sh/tests/parser/empty-cmd1.0 similarity index 100% rename from tools/regression/bin/sh/parser/empty-cmd1.0 rename to bin/sh/tests/parser/empty-cmd1.0 diff --git a/tools/regression/bin/sh/parser/for1.0 b/bin/sh/tests/parser/for1.0 similarity index 100% rename from tools/regression/bin/sh/parser/for1.0 rename to bin/sh/tests/parser/for1.0 diff --git a/tools/regression/bin/sh/parser/for2.0 b/bin/sh/tests/parser/for2.0 similarity index 100% rename from tools/regression/bin/sh/parser/for2.0 rename to bin/sh/tests/parser/for2.0 diff --git a/tools/regression/bin/sh/parser/func1.0 b/bin/sh/tests/parser/func1.0 similarity index 100% rename from tools/regression/bin/sh/parser/func1.0 rename to bin/sh/tests/parser/func1.0 diff --git a/tools/regression/bin/sh/parser/func2.0 b/bin/sh/tests/parser/func2.0 similarity index 100% rename from tools/regression/bin/sh/parser/func2.0 rename to bin/sh/tests/parser/func2.0 diff --git a/tools/regression/bin/sh/parser/func3.0 b/bin/sh/tests/parser/func3.0 similarity index 100% rename from tools/regression/bin/sh/parser/func3.0 rename to bin/sh/tests/parser/func3.0 diff --git a/tools/regression/bin/sh/parser/heredoc1.0 b/bin/sh/tests/parser/heredoc1.0 similarity index 100% rename from tools/regression/bin/sh/parser/heredoc1.0 rename to bin/sh/tests/parser/heredoc1.0 diff --git a/tools/regression/bin/sh/parser/heredoc10.0 b/bin/sh/tests/parser/heredoc10.0 similarity index 100% rename from tools/regression/bin/sh/parser/heredoc10.0 rename to bin/sh/tests/parser/heredoc10.0 diff --git a/tools/regression/bin/sh/parser/heredoc11.0 b/bin/sh/tests/parser/heredoc11.0 similarity index 100% rename from tools/regression/bin/sh/parser/heredoc11.0 rename to bin/sh/tests/parser/heredoc11.0 diff --git a/tools/regression/bin/sh/parser/heredoc2.0 b/bin/sh/tests/parser/heredoc2.0 similarity index 100% rename from tools/regression/bin/sh/parser/heredoc2.0 rename to bin/sh/tests/parser/heredoc2.0 diff --git a/tools/regression/bin/sh/parser/heredoc3.0 b/bin/sh/tests/parser/heredoc3.0 similarity index 100% rename from tools/regression/bin/sh/parser/heredoc3.0 rename to bin/sh/tests/parser/heredoc3.0 diff --git a/tools/regression/bin/sh/parser/heredoc4.0 b/bin/sh/tests/parser/heredoc4.0 similarity index 100% rename from tools/regression/bin/sh/parser/heredoc4.0 rename to bin/sh/tests/parser/heredoc4.0 diff --git a/tools/regression/bin/sh/parser/heredoc5.0 b/bin/sh/tests/parser/heredoc5.0 similarity index 100% rename from tools/regression/bin/sh/parser/heredoc5.0 rename to bin/sh/tests/parser/heredoc5.0 diff --git a/tools/regression/bin/sh/parser/heredoc6.0 b/bin/sh/tests/parser/heredoc6.0 similarity index 100% rename from tools/regression/bin/sh/parser/heredoc6.0 rename to bin/sh/tests/parser/heredoc6.0 diff --git a/tools/regression/bin/sh/parser/heredoc7.0 b/bin/sh/tests/parser/heredoc7.0 similarity index 100% rename from tools/regression/bin/sh/parser/heredoc7.0 rename to bin/sh/tests/parser/heredoc7.0 diff --git a/tools/regression/bin/sh/parser/heredoc8.0 b/bin/sh/tests/parser/heredoc8.0 similarity index 100% rename from tools/regression/bin/sh/parser/heredoc8.0 rename to bin/sh/tests/parser/heredoc8.0 diff --git a/tools/regression/bin/sh/parser/heredoc9.0 b/bin/sh/tests/parser/heredoc9.0 similarity index 100% rename from tools/regression/bin/sh/parser/heredoc9.0 rename to bin/sh/tests/parser/heredoc9.0 diff --git a/tools/regression/bin/sh/parser/no-space1.0 b/bin/sh/tests/parser/no-space1.0 similarity index 100% rename from tools/regression/bin/sh/parser/no-space1.0 rename to bin/sh/tests/parser/no-space1.0 diff --git a/tools/regression/bin/sh/parser/no-space2.0 b/bin/sh/tests/parser/no-space2.0 similarity index 100% rename from tools/regression/bin/sh/parser/no-space2.0 rename to bin/sh/tests/parser/no-space2.0 diff --git a/tools/regression/bin/sh/parser/only-redir1.0 b/bin/sh/tests/parser/only-redir1.0 similarity index 100% rename from tools/regression/bin/sh/parser/only-redir1.0 rename to bin/sh/tests/parser/only-redir1.0 diff --git a/tools/regression/bin/sh/parser/only-redir2.0 b/bin/sh/tests/parser/only-redir2.0 similarity index 100% rename from tools/regression/bin/sh/parser/only-redir2.0 rename to bin/sh/tests/parser/only-redir2.0 diff --git a/tools/regression/bin/sh/parser/only-redir3.0 b/bin/sh/tests/parser/only-redir3.0 similarity index 100% rename from tools/regression/bin/sh/parser/only-redir3.0 rename to bin/sh/tests/parser/only-redir3.0 diff --git a/tools/regression/bin/sh/parser/only-redir4.0 b/bin/sh/tests/parser/only-redir4.0 similarity index 100% rename from tools/regression/bin/sh/parser/only-redir4.0 rename to bin/sh/tests/parser/only-redir4.0 diff --git a/tools/regression/bin/sh/parser/pipe-not1.0 b/bin/sh/tests/parser/pipe-not1.0 similarity index 100% rename from tools/regression/bin/sh/parser/pipe-not1.0 rename to bin/sh/tests/parser/pipe-not1.0 diff --git a/tools/regression/bin/sh/parser/var-assign1.0 b/bin/sh/tests/parser/var-assign1.0 similarity index 100% rename from tools/regression/bin/sh/parser/var-assign1.0 rename to bin/sh/tests/parser/var-assign1.0 diff --git a/bin/sh/tests/set-e/Makefile b/bin/sh/tests/set-e/Makefile new file mode 100644 index 000000000000..55d79174f98a --- /dev/null +++ b/bin/sh/tests/set-e/Makefile @@ -0,0 +1,44 @@ +# $FreeBSD$ + +.include + +FILESDIR= ${TESTSBASE}/bin/sh/set-e +KYUAFILE= no + +FILES= and1.0 +FILES+= and2.1 +FILES+= and3.0 +FILES+= and4.0 +FILES+= background1.0 +FILES+= cmd1.0 +FILES+= cmd2.1 +FILES+= elif1.0 +FILES+= elif2.0 +FILES+= eval1.0 +FILES+= eval2.1 +FILES+= for1.0 +FILES+= func1.0 +FILES+= func2.1 +FILES+= if1.0 +FILES+= if2.0 +FILES+= if3.0 +FILES+= not1.0 +FILES+= not2.0 +FILES+= or1.0 +FILES+= or2.0 +FILES+= or3.1 +FILES+= pipe1.1 +FILES+= pipe2.0 +FILES+= return1.0 +FILES+= semi1.1 +FILES+= semi2.1 +FILES+= subshell1.0 +FILES+= subshell2.1 +FILES+= until1.0 +FILES+= until2.0 +FILES+= until3.0 +FILES+= while1.0 +FILES+= while2.0 +FILES+= while3.0 + +.include diff --git a/tools/regression/bin/sh/set-e/and1.0 b/bin/sh/tests/set-e/and1.0 similarity index 100% rename from tools/regression/bin/sh/set-e/and1.0 rename to bin/sh/tests/set-e/and1.0 diff --git a/tools/regression/bin/sh/set-e/and2.1 b/bin/sh/tests/set-e/and2.1 similarity index 100% rename from tools/regression/bin/sh/set-e/and2.1 rename to bin/sh/tests/set-e/and2.1 diff --git a/tools/regression/bin/sh/set-e/and3.0 b/bin/sh/tests/set-e/and3.0 similarity index 100% rename from tools/regression/bin/sh/set-e/and3.0 rename to bin/sh/tests/set-e/and3.0 diff --git a/tools/regression/bin/sh/set-e/and4.0 b/bin/sh/tests/set-e/and4.0 similarity index 100% rename from tools/regression/bin/sh/set-e/and4.0 rename to bin/sh/tests/set-e/and4.0 diff --git a/tools/regression/bin/sh/set-e/background1.0 b/bin/sh/tests/set-e/background1.0 similarity index 100% rename from tools/regression/bin/sh/set-e/background1.0 rename to bin/sh/tests/set-e/background1.0 diff --git a/tools/regression/bin/sh/set-e/cmd1.0 b/bin/sh/tests/set-e/cmd1.0 similarity index 100% rename from tools/regression/bin/sh/set-e/cmd1.0 rename to bin/sh/tests/set-e/cmd1.0 diff --git a/tools/regression/bin/sh/set-e/cmd2.1 b/bin/sh/tests/set-e/cmd2.1 similarity index 100% rename from tools/regression/bin/sh/set-e/cmd2.1 rename to bin/sh/tests/set-e/cmd2.1 diff --git a/tools/regression/bin/sh/set-e/elif1.0 b/bin/sh/tests/set-e/elif1.0 similarity index 100% rename from tools/regression/bin/sh/set-e/elif1.0 rename to bin/sh/tests/set-e/elif1.0 diff --git a/tools/regression/bin/sh/set-e/elif2.0 b/bin/sh/tests/set-e/elif2.0 similarity index 100% rename from tools/regression/bin/sh/set-e/elif2.0 rename to bin/sh/tests/set-e/elif2.0 diff --git a/tools/regression/bin/sh/set-e/eval1.0 b/bin/sh/tests/set-e/eval1.0 similarity index 100% rename from tools/regression/bin/sh/set-e/eval1.0 rename to bin/sh/tests/set-e/eval1.0 diff --git a/tools/regression/bin/sh/set-e/eval2.1 b/bin/sh/tests/set-e/eval2.1 similarity index 100% rename from tools/regression/bin/sh/set-e/eval2.1 rename to bin/sh/tests/set-e/eval2.1 diff --git a/tools/regression/bin/sh/set-e/for1.0 b/bin/sh/tests/set-e/for1.0 similarity index 100% rename from tools/regression/bin/sh/set-e/for1.0 rename to bin/sh/tests/set-e/for1.0 diff --git a/tools/regression/bin/sh/set-e/func1.0 b/bin/sh/tests/set-e/func1.0 similarity index 100% rename from tools/regression/bin/sh/set-e/func1.0 rename to bin/sh/tests/set-e/func1.0 diff --git a/tools/regression/bin/sh/set-e/func2.1 b/bin/sh/tests/set-e/func2.1 similarity index 100% rename from tools/regression/bin/sh/set-e/func2.1 rename to bin/sh/tests/set-e/func2.1 diff --git a/tools/regression/bin/sh/set-e/if1.0 b/bin/sh/tests/set-e/if1.0 similarity index 100% rename from tools/regression/bin/sh/set-e/if1.0 rename to bin/sh/tests/set-e/if1.0 diff --git a/tools/regression/bin/sh/set-e/if2.0 b/bin/sh/tests/set-e/if2.0 similarity index 100% rename from tools/regression/bin/sh/set-e/if2.0 rename to bin/sh/tests/set-e/if2.0 diff --git a/tools/regression/bin/sh/set-e/if3.0 b/bin/sh/tests/set-e/if3.0 similarity index 100% rename from tools/regression/bin/sh/set-e/if3.0 rename to bin/sh/tests/set-e/if3.0 diff --git a/tools/regression/bin/sh/set-e/not1.0 b/bin/sh/tests/set-e/not1.0 similarity index 100% rename from tools/regression/bin/sh/set-e/not1.0 rename to bin/sh/tests/set-e/not1.0 diff --git a/tools/regression/bin/sh/set-e/not2.0 b/bin/sh/tests/set-e/not2.0 similarity index 100% rename from tools/regression/bin/sh/set-e/not2.0 rename to bin/sh/tests/set-e/not2.0 diff --git a/tools/regression/bin/sh/set-e/or1.0 b/bin/sh/tests/set-e/or1.0 similarity index 100% rename from tools/regression/bin/sh/set-e/or1.0 rename to bin/sh/tests/set-e/or1.0 diff --git a/tools/regression/bin/sh/set-e/or2.0 b/bin/sh/tests/set-e/or2.0 similarity index 100% rename from tools/regression/bin/sh/set-e/or2.0 rename to bin/sh/tests/set-e/or2.0 diff --git a/tools/regression/bin/sh/set-e/or3.1 b/bin/sh/tests/set-e/or3.1 similarity index 100% rename from tools/regression/bin/sh/set-e/or3.1 rename to bin/sh/tests/set-e/or3.1 diff --git a/tools/regression/bin/sh/set-e/pipe1.1 b/bin/sh/tests/set-e/pipe1.1 similarity index 100% rename from tools/regression/bin/sh/set-e/pipe1.1 rename to bin/sh/tests/set-e/pipe1.1 diff --git a/tools/regression/bin/sh/set-e/pipe2.0 b/bin/sh/tests/set-e/pipe2.0 similarity index 100% rename from tools/regression/bin/sh/set-e/pipe2.0 rename to bin/sh/tests/set-e/pipe2.0 diff --git a/tools/regression/bin/sh/set-e/return1.0 b/bin/sh/tests/set-e/return1.0 similarity index 100% rename from tools/regression/bin/sh/set-e/return1.0 rename to bin/sh/tests/set-e/return1.0 diff --git a/tools/regression/bin/sh/set-e/semi1.1 b/bin/sh/tests/set-e/semi1.1 similarity index 100% rename from tools/regression/bin/sh/set-e/semi1.1 rename to bin/sh/tests/set-e/semi1.1 diff --git a/tools/regression/bin/sh/set-e/semi2.1 b/bin/sh/tests/set-e/semi2.1 similarity index 100% rename from tools/regression/bin/sh/set-e/semi2.1 rename to bin/sh/tests/set-e/semi2.1 diff --git a/tools/regression/bin/sh/set-e/subshell1.0 b/bin/sh/tests/set-e/subshell1.0 similarity index 100% rename from tools/regression/bin/sh/set-e/subshell1.0 rename to bin/sh/tests/set-e/subshell1.0 diff --git a/tools/regression/bin/sh/set-e/subshell2.1 b/bin/sh/tests/set-e/subshell2.1 similarity index 100% rename from tools/regression/bin/sh/set-e/subshell2.1 rename to bin/sh/tests/set-e/subshell2.1 diff --git a/tools/regression/bin/sh/set-e/until1.0 b/bin/sh/tests/set-e/until1.0 similarity index 100% rename from tools/regression/bin/sh/set-e/until1.0 rename to bin/sh/tests/set-e/until1.0 diff --git a/tools/regression/bin/sh/set-e/until2.0 b/bin/sh/tests/set-e/until2.0 similarity index 100% rename from tools/regression/bin/sh/set-e/until2.0 rename to bin/sh/tests/set-e/until2.0 diff --git a/tools/regression/bin/sh/set-e/until3.0 b/bin/sh/tests/set-e/until3.0 similarity index 100% rename from tools/regression/bin/sh/set-e/until3.0 rename to bin/sh/tests/set-e/until3.0 diff --git a/tools/regression/bin/sh/set-e/while1.0 b/bin/sh/tests/set-e/while1.0 similarity index 100% rename from tools/regression/bin/sh/set-e/while1.0 rename to bin/sh/tests/set-e/while1.0 diff --git a/tools/regression/bin/sh/set-e/while2.0 b/bin/sh/tests/set-e/while2.0 similarity index 100% rename from tools/regression/bin/sh/set-e/while2.0 rename to bin/sh/tests/set-e/while2.0 diff --git a/tools/regression/bin/sh/set-e/while3.0 b/bin/sh/tests/set-e/while3.0 similarity index 100% rename from tools/regression/bin/sh/set-e/while3.0 rename to bin/sh/tests/set-e/while3.0 diff --git a/bin/test/Makefile b/bin/test/Makefile index 7c64b40347ef..e9a0507f0cac 100644 --- a/bin/test/Makefile +++ b/bin/test/Makefile @@ -1,8 +1,14 @@ # @(#)Makefile 8.1 (Berkeley) 5/31/93 # $FreeBSD$ +.include + PROG= test LINKS= ${BINDIR}/test ${BINDIR}/[ MLINKS= test.1 [.1 +.if ${MK_TESTS} != "no" +SUBDIR+= tests +.endif + .include diff --git a/bin/test/tests/Makefile b/bin/test/tests/Makefile new file mode 100644 index 000000000000..c5743de39c70 --- /dev/null +++ b/bin/test/tests/Makefile @@ -0,0 +1,9 @@ +# $FreeBSD$ + +.include + +TESTSDIR= ${TESTSBASE}/bin/test + +TAP_TESTS_SH= legacy_test + +.include diff --git a/tools/regression/bin/test/regress.sh b/bin/test/tests/legacy_test.sh similarity index 100% rename from tools/regression/bin/test/regress.sh rename to bin/test/tests/legacy_test.sh diff --git a/bin/tests/Makefile b/bin/tests/Makefile new file mode 100644 index 000000000000..7a59b1029513 --- /dev/null +++ b/bin/tests/Makefile @@ -0,0 +1,10 @@ +# $FreeBSD$ + +.include + +TESTSDIR= ${TESTSBASE}/bin + +.PATH: ${.CURDIR:H:H}/tests +KYUAFILE= yes + +.include diff --git a/etc/mtree/BSD.tests.dist b/etc/mtree/BSD.tests.dist index 65f909023a97..b7ebbb9949a6 100644 --- a/etc/mtree/BSD.tests.dist +++ b/etc/mtree/BSD.tests.dist @@ -20,6 +20,32 @@ .. .. tests + bin + date + .. + mv + .. + pax + .. + sh + builtins + .. + errors + .. + execution + .. + expansion + .. + parameters + .. + parser + .. + set-e + .. + .. + test + .. + .. lib atf libatf-c diff --git a/tools/regression/bin/Makefile b/tools/regression/bin/Makefile deleted file mode 100644 index 1dcdbb396c6d..000000000000 --- a/tools/regression/bin/Makefile +++ /dev/null @@ -1,5 +0,0 @@ -# $FreeBSD$ - -SUBDIR= date mv pax sh test - -.include diff --git a/tools/regression/bin/date/Makefile b/tools/regression/bin/date/Makefile deleted file mode 100644 index 2c9ca5943505..000000000000 --- a/tools/regression/bin/date/Makefile +++ /dev/null @@ -1,4 +0,0 @@ -# $FreeBSD$ - -all: - sh regress.sh diff --git a/tools/regression/bin/date/regress.t b/tools/regression/bin/date/regress.t deleted file mode 100644 index c36d8342d32a..000000000000 --- a/tools/regression/bin/date/regress.t +++ /dev/null @@ -1,6 +0,0 @@ -#!/bin/sh -# $FreeBSD$ - -cd `dirname $0` - -sh regress.sh diff --git a/tools/regression/bin/mv/Makefile b/tools/regression/bin/mv/Makefile deleted file mode 100644 index 2c9ca5943505..000000000000 --- a/tools/regression/bin/mv/Makefile +++ /dev/null @@ -1,4 +0,0 @@ -# $FreeBSD$ - -all: - sh regress.sh diff --git a/tools/regression/bin/mv/regress.t b/tools/regression/bin/mv/regress.t deleted file mode 100644 index c36d8342d32a..000000000000 --- a/tools/regression/bin/mv/regress.t +++ /dev/null @@ -1,6 +0,0 @@ -#!/bin/sh -# $FreeBSD$ - -cd `dirname $0` - -sh regress.sh diff --git a/tools/regression/bin/pax/Makefile b/tools/regression/bin/pax/Makefile deleted file mode 100644 index 6855bca9706e..000000000000 --- a/tools/regression/bin/pax/Makefile +++ /dev/null @@ -1,8 +0,0 @@ -# $FreeBSD$ - -all test: - prove -vmw regress.t - -clean: - rm -rf ustar-pathnames-[12] - rm -f ustar.ok ustar.fail* diff --git a/tools/regression/bin/sh/Makefile b/tools/regression/bin/sh/Makefile deleted file mode 100644 index 82b9c09f2c2e..000000000000 --- a/tools/regression/bin/sh/Makefile +++ /dev/null @@ -1,7 +0,0 @@ -# $FreeBSD$ - -# Allow one to specify the 'sh' to regress. -SH?= /bin/sh - -all: - env SH=${SH} ${SH} regress.sh diff --git a/tools/regression/bin/sh/regress.t b/tools/regression/bin/sh/regress.t deleted file mode 100644 index 89b1828e8da7..000000000000 --- a/tools/regression/bin/sh/regress.t +++ /dev/null @@ -1,8 +0,0 @@ -#!/bin/sh -# $FreeBSD$ - -export SH="${SH:-sh}" - -cd `dirname $0` - -${SH} regress.sh diff --git a/tools/regression/bin/test/Makefile b/tools/regression/bin/test/Makefile deleted file mode 100644 index 2c9ca5943505..000000000000 --- a/tools/regression/bin/test/Makefile +++ /dev/null @@ -1,4 +0,0 @@ -# $FreeBSD$ - -all: - sh regress.sh diff --git a/tools/regression/bin/test/regress.t b/tools/regression/bin/test/regress.t deleted file mode 100644 index c36d8342d32a..000000000000 --- a/tools/regression/bin/test/regress.t +++ /dev/null @@ -1,6 +0,0 @@ -#!/bin/sh -# $FreeBSD$ - -cd `dirname $0` - -sh regress.sh