diff options
| author | Julio Merino <jmmv@FreeBSD.org> | 2014-03-19 12:29:20 +0000 |
|---|---|---|
| committer | Julio Merino <jmmv@FreeBSD.org> | 2014-03-19 12:29:20 +0000 |
| commit | d525bcd959742df2fe7f3dbcd251284537121190 (patch) | |
| tree | a2679f017f077e354a85651417b67b88de3d18e8 /tools/regression | |
| parent | f743627b41d885b1f6ff1e5cc085eeb78ec20372 (diff) | |
Notes
Diffstat (limited to 'tools/regression')
272 files changed, 0 insertions, 2225 deletions
diff --git a/tools/regression/usr.bin/make/README b/tools/regression/usr.bin/make/README deleted file mode 100644 index 32b4ddc5168be..0000000000000 --- a/tools/regression/usr.bin/make/README +++ /dev/null @@ -1,176 +0,0 @@ -$FreeBSD$ - -This directory contains regression tests for make(1). - -To invoke the tests install prove(1) from ports/devel/p5-Test-Harness and -run 'prove -r'. Alternatively one can use 'sh ./all.sh test' and scan the -output for '^not ok'. - ----------------------------------------------------------------------------- - -The rest of this file is intended for developers. - -The tests are invoked via the test.sh script or prove(1) from p5-Test-Harness. -Tests are normally executed in a special test directory that is built under -/tmp. The reason for this is, that make tests are generally influenced by -all file in a directory, by files in one of make's obscure object directories -as well as in other directories make happens to look into. Therefor the -test scripts build a clean environment in the temp directory and the -tests are executed by cd-ing into that directory and invoking make. The -output of the make run (standard output, standard error and the exit status) -are written into files that are created in another directory. So the layout -for the shell/builtin test looks like: - - ./shell/builtin/ - directory with test stuff - /tmp/make.${USER}/shell/builtin - actual test directory - /tmp/make.${USER}/shell/builtin.OUTPUT - output files - -So a full test consists of the following steps: - - setup - Set up the test environment by creating the test directory - and populating it with the needed files. If the test - directory already exists an error is printed. - - run - Run the test and produce the output into the output - directory. - - show - Show the result files on the screen. - - compare - Compare the results in the output directory with those - in the test source directory. This just prints whether - the test was ok or not in the format used by prove(1). - - diff - Diff the output files and the expected output files. - - reset - Reset the test to its initial state. - - clean - Remove both the test directory and the output directory. - -Each of these steps can independently be invoked with the test script -contained in each directory. These test scripts are called test.t. -Additionally the scripts understand the following commands: - - test - Run setup, run and compare. - - prove - Run setup, run, compare and clean. This is identically - to invoking the script without an argument. - - desc - Print a short test description. - - update - Update the expected results from the actual results. - -The test script has the following syntax: - - % test.t [-v] [-m path_to_make_binary] command - -To invoke it via prove(1) use: - - % [MAKE_PROG=path_to_make_binary] prove [options] [files/directories] - -Example: - % sh test.t -m `pwd`/../obj/make run - % MAKE_PROG=/usr/obj/usr/src/usr.bin/make/make prove -r - -The test scripts use the following environment variables that can be set -by the user in the test script's environment: - - WORK_BASE - - Base directory for working files. If not set - /tmp/make.${USER} is used. - - MAKE_PROG - - Path to the make program to test. If not set - /usr/bin/make is used. - -The following variables are available to test scripts: - - SRC_BASE - - test source base directory. This is determined by - repeatedly doing cd .. and checking for common.sh. - Therefor this can fail if a test source directory is - actually a symbolic link and is physically not located - below the directory containing common.sh. - - SUBDIR - - subdirectory below WORK_BASE and SRC_BASE for current test - - WORK_DIR - - ${WORK_BASE}/${SUBDIR} - - SRC_DIR - - ${SRC_BASE}/${SUBDIR} - -The following variables and functions may be defined by the test script. -This also lists special filenames. - - DESC - A one-line description of the test. - - TEST_MAKE_DIRS - A list of pairs of directory names and modes. These - directories are created during setup and reset. When - the directory already exists (during reset) only the - mode change is applied. - - TEST_MAKE_DIRS="subdir 775 subdir/sub 555" - - TEST_COPY_FILES - A list of pairs of file names and modes. These files - are copied from the source to the working directory - during setup and reset. When the file already exists - (during reset) only the mode change is applied. Files - may be copied from/to sub-directories. The sub-directory - in the working directory must already exists (see - TEST_MAKE_DIRS). - - TEST_COPY_FILES="libtest.a 444 subdir/libfoo.a 444" - - TEST_TOUCH - List of pairs of file names and arguments to touch(1). - During setup and reset for each list element touch(1) - is executed. - - TEST_TOUCH="file1 '-t 200501011257'" - - TEST_LINK - List of pairs of filenames. Each pair is passed to ln(1). - All names are prefixed with the working directory. - - Makefile - If a file with this name exists in the source directory - it is automatically copied to the working directory. - - setup_test() - If this function exists it is executed at the end of the - setup. - - reset_test() - If this function exists it is executed at the end of the - reset. - - TEST_CLEAN_FILES - A list of file to be deleted when resetting. - - TEST_N - Number of tests in this script. If not set this is assumed - to be 1. - - TEST_<number> - Arguments to make for test number <number>. If not set - the default argument of test<number> is used. To run a test - without argument to make, set TEST_<number> to the empty string. - - TEST_<number>_SKIP - To skip a test (for whatever reason) this should be set - to a string explaining the reason for skipping the test. - - TEST_<number>_TODO - For a test that should fail this is a short string describing - what the problem in make(1) is that should be fixed. - - run_test() - Function to run a test. This function gets a single argument - which is the number of the test to executed. The default - function evaluates the variable TEST_<number> and calls - make with the arguments in this variable. - diff --git a/tools/regression/usr.bin/make/all.sh b/tools/regression/usr.bin/make/all.sh deleted file mode 100755 index 42f9e73e6abca..0000000000000 --- a/tools/regression/usr.bin/make/all.sh +++ /dev/null @@ -1,16 +0,0 @@ -#!/bin/sh -# $FreeBSD$ - -# find all test scripts below our current directory -SCRIPTS=`find . -name test.t` - -if [ -z "${SCRIPTS}" ] ; then - exit 0 -fi - -for i in ${SCRIPTS} ; do - ( - cd `dirname $i` - sh ./test.t $1 - ) -done diff --git a/tools/regression/usr.bin/make/archives/fmt_44bsd/Makefile b/tools/regression/usr.bin/make/archives/fmt_44bsd/Makefile deleted file mode 100644 index 5a8b065d20c9e..0000000000000 --- a/tools/regression/usr.bin/make/archives/fmt_44bsd/Makefile +++ /dev/null @@ -1,61 +0,0 @@ -# $FreeBSD$ -# This test checks the code reading archive files. The archive file -# is a BSD4.4 file with __.SYMTAB and #1/N long file names. - -############################################################################# - -# should be ok -test1: libtest.a(short.o) - @: - -libtest.a(short.o): ood - @: - -############################################################################# - -# should be ok -test2: libtest.a(exactly15char.o) - @: - -libtest.a(exactly15char.o): ood - @: - -############################################################################# - -# should be ok -test3: libtest.a(exactly16chars.o) - @: - -libtest.a(exactly16chars.o): ood - @: - -############################################################################# - -# should be ok -test4: libtest.a(verylongobjectname.o) - @: - -libtest.a(verylongobjectname.o): ood - @: - -############################################################################# - -# Truncated to 16 characters -# should fail -test5: libtest.a(verylongobjectna) - @: - -############################################################################# - -# Truncated to 15 characters -# should fail -test6: libtest.a(verylongobjectn) - @: - -############################################################################# - -# should fail -test7: libtest.a(\#1/20) - @: - -ood: diff --git a/tools/regression/usr.bin/make/archives/fmt_44bsd/expected.status.1 b/tools/regression/usr.bin/make/archives/fmt_44bsd/expected.status.1 deleted file mode 100644 index 573541ac9702d..0000000000000 --- a/tools/regression/usr.bin/make/archives/fmt_44bsd/expected.status.1 +++ /dev/null @@ -1 +0,0 @@ -0 diff --git a/tools/regression/usr.bin/make/archives/fmt_44bsd/expected.status.2 b/tools/regression/usr.bin/make/archives/fmt_44bsd/expected.status.2 deleted file mode 100644 index 573541ac9702d..0000000000000 --- a/tools/regression/usr.bin/make/archives/fmt_44bsd/expected.status.2 +++ /dev/null @@ -1 +0,0 @@ -0 diff --git a/tools/regression/usr.bin/make/archives/fmt_44bsd/expected.status.3 b/tools/regression/usr.bin/make/archives/fmt_44bsd/expected.status.3 deleted file mode 100644 index 573541ac9702d..0000000000000 --- a/tools/regression/usr.bin/make/archives/fmt_44bsd/expected.status.3 +++ /dev/null @@ -1 +0,0 @@ -0 diff --git a/tools/regression/usr.bin/make/archives/fmt_44bsd/expected.status.4 b/tools/regression/usr.bin/make/archives/fmt_44bsd/expected.status.4 deleted file mode 100644 index 573541ac9702d..0000000000000 --- a/tools/regression/usr.bin/make/archives/fmt_44bsd/expected.status.4 +++ /dev/null @@ -1 +0,0 @@ -0 diff --git a/tools/regression/usr.bin/make/archives/fmt_44bsd/expected.status.5 b/tools/regression/usr.bin/make/archives/fmt_44bsd/expected.status.5 deleted file mode 100644 index 0cfbf08886fca..0000000000000 --- a/tools/regression/usr.bin/make/archives/fmt_44bsd/expected.status.5 +++ /dev/null @@ -1 +0,0 @@ -2 diff --git a/tools/regression/usr.bin/make/archives/fmt_44bsd/expected.status.6 b/tools/regression/usr.bin/make/archives/fmt_44bsd/expected.status.6 deleted file mode 100644 index 0cfbf08886fca..0000000000000 --- a/tools/regression/usr.bin/make/archives/fmt_44bsd/expected.status.6 +++ /dev/null @@ -1 +0,0 @@ -2 diff --git a/tools/regression/usr.bin/make/archives/fmt_44bsd/expected.status.7 b/tools/regression/usr.bin/make/archives/fmt_44bsd/expected.status.7 deleted file mode 100644 index 0cfbf08886fca..0000000000000 --- a/tools/regression/usr.bin/make/archives/fmt_44bsd/expected.status.7 +++ /dev/null @@ -1 +0,0 @@ -2 diff --git a/tools/regression/usr.bin/make/archives/fmt_44bsd/expected.stderr.1 b/tools/regression/usr.bin/make/archives/fmt_44bsd/expected.stderr.1 deleted file mode 100644 index e69de29bb2d1d..0000000000000 --- a/tools/regression/usr.bin/make/archives/fmt_44bsd/expected.stderr.1 +++ /dev/null diff --git a/tools/regression/usr.bin/make/archives/fmt_44bsd/expected.stderr.2 b/tools/regression/usr.bin/make/archives/fmt_44bsd/expected.stderr.2 deleted file mode 100644 index e69de29bb2d1d..0000000000000 --- a/tools/regression/usr.bin/make/archives/fmt_44bsd/expected.stderr.2 +++ /dev/null diff --git a/tools/regression/usr.bin/make/archives/fmt_44bsd/expected.stderr.3 b/tools/regression/usr.bin/make/archives/fmt_44bsd/expected.stderr.3 deleted file mode 100644 index e69de29bb2d1d..0000000000000 --- a/tools/regression/usr.bin/make/archives/fmt_44bsd/expected.stderr.3 +++ /dev/null diff --git a/tools/regression/usr.bin/make/archives/fmt_44bsd/expected.stderr.4 b/tools/regression/usr.bin/make/archives/fmt_44bsd/expected.stderr.4 deleted file mode 100644 index e69de29bb2d1d..0000000000000 --- a/tools/regression/usr.bin/make/archives/fmt_44bsd/expected.stderr.4 +++ /dev/null diff --git a/tools/regression/usr.bin/make/archives/fmt_44bsd/expected.stderr.5 b/tools/regression/usr.bin/make/archives/fmt_44bsd/expected.stderr.5 deleted file mode 100644 index 7b91643a38216..0000000000000 --- a/tools/regression/usr.bin/make/archives/fmt_44bsd/expected.stderr.5 +++ /dev/null @@ -1 +0,0 @@ -make: don't know how to make verylongobjectna. Stop diff --git a/tools/regression/usr.bin/make/archives/fmt_44bsd/expected.stderr.6 b/tools/regression/usr.bin/make/archives/fmt_44bsd/expected.stderr.6 deleted file mode 100644 index fd1519039acc4..0000000000000 --- a/tools/regression/usr.bin/make/archives/fmt_44bsd/expected.stderr.6 +++ /dev/null @@ -1 +0,0 @@ -make: don't know how to make verylongobjectn. Stop diff --git a/tools/regression/usr.bin/make/archives/fmt_44bsd/expected.stderr.7 b/tools/regression/usr.bin/make/archives/fmt_44bsd/expected.stderr.7 deleted file mode 100644 index cb572e189eb11..0000000000000 --- a/tools/regression/usr.bin/make/archives/fmt_44bsd/expected.stderr.7 +++ /dev/null @@ -1 +0,0 @@ -make: don't know how to make #1/20. Stop diff --git a/tools/regression/usr.bin/make/archives/fmt_44bsd/expected.stdout.1 b/tools/regression/usr.bin/make/archives/fmt_44bsd/expected.stdout.1 deleted file mode 100644 index e69de29bb2d1d..0000000000000 --- a/tools/regression/usr.bin/make/archives/fmt_44bsd/expected.stdout.1 +++ /dev/null diff --git a/tools/regression/usr.bin/make/archives/fmt_44bsd/expected.stdout.2 b/tools/regression/usr.bin/make/archives/fmt_44bsd/expected.stdout.2 deleted file mode 100644 index e69de29bb2d1d..0000000000000 --- a/tools/regression/usr.bin/make/archives/fmt_44bsd/expected.stdout.2 +++ /dev/null diff --git a/tools/regression/usr.bin/make/archives/fmt_44bsd/expected.stdout.3 b/tools/regression/usr.bin/make/archives/fmt_44bsd/expected.stdout.3 deleted file mode 100644 index e69de29bb2d1d..0000000000000 --- a/tools/regression/usr.bin/make/archives/fmt_44bsd/expected.stdout.3 +++ /dev/null diff --git a/tools/regression/usr.bin/make/archives/fmt_44bsd/expected.stdout.4 b/tools/regression/usr.bin/make/archives/fmt_44bsd/expected.stdout.4 deleted file mode 100644 index e69de29bb2d1d..0000000000000 --- a/tools/regression/usr.bin/make/archives/fmt_44bsd/expected.stdout.4 +++ /dev/null diff --git a/tools/regression/usr.bin/make/archives/fmt_44bsd/expected.stdout.5 b/tools/regression/usr.bin/make/archives/fmt_44bsd/expected.stdout.5 deleted file mode 100644 index e69de29bb2d1d..0000000000000 --- a/tools/regression/usr.bin/make/archives/fmt_44bsd/expected.stdout.5 +++ /dev/null diff --git a/tools/regression/usr.bin/make/archives/fmt_44bsd/expected.stdout.6 b/tools/regression/usr.bin/make/archives/fmt_44bsd/expected.stdout.6 deleted file mode 100644 index e69de29bb2d1d..0000000000000 --- a/tools/regression/usr.bin/make/archives/fmt_44bsd/expected.stdout.6 +++ /dev/null diff --git a/tools/regression/usr.bin/make/archives/fmt_44bsd/expected.stdout.7 b/tools/regression/usr.bin/make/archives/fmt_44bsd/expected.stdout.7 deleted file mode 100644 index e69de29bb2d1d..0000000000000 --- a/tools/regression/usr.bin/make/archives/fmt_44bsd/expected.stdout.7 +++ /dev/null diff --git a/tools/regression/usr.bin/make/archives/fmt_44bsd/libtest.a b/tools/regression/usr.bin/make/archives/fmt_44bsd/libtest.a Binary files differdeleted file mode 100644 index 891ce6e652d74..0000000000000 --- a/tools/regression/usr.bin/make/archives/fmt_44bsd/libtest.a +++ /dev/null diff --git a/tools/regression/usr.bin/make/archives/fmt_44bsd/test.t b/tools/regression/usr.bin/make/archives/fmt_44bsd/test.t deleted file mode 100644 index eba6aed9e3851..0000000000000 --- a/tools/regression/usr.bin/make/archives/fmt_44bsd/test.t +++ /dev/null @@ -1,17 +0,0 @@ -#!/bin/sh - -# $FreeBSD$ - -cd `dirname $0` -. ../../common.sh - -# Description -DESC="Archive parsing (BSD4.4 format)." - -# Setup -TEST_COPY_FILES="libtest.a 644" - -# Run -TEST_N=7 - -eval_cmd $* diff --git a/tools/regression/usr.bin/make/archives/fmt_44bsd_mod/Makefile b/tools/regression/usr.bin/make/archives/fmt_44bsd_mod/Makefile deleted file mode 100644 index cd999daaad4e3..0000000000000 --- a/tools/regression/usr.bin/make/archives/fmt_44bsd_mod/Makefile +++ /dev/null @@ -1,64 +0,0 @@ -# $FreeBSD$ -# This test checks the code reading archive files. The archive file -# is a BSD4.4 file with __.SYMTAB and #1/N long file names. -# -# The modification of the archive consists in slashes appended to short names. -# - -############################################################################# - -# must be ok -test1: libtest.a(short.o) - @: - -libtest.a(short.o): ood - @: - -############################################################################# - -# must be ok -test2: libtest.a(exactly15char.o) - @: - -libtest.a(exactly15char.o): ood - @: - -############################################################################# - -# must be ok -test3: libtest.a(exactly16chars.o) - @: - -libtest.a(exactly16chars.o): ood - @: - -############################################################################# - -# must be ok -test4: libtest.a(verylongobjectname.o) - @: - -libtest.a(verylongobjectname.o): ood - @: - -############################################################################# - -# Truncated to 16 characters -# must fail -test5: libtest.a(verylongobjectna) - @: - -############################################################################# - -# Truncated to 15 characters -# must fail -test6: libtest.a(verylongobjectn) - @: - -############################################################################# - -# must fail -test7: libtest.a(\#1/20) - @: - -ood: diff --git a/tools/regression/usr.bin/make/archives/fmt_44bsd_mod/expected.status.1 b/tools/regression/usr.bin/make/archives/fmt_44bsd_mod/expected.status.1 deleted file mode 100644 index 573541ac9702d..0000000000000 --- a/tools/regression/usr.bin/make/archives/fmt_44bsd_mod/expected.status.1 +++ /dev/null @@ -1 +0,0 @@ -0 diff --git a/tools/regression/usr.bin/make/archives/fmt_44bsd_mod/expected.status.2 b/tools/regression/usr.bin/make/archives/fmt_44bsd_mod/expected.status.2 deleted file mode 100644 index 573541ac9702d..0000000000000 --- a/tools/regression/usr.bin/make/archives/fmt_44bsd_mod/expected.status.2 +++ /dev/null @@ -1 +0,0 @@ -0 diff --git a/tools/regression/usr.bin/make/archives/fmt_44bsd_mod/expected.status.3 b/tools/regression/usr.bin/make/archives/fmt_44bsd_mod/expected.status.3 deleted file mode 100644 index 573541ac9702d..0000000000000 --- a/tools/regression/usr.bin/make/archives/fmt_44bsd_mod/expected.status.3 +++ /dev/null @@ -1 +0,0 @@ -0 diff --git a/tools/regression/usr.bin/make/archives/fmt_44bsd_mod/expected.status.4 b/tools/regression/usr.bin/make/archives/fmt_44bsd_mod/expected.status.4 deleted file mode 100644 index 573541ac9702d..0000000000000 --- a/tools/regression/usr.bin/make/archives/fmt_44bsd_mod/expected.status.4 +++ /dev/null @@ -1 +0,0 @@ -0 diff --git a/tools/regression/usr.bin/make/archives/fmt_44bsd_mod/expected.status.5 b/tools/regression/usr.bin/make/archives/fmt_44bsd_mod/expected.status.5 deleted file mode 100644 index 0cfbf08886fca..0000000000000 --- a/tools/regression/usr.bin/make/archives/fmt_44bsd_mod/expected.status.5 +++ /dev/null @@ -1 +0,0 @@ -2 diff --git a/tools/regression/usr.bin/make/archives/fmt_44bsd_mod/expected.status.6 b/tools/regression/usr.bin/make/archives/fmt_44bsd_mod/expected.status.6 deleted file mode 100644 index 0cfbf08886fca..0000000000000 --- a/tools/regression/usr.bin/make/archives/fmt_44bsd_mod/expected.status.6 +++ /dev/null @@ -1 +0,0 @@ -2 diff --git a/tools/regression/usr.bin/make/archives/fmt_44bsd_mod/expected.status.7 b/tools/regression/usr.bin/make/archives/fmt_44bsd_mod/expected.status.7 deleted file mode 100644 index 0cfbf08886fca..0000000000000 --- a/tools/regression/usr.bin/make/archives/fmt_44bsd_mod/expected.status.7 +++ /dev/null @@ -1 +0,0 @@ -2 diff --git a/tools/regression/usr.bin/make/archives/fmt_44bsd_mod/expected.stderr.1 b/tools/regression/usr.bin/make/archives/fmt_44bsd_mod/expected.stderr.1 deleted file mode 100644 index e69de29bb2d1d..0000000000000 --- a/tools/regression/usr.bin/make/archives/fmt_44bsd_mod/expected.stderr.1 +++ /dev/null diff --git a/tools/regression/usr.bin/make/archives/fmt_44bsd_mod/expected.stderr.2 b/tools/regression/usr.bin/make/archives/fmt_44bsd_mod/expected.stderr.2 deleted file mode 100644 index e69de29bb2d1d..0000000000000 --- a/tools/regression/usr.bin/make/archives/fmt_44bsd_mod/expected.stderr.2 +++ /dev/null diff --git a/tools/regression/usr.bin/make/archives/fmt_44bsd_mod/expected.stderr.3 b/tools/regression/usr.bin/make/archives/fmt_44bsd_mod/expected.stderr.3 deleted file mode 100644 index e69de29bb2d1d..0000000000000 --- a/tools/regression/usr.bin/make/archives/fmt_44bsd_mod/expected.stderr.3 +++ /dev/null diff --git a/tools/regression/usr.bin/make/archives/fmt_44bsd_mod/expected.stderr.4 b/tools/regression/usr.bin/make/archives/fmt_44bsd_mod/expected.stderr.4 deleted file mode 100644 index e69de29bb2d1d..0000000000000 --- a/tools/regression/usr.bin/make/archives/fmt_44bsd_mod/expected.stderr.4 +++ /dev/null diff --git a/tools/regression/usr.bin/make/archives/fmt_44bsd_mod/expected.stderr.5 b/tools/regression/usr.bin/make/archives/fmt_44bsd_mod/expected.stderr.5 deleted file mode 100644 index 7b91643a38216..0000000000000 --- a/tools/regression/usr.bin/make/archives/fmt_44bsd_mod/expected.stderr.5 +++ /dev/null @@ -1 +0,0 @@ -make: don't know how to make verylongobjectna. Stop diff --git a/tools/regression/usr.bin/make/archives/fmt_44bsd_mod/expected.stderr.6 b/tools/regression/usr.bin/make/archives/fmt_44bsd_mod/expected.stderr.6 deleted file mode 100644 index fd1519039acc4..0000000000000 --- a/tools/regression/usr.bin/make/archives/fmt_44bsd_mod/expected.stderr.6 +++ /dev/null @@ -1 +0,0 @@ -make: don't know how to make verylongobjectn. Stop diff --git a/tools/regression/usr.bin/make/archives/fmt_44bsd_mod/expected.stderr.7 b/tools/regression/usr.bin/make/archives/fmt_44bsd_mod/expected.stderr.7 deleted file mode 100644 index cb572e189eb11..0000000000000 --- a/tools/regression/usr.bin/make/archives/fmt_44bsd_mod/expected.stderr.7 +++ /dev/null @@ -1 +0,0 @@ -make: don't know how to make #1/20. Stop diff --git a/tools/regression/usr.bin/make/archives/fmt_44bsd_mod/expected.stdout.1 b/tools/regression/usr.bin/make/archives/fmt_44bsd_mod/expected.stdout.1 deleted file mode 100644 index e69de29bb2d1d..0000000000000 --- a/tools/regression/usr.bin/make/archives/fmt_44bsd_mod/expected.stdout.1 +++ /dev/null diff --git a/tools/regression/usr.bin/make/archives/fmt_44bsd_mod/expected.stdout.2 b/tools/regression/usr.bin/make/archives/fmt_44bsd_mod/expected.stdout.2 deleted file mode 100644 index e69de29bb2d1d..0000000000000 --- a/tools/regression/usr.bin/make/archives/fmt_44bsd_mod/expected.stdout.2 +++ /dev/null diff --git a/tools/regression/usr.bin/make/archives/fmt_44bsd_mod/expected.stdout.3 b/tools/regression/usr.bin/make/archives/fmt_44bsd_mod/expected.stdout.3 deleted file mode 100644 index e69de29bb2d1d..0000000000000 --- a/tools/regression/usr.bin/make/archives/fmt_44bsd_mod/expected.stdout.3 +++ /dev/null diff --git a/tools/regression/usr.bin/make/archives/fmt_44bsd_mod/expected.stdout.4 b/tools/regression/usr.bin/make/archives/fmt_44bsd_mod/expected.stdout.4 deleted file mode 100644 index e69de29bb2d1d..0000000000000 --- a/tools/regression/usr.bin/make/archives/fmt_44bsd_mod/expected.stdout.4 +++ /dev/null diff --git a/tools/regression/usr.bin/make/archives/fmt_44bsd_mod/expected.stdout.5 b/tools/regression/usr.bin/make/archives/fmt_44bsd_mod/expected.stdout.5 deleted file mode 100644 index e69de29bb2d1d..0000000000000 --- a/tools/regression/usr.bin/make/archives/fmt_44bsd_mod/expected.stdout.5 +++ /dev/null diff --git a/tools/regression/usr.bin/make/archives/fmt_44bsd_mod/expected.stdout.6 b/tools/regression/usr.bin/make/archives/fmt_44bsd_mod/expected.stdout.6 deleted file mode 100644 index e69de29bb2d1d..0000000000000 --- a/tools/regression/usr.bin/make/archives/fmt_44bsd_mod/expected.stdout.6 +++ /dev/null diff --git a/tools/regression/usr.bin/make/archives/fmt_44bsd_mod/expected.stdout.7 b/tools/regression/usr.bin/make/archives/fmt_44bsd_mod/expected.stdout.7 deleted file mode 100644 index e69de29bb2d1d..0000000000000 --- a/tools/regression/usr.bin/make/archives/fmt_44bsd_mod/expected.stdout.7 +++ /dev/null diff --git a/tools/regression/usr.bin/make/archives/fmt_44bsd_mod/libtest.a b/tools/regression/usr.bin/make/archives/fmt_44bsd_mod/libtest.a Binary files differdeleted file mode 100644 index 57bc407a27235..0000000000000 --- a/tools/regression/usr.bin/make/archives/fmt_44bsd_mod/libtest.a +++ /dev/null diff --git a/tools/regression/usr.bin/make/archives/fmt_44bsd_mod/test.t b/tools/regression/usr.bin/make/archives/fmt_44bsd_mod/test.t deleted file mode 100644 index aa65a3e9587be..0000000000000 --- a/tools/regression/usr.bin/make/archives/fmt_44bsd_mod/test.t +++ /dev/null @@ -1,17 +0,0 @@ -#!/bin/sh - -# $FreeBSD$ - -cd `dirname $0` -. ../../common.sh - -# Description -DESC="Archive parsing (modified BSD4.4 format)." - -# Setup -TEST_COPY_FILES="libtest.a 644" - -# Run -TEST_N=7 - -eval_cmd $* diff --git a/tools/regression/usr.bin/make/archives/fmt_oldbsd/Makefile b/tools/regression/usr.bin/make/archives/fmt_oldbsd/Makefile deleted file mode 100644 index b8f5116195ede..0000000000000 --- a/tools/regression/usr.bin/make/archives/fmt_oldbsd/Makefile +++ /dev/null @@ -1,62 +0,0 @@ -# $FreeBSD$ -# This test checks the code reading archive files. The archive file -# is an old BSD file with __.SYMTAB and no long file names. Filenames -# are truncated to 16 characters. - -############################################################################# - -# must be ok -test1: libtest.a(short.o) - @: - -libtest.a(short.o): ood - @: - -############################################################################# - -# must be ok -test2: libtest.a(exactly15char.o) - @: - -libtest.a(exactly15char.o): ood - @: - -############################################################################# - -# must be ok -test3: libtest.a(exactly16chars.o) - @: - -libtest.a(exactly16chars.o): ood - @: - -############################################################################# - -# must be ok -test4: libtest.a(verylongobjectname.o) - @: - -libtest.a(verylongobjectname.o): ood - @: - -############################################################################# - -# Truncated to 16 characters -# must be ok -test5: libtest.a(verylongobjectna) - @: - -############################################################################# - -# Truncated to 15 characters -# must fail -test6: libtest.a(verylongobjectn) - @: - -############################################################################# - -# must fail -test7: libtest.a(\#1/20) - @: - -ood: diff --git a/tools/regression/usr.bin/make/archives/fmt_oldbsd/expected.status.1 b/tools/regression/usr.bin/make/archives/fmt_oldbsd/expected.status.1 deleted file mode 100644 index 573541ac9702d..0000000000000 --- a/tools/regression/usr.bin/make/archives/fmt_oldbsd/expected.status.1 +++ /dev/null @@ -1 +0,0 @@ -0 diff --git a/tools/regression/usr.bin/make/archives/fmt_oldbsd/expected.status.2 b/tools/regression/usr.bin/make/archives/fmt_oldbsd/expected.status.2 deleted file mode 100644 index 573541ac9702d..0000000000000 --- a/tools/regression/usr.bin/make/archives/fmt_oldbsd/expected.status.2 +++ /dev/null @@ -1 +0,0 @@ -0 diff --git a/tools/regression/usr.bin/make/archives/fmt_oldbsd/expected.status.3 b/tools/regression/usr.bin/make/archives/fmt_oldbsd/expected.status.3 deleted file mode 100644 index 573541ac9702d..0000000000000 --- a/tools/regression/usr.bin/make/archives/fmt_oldbsd/expected.status.3 +++ /dev/null @@ -1 +0,0 @@ -0 diff --git a/tools/regression/usr.bin/make/archives/fmt_oldbsd/expected.status.4 b/tools/regression/usr.bin/make/archives/fmt_oldbsd/expected.status.4 deleted file mode 100644 index 573541ac9702d..0000000000000 --- a/tools/regression/usr.bin/make/archives/fmt_oldbsd/expected.status.4 +++ /dev/null @@ -1 +0,0 @@ -0 diff --git a/tools/regression/usr.bin/make/archives/fmt_oldbsd/expected.status.5 b/tools/regression/usr.bin/make/archives/fmt_oldbsd/expected.status.5 deleted file mode 100644 index 573541ac9702d..0000000000000 --- a/tools/regression/usr.bin/make/archives/fmt_oldbsd/expected.status.5 +++ /dev/null @@ -1 +0,0 @@ -0 diff --git a/tools/regression/usr.bin/make/archives/fmt_oldbsd/expected.status.6 b/tools/regression/usr.bin/make/archives/fmt_oldbsd/expected.status.6 deleted file mode 100644 index 0cfbf08886fca..0000000000000 --- a/tools/regression/usr.bin/make/archives/fmt_oldbsd/expected.status.6 +++ /dev/null @@ -1 +0,0 @@ -2 diff --git a/tools/regression/usr.bin/make/archives/fmt_oldbsd/expected.status.7 b/tools/regression/usr.bin/make/archives/fmt_oldbsd/expected.status.7 deleted file mode 100644 index 0cfbf08886fca..0000000000000 --- a/tools/regression/usr.bin/make/archives/fmt_oldbsd/expected.status.7 +++ /dev/null @@ -1 +0,0 @@ -2 diff --git a/tools/regression/usr.bin/make/archives/fmt_oldbsd/expected.stderr.1 b/tools/regression/usr.bin/make/archives/fmt_oldbsd/expected.stderr.1 deleted file mode 100644 index e69de29bb2d1d..0000000000000 --- a/tools/regression/usr.bin/make/archives/fmt_oldbsd/expected.stderr.1 +++ /dev/null diff --git a/tools/regression/usr.bin/make/archives/fmt_oldbsd/expected.stderr.2 b/tools/regression/usr.bin/make/archives/fmt_oldbsd/expected.stderr.2 deleted file mode 100644 index e69de29bb2d1d..0000000000000 --- a/tools/regression/usr.bin/make/archives/fmt_oldbsd/expected.stderr.2 +++ /dev/null diff --git a/tools/regression/usr.bin/make/archives/fmt_oldbsd/expected.stderr.3 b/tools/regression/usr.bin/make/archives/fmt_oldbsd/expected.stderr.3 deleted file mode 100644 index e69de29bb2d1d..0000000000000 --- a/tools/regression/usr.bin/make/archives/fmt_oldbsd/expected.stderr.3 +++ /dev/null diff --git a/tools/regression/usr.bin/make/archives/fmt_oldbsd/expected.stderr.4 b/tools/regression/usr.bin/make/archives/fmt_oldbsd/expected.stderr.4 deleted file mode 100644 index e69de29bb2d1d..0000000000000 --- a/tools/regression/usr.bin/make/archives/fmt_oldbsd/expected.stderr.4 +++ /dev/null diff --git a/tools/regression/usr.bin/make/archives/fmt_oldbsd/expected.stderr.5 b/tools/regression/usr.bin/make/archives/fmt_oldbsd/expected.stderr.5 deleted file mode 100644 index e69de29bb2d1d..0000000000000 --- a/tools/regression/usr.bin/make/archives/fmt_oldbsd/expected.stderr.5 +++ /dev/null diff --git a/tools/regression/usr.bin/make/archives/fmt_oldbsd/expected.stderr.6 b/tools/regression/usr.bin/make/archives/fmt_oldbsd/expected.stderr.6 deleted file mode 100644 index fd1519039acc4..0000000000000 --- a/tools/regression/usr.bin/make/archives/fmt_oldbsd/expected.stderr.6 +++ /dev/null @@ -1 +0,0 @@ -make: don't know how to make verylongobjectn. Stop diff --git a/tools/regression/usr.bin/make/archives/fmt_oldbsd/expected.stderr.7 b/tools/regression/usr.bin/make/archives/fmt_oldbsd/expected.stderr.7 deleted file mode 100644 index cb572e189eb11..0000000000000 --- a/tools/regression/usr.bin/make/archives/fmt_oldbsd/expected.stderr.7 +++ /dev/null @@ -1 +0,0 @@ -make: don't know how to make #1/20. Stop diff --git a/tools/regression/usr.bin/make/archives/fmt_oldbsd/expected.stdout.1 b/tools/regression/usr.bin/make/archives/fmt_oldbsd/expected.stdout.1 deleted file mode 100644 index e69de29bb2d1d..0000000000000 --- a/tools/regression/usr.bin/make/archives/fmt_oldbsd/expected.stdout.1 +++ /dev/null diff --git a/tools/regression/usr.bin/make/archives/fmt_oldbsd/expected.stdout.2 b/tools/regression/usr.bin/make/archives/fmt_oldbsd/expected.stdout.2 deleted file mode 100644 index e69de29bb2d1d..0000000000000 --- a/tools/regression/usr.bin/make/archives/fmt_oldbsd/expected.stdout.2 +++ /dev/null diff --git a/tools/regression/usr.bin/make/archives/fmt_oldbsd/expected.stdout.3 b/tools/regression/usr.bin/make/archives/fmt_oldbsd/expected.stdout.3 deleted file mode 100644 index e69de29bb2d1d..0000000000000 --- a/tools/regression/usr.bin/make/archives/fmt_oldbsd/expected.stdout.3 +++ /dev/null diff --git a/tools/regression/usr.bin/make/archives/fmt_oldbsd/expected.stdout.4 b/tools/regression/usr.bin/make/archives/fmt_oldbsd/expected.stdout.4 deleted file mode 100644 index e69de29bb2d1d..0000000000000 --- a/tools/regression/usr.bin/make/archives/fmt_oldbsd/expected.stdout.4 +++ /dev/null diff --git a/tools/regression/usr.bin/make/archives/fmt_oldbsd/expected.stdout.5 b/tools/regression/usr.bin/make/archives/fmt_oldbsd/expected.stdout.5 deleted file mode 100644 index e69de29bb2d1d..0000000000000 --- a/tools/regression/usr.bin/make/archives/fmt_oldbsd/expected.stdout.5 +++ /dev/null diff --git a/tools/regression/usr.bin/make/archives/fmt_oldbsd/expected.stdout.6 b/tools/regression/usr.bin/make/archives/fmt_oldbsd/expected.stdout.6 deleted file mode 100644 index e69de29bb2d1d..0000000000000 --- a/tools/regression/usr.bin/make/archives/fmt_oldbsd/expected.stdout.6 +++ /dev/null diff --git a/tools/regression/usr.bin/make/archives/fmt_oldbsd/expected.stdout.7 b/tools/regression/usr.bin/make/archives/fmt_oldbsd/expected.stdout.7 deleted file mode 100644 index e69de29bb2d1d..0000000000000 --- a/tools/regression/usr.bin/make/archives/fmt_oldbsd/expected.stdout.7 +++ /dev/null diff --git a/tools/regression/usr.bin/make/archives/fmt_oldbsd/libtest.a b/tools/regression/usr.bin/make/archives/fmt_oldbsd/libtest.a Binary files differdeleted file mode 100644 index 3434c53898a1a..0000000000000 --- a/tools/regression/usr.bin/make/archives/fmt_oldbsd/libtest.a +++ /dev/null diff --git a/tools/regression/usr.bin/make/archives/fmt_oldbsd/test.t b/tools/regression/usr.bin/make/archives/fmt_oldbsd/test.t deleted file mode 100644 index 03f7800a78d94..0000000000000 --- a/tools/regression/usr.bin/make/archives/fmt_oldbsd/test.t +++ /dev/null @@ -1,17 +0,0 @@ -#!/bin/sh - -# $FreeBSD$ - -cd `dirname $0` -. ../../common.sh - -# Description -DESC="Archive parsing (old BSD format)." - -# Setup -TEST_COPY_FILES="libtest.a 644" - -# Run -TEST_N=7 - -eval_cmd $* diff --git a/tools/regression/usr.bin/make/basic/t0/expected.status.1 b/tools/regression/usr.bin/make/basic/t0/expected.status.1 deleted file mode 100644 index 0cfbf08886fca..0000000000000 --- a/tools/regression/usr.bin/make/basic/t0/expected.status.1 +++ /dev/null @@ -1 +0,0 @@ -2 diff --git a/tools/regression/usr.bin/make/basic/t0/expected.stderr.1 b/tools/regression/usr.bin/make/basic/t0/expected.stderr.1 deleted file mode 100644 index 90280c8298b94..0000000000000 --- a/tools/regression/usr.bin/make/basic/t0/expected.stderr.1 +++ /dev/null @@ -1 +0,0 @@ -make: no target to make. diff --git a/tools/regression/usr.bin/make/basic/t0/expected.stdout.1 b/tools/regression/usr.bin/make/basic/t0/expected.stdout.1 deleted file mode 100644 index e69de29bb2d1d..0000000000000 --- a/tools/regression/usr.bin/make/basic/t0/expected.stdout.1 +++ /dev/null diff --git a/tools/regression/usr.bin/make/basic/t0/test.t b/tools/regression/usr.bin/make/basic/t0/test.t deleted file mode 100644 index d71a39a8a1a3d..0000000000000 --- a/tools/regression/usr.bin/make/basic/t0/test.t +++ /dev/null @@ -1,18 +0,0 @@ -#!/bin/sh - -# $FreeBSD$ - -cd `dirname $0` -. ../../common.sh - -# Description -DESC="An empty Makefile file and no target given." - -# Setup -TEST_TOUCH="Makefile ''" - -# Run -TEST_N=1 -TEST_1= - -eval_cmd $* diff --git a/tools/regression/usr.bin/make/basic/t1/Makefile b/tools/regression/usr.bin/make/basic/t1/Makefile deleted file mode 100644 index d120087831ce2..0000000000000 --- a/tools/regression/usr.bin/make/basic/t1/Makefile +++ /dev/null @@ -1,5 +0,0 @@ -# $FreeBSD$ -# -# Just a target and nothing else. No target on command line. -# -all: diff --git a/tools/regression/usr.bin/make/basic/t1/expected.status.1 b/tools/regression/usr.bin/make/basic/t1/expected.status.1 deleted file mode 100644 index 573541ac9702d..0000000000000 --- a/tools/regression/usr.bin/make/basic/t1/expected.status.1 +++ /dev/null @@ -1 +0,0 @@ -0 diff --git a/tools/regression/usr.bin/make/basic/t1/expected.stderr.1 b/tools/regression/usr.bin/make/basic/t1/expected.stderr.1 deleted file mode 100644 index e69de29bb2d1d..0000000000000 --- a/tools/regression/usr.bin/make/basic/t1/expected.stderr.1 +++ /dev/null diff --git a/tools/regression/usr.bin/make/basic/t1/expected.stdout.1 b/tools/regression/usr.bin/make/basic/t1/expected.stdout.1 deleted file mode 100644 index e69de29bb2d1d..0000000000000 --- a/tools/regression/usr.bin/make/basic/t1/expected.stdout.1 +++ /dev/null diff --git a/tools/regression/usr.bin/make/basic/t1/test.t b/tools/regression/usr.bin/make/basic/t1/test.t deleted file mode 100644 index 4131f5da859bd..0000000000000 --- a/tools/regression/usr.bin/make/basic/t1/test.t +++ /dev/null @@ -1,15 +0,0 @@ -#!/bin/sh - -# $FreeBSD$ - -cd `dirname $0` -. ../../common.sh - -# Description -DESC="A Makefile file with only a 'all:' file dependency specification." - -# Run -TEST_N=1 -TEST_1= - -eval_cmd $* diff --git a/tools/regression/usr.bin/make/basic/t2/Makefile b/tools/regression/usr.bin/make/basic/t2/Makefile deleted file mode 100644 index ab8fe4956e459..0000000000000 --- a/tools/regression/usr.bin/make/basic/t2/Makefile +++ /dev/null @@ -1,6 +0,0 @@ -# $FreeBSD$ -# -# Just a target and a command. No command line targets. -# -all: - echo hello diff --git a/tools/regression/usr.bin/make/basic/t2/expected.status.1 b/tools/regression/usr.bin/make/basic/t2/expected.status.1 deleted file mode 100644 index 573541ac9702d..0000000000000 --- a/tools/regression/usr.bin/make/basic/t2/expected.status.1 +++ /dev/null @@ -1 +0,0 @@ -0 diff --git a/tools/regression/usr.bin/make/basic/t2/expected.stderr.1 b/tools/regression/usr.bin/make/basic/t2/expected.stderr.1 deleted file mode 100644 index e69de29bb2d1d..0000000000000 --- a/tools/regression/usr.bin/make/basic/t2/expected.stderr.1 +++ /dev/null diff --git a/tools/regression/usr.bin/make/basic/t2/expected.stdout.1 b/tools/regression/usr.bin/make/basic/t2/expected.stdout.1 deleted file mode 100644 index e618540e387dd..0000000000000 --- a/tools/regression/usr.bin/make/basic/t2/expected.stdout.1 +++ /dev/null @@ -1,2 +0,0 @@ -echo hello -hello diff --git a/tools/regression/usr.bin/make/basic/t2/test.t b/tools/regression/usr.bin/make/basic/t2/test.t deleted file mode 100644 index f5866bb9c3cef..0000000000000 --- a/tools/regression/usr.bin/make/basic/t2/test.t +++ /dev/null @@ -1,15 +0,0 @@ -#!/bin/sh - -# $FreeBSD$ - -cd `dirname $0` -. ../../common.sh - -# Description -DESC="A Makefile file with only a 'all:' file dependency specification, and shell command." - -# Run -TEST_N=1 -TEST_1= - -eval_cmd $* diff --git a/tools/regression/usr.bin/make/basic/t3/expected.status.1 b/tools/regression/usr.bin/make/basic/t3/expected.status.1 deleted file mode 100644 index 0cfbf08886fca..0000000000000 --- a/tools/regression/usr.bin/make/basic/t3/expected.status.1 +++ /dev/null @@ -1 +0,0 @@ -2 diff --git a/tools/regression/usr.bin/make/basic/t3/expected.stderr.1 b/tools/regression/usr.bin/make/basic/t3/expected.stderr.1 deleted file mode 100644 index 90280c8298b94..0000000000000 --- a/tools/regression/usr.bin/make/basic/t3/expected.stderr.1 +++ /dev/null @@ -1 +0,0 @@ -make: no target to make. diff --git a/tools/regression/usr.bin/make/basic/t3/expected.stdout.1 b/tools/regression/usr.bin/make/basic/t3/expected.stdout.1 deleted file mode 100644 index e69de29bb2d1d..0000000000000 --- a/tools/regression/usr.bin/make/basic/t3/expected.stdout.1 +++ /dev/null diff --git a/tools/regression/usr.bin/make/basic/t3/test.t b/tools/regression/usr.bin/make/basic/t3/test.t deleted file mode 100644 index 782d27c59fc69..0000000000000 --- a/tools/regression/usr.bin/make/basic/t3/test.t +++ /dev/null @@ -1,15 +0,0 @@ -#!/bin/sh - -# $FreeBSD$ - -cd `dirname $0` -. ../../common.sh - -# Description -DESC="No Makefile file, no command line target." - -# Run -TEST_N=1 -TEST_1= - -eval_cmd $* diff --git a/tools/regression/usr.bin/make/common.sh b/tools/regression/usr.bin/make/common.sh deleted file mode 100644 index cc7622e721140..0000000000000 --- a/tools/regression/usr.bin/make/common.sh +++ /dev/null @@ -1,564 +0,0 @@ -#!/bin/sh -# -# Common code used run regression tests for usr.bin/make. -# -# $FreeBSD$ - -# -# Output a message and exit with an error. -# -fatal() -{ - echo "fatal: $*" >/dev/stderr - exit 1 -} - -make_is_fmake() { - # This test is not very reliable but works for now: the old fmake - # does have a -v option while bmake doesn't. - ${MAKE_PROG} -f Makefile.non-existent -v 2>&1 | \ - grep -q "cannot open.*non-existent" -} - -# -# Check whether the working directory exists - it must. -# -ensure_workdir() -{ - if [ ! -d ${WORK_DIR} ] ; then - fatal "working directory ${WORK_DIR} does not exist." - fi -} - -# -# Make sure all tests have been run -# -ensure_run() -{ - if [ -z "${TEST_N}" ] ; then - TEST_N=1 - fi - - FAIL= - N=1 - while [ ${N} -le ${TEST_N} ] ; do - if ! skip_test ${N} ; then - if [ ! -f ${OUTPUT_DIR}/status.${N} -o \ - ! -f ${OUTPUT_DIR}/stdout.${N} -o \ - ! -f ${OUTPUT_DIR}/stderr.${N} ] ; then - echo "Test ${SUBDIR}/${N} no yet run" - FAIL=yes - fi - fi - N=$((N + 1)) - done - - if [ ! -z "${FAIL}" ] ; then - exit 1 - fi -} - -# -# Output usage messsage. -# -print_usage() -{ - echo "Usage: sh -v -m <path> -w <dir> $0 command(s)" - echo " setup - setup working directory" - echo " run - run the tests" - echo " show - show test results" - echo " compare - compare actual and expected results" - echo " diff - diff actual and expected results" - echo " reset - reset the test to its initial state" - echo " clean - delete working and output directory" - echo " test - setup + run + compare" - echo " prove - setup + run + compare + clean" - echo " desc - print short description" - echo " update - update the expected results with the current results" - echo " help - show this information" -} - -# -# Return 0 if we should skip the test. 1 otherwise -# -skip_test() -{ - eval skip=\${TEST_${1}_SKIP} - if [ -z "${skip}" ] ; then - return 1 - else - return 0 - fi -} - -# -# Common function for setup and reset. -# -common_setup() -{ - # - # If a Makefile exists in the source directory - copy it over - # - if [ -e Makefile -a ! -e ${WORK_DIR}/Makefile ] ; then - cp Makefile ${WORK_DIR}/Makefile - fi - - # - # If the TEST_MAKE_DIRS variable is set, create those directories - # - set -- ${TEST_MAKE_DIRS} - while [ $# -ne 0 ] ; do - if [ ! -d ${WORK_DIR}/${1} ] ; then - mkdir -p -m ${2} ${WORK_DIR}/${1} - else - chmod ${2} ${WORK_DIR}/${1} - fi - shift ; shift - done - - # - # If the TEST_COPY_FILES variable is set, copy those files over to - # the working directory. The value is assumed to be pairs of - # filenames and modes. - # - set -- ${TEST_COPY_FILES} - while [ $# -ne 0 ] ; do - if [ ! -e ${WORK_DIR}/${1} ] ; then - cp ${1} ${WORK_DIR}/${1} - fi - chmod ${2} ${WORK_DIR}/${1} - shift ; shift - done - - # - # If the TEST_TOUCH variable is set, it is taken to be a list - # of pairs of filenames and arguments to touch(1). The arguments - # to touch must be surrounded by single quotes if there are more - # than one argument. - # - eval set -- ${TEST_TOUCH} - while [ $# -ne 0 ] ; do - eval touch ${2} ${WORK_DIR}/${1} - shift ; shift - done - - # - # Now create links - # - eval set -- ${TEST_LINKS} - while [ $# -ne 0 ] ; do - eval ln ${WORK_DIR}/${1} ${WORK_DIR}/${2} - shift ; shift - done -} - -# -# Setup the test. This creates the working and output directories and -# populates it with files. If there is a setup_test() function - call it. -# -eval_setup() -{ - # - # Check whether the working directory exists. If it does exit - # fatally so that we don't clobber a test the user is working on. - # - if [ -d ${WORK_DIR} ] ; then - fatal "working directory ${WORK_DIR} already exists." - fi - - # - # Now create it and the output directory - # - mkdir -p ${WORK_DIR} - rm -rf ${OUTPUT_DIR} - mkdir -p ${OUTPUT_DIR} - - # - # Common stuff - # - common_setup - - # - # Now after all execute the user's setup function if it exists. - # - setup_test -} - -# -# Default setup_test function does nothing. This may be overriden by -# the test. -# -setup_test() -{ -} - -# -# Reset the test. Here we need to rely on information from the test. -# We executed the same steps as in the setup, by try not to clobber existing -# files. -# All files and directories that are listed on the TEST_CLEAN_FILES -# variable are removed. Then the TEST_TOUCH list is executed and finally -# the reset_test() function called if it exists. -# -eval_reset() -{ - ensure_workdir - - # - # Clean the output directory - # - rm -rf ${OUTPUT_DIR}/* - - # - # Common stuff - # - common_setup - - # - # Remove files. - # - for f in ${TEST_CLEAN_FILES} ; do - rm -rf ${WORK_DIR}/${f} - done - - # - # Execute test's function - # - reset_test -} - -# -# Default reset_test function does nothing. This may be overriden by -# the test. -# -reset_test() -{ -} - -# -# Clean the test. This simply removes the working and output directories. -# -eval_clean() -{ - # - # If you have special cleaning needs, provide a 'cleanup' shell script. - # - if [ -n "${TEST_CLEANUP}" ] ; then - . ${SRC_DIR}/cleanup - fi - if [ -z "${NO_TEST_CLEANUP}" ] ; then - rm -rf ${WORK_DIR} - rm -rf ${OUTPUT_DIR} - fi -} - -# -# Run the test. -# -eval_run() -{ - ensure_workdir - - if [ -z "${TEST_N}" ] ; then - TEST_N=1 - fi - - N=1 - while [ ${N} -le ${TEST_N} ] ; do - if ! skip_test ${N} ; then - ( cd ${WORK_DIR} ; - exec 1>${OUTPUT_DIR}/stdout.${N} 2>${OUTPUT_DIR}/stderr.${N} - run_test ${N} - echo $? >${OUTPUT_DIR}/status.${N} - ) - fi - N=$((N + 1)) - done -} - -# -# Default run_test() function. It can be replaced by the -# user specified regression test. The argument to this function is -# the test number. -# -run_test() -{ - eval args=\${TEST_${1}-test${1}} - ${MAKE_PROG} $args -} - -# -# Show test results. -# -eval_show() -{ - ensure_workdir - - if [ -z "${TEST_N}" ] ; then - TEST_N=1 - fi - - N=1 - while [ ${N} -le ${TEST_N} ] ; do - if ! skip_test ${N} ; then - echo "=== Test ${N} Status ==================" - cat ${OUTPUT_DIR}/status.${N} - echo ".......... Stdout .................." - cat ${OUTPUT_DIR}/stdout.${N} - echo ".......... Stderr .................." - cat ${OUTPUT_DIR}/stderr.${N} - fi - N=$((N + 1)) - done -} - -# -# Compare results with expected results -# -eval_compare() -{ - ensure_workdir - ensure_run - - if [ -z "${TEST_N}" ] ; then - TEST_N=1 - fi - - echo "1..${TEST_N}" - N=1 - while [ ${N} -le ${TEST_N} ] ; do - fail= - todo= - skip= - if ! skip_test ${N} ; then - do_compare stdout ${N} || fail="${fail}stdout " - do_compare stderr ${N} || fail="${fail}stderr " - do_compare status ${N} || fail="${fail}status " - eval todo=\${TEST_${N}_TODO} - else - eval skip=\${TEST_${N}_SKIP} - fi - if [ ! -z "$fail" ]; then - echo -n "not " - fi - echo -n "ok ${N} ${SUBDIR}/${N}" - if [ ! -z "$fail" -o ! -z "$todo" -o ! -z "$skip" ]; then - echo -n " # " - fi - if [ ! -z "$skip" ] ; then - echo -n "skip $skip; " - fi - if [ ! -z "$todo" ] ; then - echo -n "TODO $todo; " - fi - if [ ! -z "$fail" ] ; then - echo "reason: ${fail}" - fi - echo - N=$((N + 1)) - done -} - -# -# Check if the test result is the same as the expected result. -# -# $1 Input file -# $2 Test number -# -do_compare() -{ - local EXPECTED RESULT - EXPECTED="expected.$1.$2" - RESULT="${OUTPUT_DIR}/$1.$2" - - if [ -f $EXPECTED ]; then - diff -q $EXPECTED $RESULT 1>/dev/null 2>/dev/null - return $? - else - return 1 # FAIL - fi -} - -# -# Diff current and expected results -# -eval_diff() -{ - ensure_workdir - ensure_run - - if [ -z "${TEST_N}" ] ; then - TEST_N=1 - fi - - N=1 - while [ ${N} -le ${TEST_N} ] ; do - if ! skip_test ${N} ; then - FAIL= - do_diff stdout ${N} - do_diff stderr ${N} - do_diff status ${N} - fi - N=$((N + 1)) - done -} - -# -# Check if the test result is the same as the expected result. -# -# $1 Input file -# $2 Test number -# -do_diff() -{ - local EXPECTED RESULT - EXPECTED="expected.$1.$2" - RESULT="${OUTPUT_DIR}/$1.$2" - - echo diff -u $EXPECTED $RESULT - if [ -f $EXPECTED ]; then - diff -u $EXPECTED $RESULT - else - echo "${EXPECTED} does not exist" - fi -} - -# -# Update expected results -# -eval_update() -{ - ensure_workdir - ensure_run - - if [ -z "${TEST_N}" ] ; then - TEST_N=1 - fi - - FAIL= - N=1 - while [ ${N} -le ${TEST_N} ] ; do - if ! skip_test ${N} ; then - cp ${OUTPUT_DIR}/stdout.${N} expected.stdout.${N} - cp ${OUTPUT_DIR}/stderr.${N} expected.stderr.${N} - cp ${OUTPUT_DIR}/status.${N} expected.status.${N} - fi - N=$((N + 1)) - done -} - -# -# Print description -# -eval_desc() -{ - echo "${SUBDIR}: ${DESC}" -} - -# -# Run the test -# -eval_test() -{ - eval_setup - eval_run - eval_compare -} - -# -# Run the test for prove(1) -# -eval_prove() -{ - eval_setup - eval_run - eval_compare - eval_clean -} - -# -# Main function. Execute the command(s) on the command line. -# -eval_cmd() -{ - if [ $# -eq 0 ] ; then - # if no arguments given default to 'prove' - set -- prove - fi - - if ! make_is_fmake ; then - for i in $(jot ${TEST_N:-1}) ; do - eval TEST_${i}_SKIP=\"make is not fmake\" - done - fi - - for i - do - case $i in - - setup | run | compare | diff | clean | reset | show | \ - test | prove | desc | update) - eval eval_$i - ;; - * | help) - print_usage - ;; - esac - done -} - -############################################################################## -# -# Main code -# - -# -# Parse command line arguments. -# -args=`getopt m:w:v $*` -if [ $? != 0 ]; then - echo 'Usage: ...' - exit 2 -fi -set -- $args -for i; do - case "$i" in - -m) - MAKE_PROG="$2" - shift - shift - ;; - -w) - WORK_BASE="$2" - shift - shift - ;; - -v) - VERBOSE=1 - shift - ;; - --) - shift - break - ;; - esac -done - -# -# Determine our sub-directory. Argh. -# -SRC_DIR=`pwd` -SRC_BASE=`while [ ! -f common.sh ] ; do cd .. ; done ; pwd` -SUBDIR=`echo ${SRC_DIR} | sed "s@${SRC_BASE}/@@"` - -# -# Construct working directory -# -WORK_BASE=${WORK_BASE:-"/tmp/$USER.make.test"} -WORK_DIR=${WORK_BASE}/${SUBDIR} -OUTPUT_DIR=${WORK_DIR}.OUTPUT - -# -# Make to use -# -MAKE_PROG=${MAKE_PROG:-/usr/bin/make} diff --git a/tools/regression/usr.bin/make/execution/ellipsis/Makefile b/tools/regression/usr.bin/make/execution/ellipsis/Makefile deleted file mode 100644 index d19f64259c528..0000000000000 --- a/tools/regression/usr.bin/make/execution/ellipsis/Makefile +++ /dev/null @@ -1,21 +0,0 @@ -# $FreeBSD$ - -ELLIPSIS= ... - -check-ellipsis: - @${MAKE} -f ${MAKEFILE} do-$@ - @${MAKE} -f ${MAKEFILE} -j2 do-$@ - @${MAKE} -f ${MAKEFILE} -j2 -B do-$@ - -do-check-ellipsis: do-check-ellipsis-1 do-check-ellipsis-2 -.ORDER: do-check-ellipsis-1 do-check-ellipsis-2 - -do-check-ellipsis-1: - @echo before $@ - ${ELLIPSIS} - @echo after $@ - -do-check-ellipsis-2: - @echo before $@ - ${ELLIPSIS} - @echo after $@ diff --git a/tools/regression/usr.bin/make/execution/ellipsis/expected.status.1 b/tools/regression/usr.bin/make/execution/ellipsis/expected.status.1 deleted file mode 100644 index 573541ac9702d..0000000000000 --- a/tools/regression/usr.bin/make/execution/ellipsis/expected.status.1 +++ /dev/null @@ -1 +0,0 @@ -0 diff --git a/tools/regression/usr.bin/make/execution/ellipsis/expected.stderr.1 b/tools/regression/usr.bin/make/execution/ellipsis/expected.stderr.1 deleted file mode 100644 index e69de29bb2d1d..0000000000000 --- a/tools/regression/usr.bin/make/execution/ellipsis/expected.stderr.1 +++ /dev/null diff --git a/tools/regression/usr.bin/make/execution/ellipsis/expected.stdout.1 b/tools/regression/usr.bin/make/execution/ellipsis/expected.stdout.1 deleted file mode 100644 index a7e5727b51818..0000000000000 --- a/tools/regression/usr.bin/make/execution/ellipsis/expected.stdout.1 +++ /dev/null @@ -1,12 +0,0 @@ -before do-check-ellipsis-1 -before do-check-ellipsis-2 -after do-check-ellipsis-1 -after do-check-ellipsis-2 -before do-check-ellipsis-1 -before do-check-ellipsis-2 -after do-check-ellipsis-1 -after do-check-ellipsis-2 -before do-check-ellipsis-1 -before do-check-ellipsis-2 -after do-check-ellipsis-1 -after do-check-ellipsis-2 diff --git a/tools/regression/usr.bin/make/execution/ellipsis/test.t b/tools/regression/usr.bin/make/execution/ellipsis/test.t deleted file mode 100644 index c042995fd0aab..0000000000000 --- a/tools/regression/usr.bin/make/execution/ellipsis/test.t +++ /dev/null @@ -1,15 +0,0 @@ -#!/bin/sh - -# $FreeBSD$ - -cd `dirname $0` -. ../../common.sh - -# Description -DESC="Ellipsis command from variable" - -# Run -TEST_N=1 -TEST_1= - -eval_cmd $* diff --git a/tools/regression/usr.bin/make/execution/empty/Makefile b/tools/regression/usr.bin/make/execution/empty/Makefile deleted file mode 100644 index f687bce7f245b..0000000000000 --- a/tools/regression/usr.bin/make/execution/empty/Makefile +++ /dev/null @@ -1,13 +0,0 @@ -# $FreeBSD$ - -EMPTY= - -check-empty: - @${MAKE} -f ${MAKEFILE} do-$@ - @${MAKE} -f ${MAKEFILE} -j2 do-$@ - @${MAKE} -f ${MAKEFILE} -j2 -B do-$@ - -do-check-empty: - ${EMPTY} - @${EMPTY} - @-${EMPTY} diff --git a/tools/regression/usr.bin/make/execution/empty/expected.status.1 b/tools/regression/usr.bin/make/execution/empty/expected.status.1 deleted file mode 100644 index 573541ac9702d..0000000000000 --- a/tools/regression/usr.bin/make/execution/empty/expected.status.1 +++ /dev/null @@ -1 +0,0 @@ -0 diff --git a/tools/regression/usr.bin/make/execution/empty/expected.stderr.1 b/tools/regression/usr.bin/make/execution/empty/expected.stderr.1 deleted file mode 100644 index e69de29bb2d1d..0000000000000 --- a/tools/regression/usr.bin/make/execution/empty/expected.stderr.1 +++ /dev/null diff --git a/tools/regression/usr.bin/make/execution/empty/expected.stdout.1 b/tools/regression/usr.bin/make/execution/empty/expected.stdout.1 deleted file mode 100644 index e69de29bb2d1d..0000000000000 --- a/tools/regression/usr.bin/make/execution/empty/expected.stdout.1 +++ /dev/null diff --git a/tools/regression/usr.bin/make/execution/empty/test.t b/tools/regression/usr.bin/make/execution/empty/test.t deleted file mode 100644 index 433d3427a3d9c..0000000000000 --- a/tools/regression/usr.bin/make/execution/empty/test.t +++ /dev/null @@ -1,15 +0,0 @@ -#!/bin/sh - -# $FreeBSD$ - -cd `dirname $0` -. ../../common.sh - -# Description -DESC="Empty command (from variable)" - -# Run -TEST_N=1 -TEST_1= - -eval_cmd $* diff --git a/tools/regression/usr.bin/make/execution/joberr/Makefile b/tools/regression/usr.bin/make/execution/joberr/Makefile deleted file mode 100644 index aca86e87bae85..0000000000000 --- a/tools/regression/usr.bin/make/execution/joberr/Makefile +++ /dev/null @@ -1,10 +0,0 @@ -# $FreeBSD$ - -check-joberr: -.for _t in 0 1 2 3 4 5 6 7 8 9 0 1 2 3 4 5 6 7 8 9 0 1 2 3 4 5 6 7 8 9 - @-${MAKE} -f ${MAKEFILE} -j2 do-$@ -.endfor - -do-check-joberr: - @echo "Error: build failed" - @exit 1 diff --git a/tools/regression/usr.bin/make/execution/joberr/expected.status.1 b/tools/regression/usr.bin/make/execution/joberr/expected.status.1 deleted file mode 100644 index 573541ac9702d..0000000000000 --- a/tools/regression/usr.bin/make/execution/joberr/expected.status.1 +++ /dev/null @@ -1 +0,0 @@ -0 diff --git a/tools/regression/usr.bin/make/execution/joberr/expected.stderr.1 b/tools/regression/usr.bin/make/execution/joberr/expected.stderr.1 deleted file mode 100644 index d0c8a2eb27b22..0000000000000 --- a/tools/regression/usr.bin/make/execution/joberr/expected.stderr.1 +++ /dev/null @@ -1,30 +0,0 @@ -1 error -1 error -1 error -1 error -1 error -1 error -1 error -1 error -1 error -1 error -1 error -1 error -1 error -1 error -1 error -1 error -1 error -1 error -1 error -1 error -1 error -1 error -1 error -1 error -1 error -1 error -1 error -1 error -1 error -1 error diff --git a/tools/regression/usr.bin/make/execution/joberr/expected.stdout.1 b/tools/regression/usr.bin/make/execution/joberr/expected.stdout.1 deleted file mode 100644 index 0ee28f4fd515f..0000000000000 --- a/tools/regression/usr.bin/make/execution/joberr/expected.stdout.1 +++ /dev/null @@ -1,90 +0,0 @@ -Error: build failed -*** [do-check-joberr] Error code 1 -Error: build failed -*** [do-check-joberr] Error code 1 -Error: build failed -*** [do-check-joberr] Error code 1 -Error: build failed -*** [do-check-joberr] Error code 1 -Error: build failed -*** [do-check-joberr] Error code 1 -Error: build failed -*** [do-check-joberr] Error code 1 -Error: build failed -*** [do-check-joberr] Error code 1 -Error: build failed -*** [do-check-joberr] Error code 1 -Error: build failed -*** [do-check-joberr] Error code 1 -Error: build failed -*** [do-check-joberr] Error code 1 -Error: build failed -*** [do-check-joberr] Error code 1 -Error: build failed -*** [do-check-joberr] Error code 1 -Error: build failed -*** [do-check-joberr] Error code 1 -Error: build failed -*** [do-check-joberr] Error code 1 -Error: build failed -*** [do-check-joberr] Error code 1 -Error: build failed -*** [do-check-joberr] Error code 1 -Error: build failed -*** [do-check-joberr] Error code 1 -Error: build failed -*** [do-check-joberr] Error code 1 -Error: build failed -*** [do-check-joberr] Error code 1 -Error: build failed -*** [do-check-joberr] Error code 1 -Error: build failed -*** [do-check-joberr] Error code 1 -Error: build failed -*** [do-check-joberr] Error code 1 -Error: build failed -*** [do-check-joberr] Error code 1 -Error: build failed -*** [do-check-joberr] Error code 1 -Error: build failed -*** [do-check-joberr] Error code 1 -Error: build failed -*** [do-check-joberr] Error code 1 -Error: build failed -*** [do-check-joberr] Error code 1 -Error: build failed -*** [do-check-joberr] Error code 1 -Error: build failed -*** [do-check-joberr] Error code 1 -Error: build failed -*** [do-check-joberr] Error code 1 -*** [check-joberr] Error code 2 (ignored) -*** [check-joberr] Error code 2 (ignored) -*** [check-joberr] Error code 2 (ignored) -*** [check-joberr] Error code 2 (ignored) -*** [check-joberr] Error code 2 (ignored) -*** [check-joberr] Error code 2 (ignored) -*** [check-joberr] Error code 2 (ignored) -*** [check-joberr] Error code 2 (ignored) -*** [check-joberr] Error code 2 (ignored) -*** [check-joberr] Error code 2 (ignored) -*** [check-joberr] Error code 2 (ignored) -*** [check-joberr] Error code 2 (ignored) -*** [check-joberr] Error code 2 (ignored) -*** [check-joberr] Error code 2 (ignored) -*** [check-joberr] Error code 2 (ignored) -*** [check-joberr] Error code 2 (ignored) -*** [check-joberr] Error code 2 (ignored) -*** [check-joberr] Error code 2 (ignored) -*** [check-joberr] Error code 2 (ignored) -*** [check-joberr] Error code 2 (ignored) -*** [check-joberr] Error code 2 (ignored) -*** [check-joberr] Error code 2 (ignored) -*** [check-joberr] Error code 2 (ignored) -*** [check-joberr] Error code 2 (ignored) -*** [check-joberr] Error code 2 (ignored) -*** [check-joberr] Error code 2 (ignored) -*** [check-joberr] Error code 2 (ignored) -*** [check-joberr] Error code 2 (ignored) -*** [check-joberr] Error code 2 (ignored) -*** [check-joberr] Error code 2 (ignored) diff --git a/tools/regression/usr.bin/make/execution/joberr/test.t b/tools/regression/usr.bin/make/execution/joberr/test.t deleted file mode 100644 index 8e07958cb9dc0..0000000000000 --- a/tools/regression/usr.bin/make/execution/joberr/test.t +++ /dev/null @@ -1,15 +0,0 @@ -#!/bin/sh - -# $FreeBSD$ - -cd `dirname $0` -. ../../common.sh - -# Description -DESC="Test job make error output" - -# Run -TEST_N=1 -TEST_1= - -eval_cmd $* diff --git a/tools/regression/usr.bin/make/execution/plus/Makefile b/tools/regression/usr.bin/make/execution/plus/Makefile deleted file mode 100644 index ae3bdc30b7036..0000000000000 --- a/tools/regression/usr.bin/make/execution/plus/Makefile +++ /dev/null @@ -1,7 +0,0 @@ -# $FreeBSD$ - -check-+: - @${MAKE} -f ${MAKEFILE} -j2 -n do-$@ - -do-check-+: - @+echo $@ diff --git a/tools/regression/usr.bin/make/execution/plus/expected.status.1 b/tools/regression/usr.bin/make/execution/plus/expected.status.1 deleted file mode 100644 index 573541ac9702d..0000000000000 --- a/tools/regression/usr.bin/make/execution/plus/expected.status.1 +++ /dev/null @@ -1 +0,0 @@ -0 diff --git a/tools/regression/usr.bin/make/execution/plus/expected.stderr.1 b/tools/regression/usr.bin/make/execution/plus/expected.stderr.1 deleted file mode 100644 index e69de29bb2d1d..0000000000000 --- a/tools/regression/usr.bin/make/execution/plus/expected.stderr.1 +++ /dev/null diff --git a/tools/regression/usr.bin/make/execution/plus/expected.stdout.1 b/tools/regression/usr.bin/make/execution/plus/expected.stdout.1 deleted file mode 100644 index b334fc734706c..0000000000000 --- a/tools/regression/usr.bin/make/execution/plus/expected.stdout.1 +++ /dev/null @@ -1 +0,0 @@ -do-check-+ diff --git a/tools/regression/usr.bin/make/execution/plus/test.t b/tools/regression/usr.bin/make/execution/plus/test.t deleted file mode 100644 index e75b4b9df2a85..0000000000000 --- a/tools/regression/usr.bin/make/execution/plus/test.t +++ /dev/null @@ -1,15 +0,0 @@ -#!/bin/sh - -# $FreeBSD$ - -cd `dirname $0` -. ../../common.sh - -# Description -DESC="Test '+command' execution with -n -jX" - -# Run -TEST_N=1 -TEST_1= - -eval_cmd $* diff --git a/tools/regression/usr.bin/make/shell/builtin/Makefile b/tools/regression/usr.bin/make/shell/builtin/Makefile deleted file mode 100644 index 03764784e1a09..0000000000000 --- a/tools/regression/usr.bin/make/shell/builtin/Makefile +++ /dev/null @@ -1,18 +0,0 @@ -# -# In compat mode (the default without -j) a line that contains no shell -# meta characters and no shell builtins is not passed to the shell but -# executed directly. In our example the ls line without meta characters -# will really execute ls, while the line with meta characters will execute -# our special shell. -# -# $FreeBSD$ - -.SHELL: path="${.CURDIR}/sh" - -.PHONY: builtin no-builtin - -builtin: - @exec ls -d . - -no-builtin: - @ls -d . diff --git a/tools/regression/usr.bin/make/shell/builtin/expected.status.1 b/tools/regression/usr.bin/make/shell/builtin/expected.status.1 deleted file mode 100644 index 573541ac9702d..0000000000000 --- a/tools/regression/usr.bin/make/shell/builtin/expected.status.1 +++ /dev/null @@ -1 +0,0 @@ -0 diff --git a/tools/regression/usr.bin/make/shell/builtin/expected.status.2 b/tools/regression/usr.bin/make/shell/builtin/expected.status.2 deleted file mode 100644 index 573541ac9702d..0000000000000 --- a/tools/regression/usr.bin/make/shell/builtin/expected.status.2 +++ /dev/null @@ -1 +0,0 @@ -0 diff --git a/tools/regression/usr.bin/make/shell/builtin/expected.stderr.1 b/tools/regression/usr.bin/make/shell/builtin/expected.stderr.1 deleted file mode 100644 index e69de29bb2d1d..0000000000000 --- a/tools/regression/usr.bin/make/shell/builtin/expected.stderr.1 +++ /dev/null diff --git a/tools/regression/usr.bin/make/shell/builtin/expected.stderr.2 b/tools/regression/usr.bin/make/shell/builtin/expected.stderr.2 deleted file mode 100644 index e69de29bb2d1d..0000000000000 --- a/tools/regression/usr.bin/make/shell/builtin/expected.stderr.2 +++ /dev/null diff --git a/tools/regression/usr.bin/make/shell/builtin/expected.stdout.1 b/tools/regression/usr.bin/make/shell/builtin/expected.stdout.1 deleted file mode 100644 index 9c558e357c416..0000000000000 --- a/tools/regression/usr.bin/make/shell/builtin/expected.stdout.1 +++ /dev/null @@ -1 +0,0 @@ -. diff --git a/tools/regression/usr.bin/make/shell/builtin/expected.stdout.2 b/tools/regression/usr.bin/make/shell/builtin/expected.stdout.2 deleted file mode 100644 index e350eaf8c7ea9..0000000000000 --- a/tools/regression/usr.bin/make/shell/builtin/expected.stdout.2 +++ /dev/null @@ -1 +0,0 @@ --ec exec ls -d . diff --git a/tools/regression/usr.bin/make/shell/builtin/sh b/tools/regression/usr.bin/make/shell/builtin/sh deleted file mode 100644 index 3a507b87f6748..0000000000000 --- a/tools/regression/usr.bin/make/shell/builtin/sh +++ /dev/null @@ -1,6 +0,0 @@ -#!/bin/sh -# $FreeBSD$ -echo "$@" -if ! test -t 0 ; then - cat -fi diff --git a/tools/regression/usr.bin/make/shell/builtin/test.t b/tools/regression/usr.bin/make/shell/builtin/test.t deleted file mode 100644 index 1798afcc32077..0000000000000 --- a/tools/regression/usr.bin/make/shell/builtin/test.t +++ /dev/null @@ -1,19 +0,0 @@ -#!/bin/sh - -# $FreeBSD$ - -cd `dirname $0` -. ../../common.sh - -# Description -DESC="Check that a command line with a builtin is passed to the shell." - -# Setup -TEST_COPY_FILES="sh 755" - -# Run -TEST_N=2 -TEST_1="-B no-builtin" -TEST_2="-B builtin" - -eval_cmd $* diff --git a/tools/regression/usr.bin/make/shell/meta/Makefile b/tools/regression/usr.bin/make/shell/meta/Makefile deleted file mode 100644 index bcf19d052bbc7..0000000000000 --- a/tools/regression/usr.bin/make/shell/meta/Makefile +++ /dev/null @@ -1,18 +0,0 @@ -# -# In compat mode (the default without -j) a line that contains no shell -# meta characters and no shell builtins is not passed to the shell but -# executed directly. In our example the ls line without meta characters -# will really execute ls, while the line with meta characters will execute -# our special shell. -# -# $FreeBSD$ - -.SHELL: path="${.OBJDIR}/sh" - -.PHONY: meta no-meta - -meta: - @ls * - -no-meta: - @ls -d . diff --git a/tools/regression/usr.bin/make/shell/meta/expected.status.1 b/tools/regression/usr.bin/make/shell/meta/expected.status.1 deleted file mode 100644 index 573541ac9702d..0000000000000 --- a/tools/regression/usr.bin/make/shell/meta/expected.status.1 +++ /dev/null @@ -1 +0,0 @@ -0 diff --git a/tools/regression/usr.bin/make/shell/meta/expected.status.2 b/tools/regression/usr.bin/make/shell/meta/expected.status.2 deleted file mode 100644 index 573541ac9702d..0000000000000 --- a/tools/regression/usr.bin/make/shell/meta/expected.status.2 +++ /dev/null @@ -1 +0,0 @@ -0 diff --git a/tools/regression/usr.bin/make/shell/meta/expected.stderr.1 b/tools/regression/usr.bin/make/shell/meta/expected.stderr.1 deleted file mode 100644 index e69de29bb2d1d..0000000000000 --- a/tools/regression/usr.bin/make/shell/meta/expected.stderr.1 +++ /dev/null diff --git a/tools/regression/usr.bin/make/shell/meta/expected.stderr.2 b/tools/regression/usr.bin/make/shell/meta/expected.stderr.2 deleted file mode 100644 index e69de29bb2d1d..0000000000000 --- a/tools/regression/usr.bin/make/shell/meta/expected.stderr.2 +++ /dev/null diff --git a/tools/regression/usr.bin/make/shell/meta/expected.stdout.1 b/tools/regression/usr.bin/make/shell/meta/expected.stdout.1 deleted file mode 100644 index 9c558e357c416..0000000000000 --- a/tools/regression/usr.bin/make/shell/meta/expected.stdout.1 +++ /dev/null @@ -1 +0,0 @@ -. diff --git a/tools/regression/usr.bin/make/shell/meta/expected.stdout.2 b/tools/regression/usr.bin/make/shell/meta/expected.stdout.2 deleted file mode 100644 index 6ac6f19502a5f..0000000000000 --- a/tools/regression/usr.bin/make/shell/meta/expected.stdout.2 +++ /dev/null @@ -1 +0,0 @@ --ec ls * diff --git a/tools/regression/usr.bin/make/shell/meta/sh b/tools/regression/usr.bin/make/shell/meta/sh deleted file mode 100644 index 3a507b87f6748..0000000000000 --- a/tools/regression/usr.bin/make/shell/meta/sh +++ /dev/null @@ -1,6 +0,0 @@ -#!/bin/sh -# $FreeBSD$ -echo "$@" -if ! test -t 0 ; then - cat -fi diff --git a/tools/regression/usr.bin/make/shell/meta/test.t b/tools/regression/usr.bin/make/shell/meta/test.t deleted file mode 100644 index 588b73ccc9f65..0000000000000 --- a/tools/regression/usr.bin/make/shell/meta/test.t +++ /dev/null @@ -1,19 +0,0 @@ -#!/bin/sh - -# $FreeBSD$ - -cd `dirname $0` -. ../../common.sh - -# Description -DESC="Check that a command line with meta characters is passed to the shell." - -# Setup -TEST_COPY_FILES="sh 755" - -# Run -TEST_N=2 -TEST_1="-B no-meta" -TEST_2="-B meta" - -eval_cmd $* diff --git a/tools/regression/usr.bin/make/shell/path/Makefile b/tools/regression/usr.bin/make/shell/path/Makefile deleted file mode 100644 index fe40b645510ec..0000000000000 --- a/tools/regression/usr.bin/make/shell/path/Makefile +++ /dev/null @@ -1,31 +0,0 @@ -# -# Change the path for builtin shells. There are two methods to do this. -# This is the first of them when the basename of the path is equal to -# one of the builtin shells so that the .SHELL target automatically -# also selectes the shell without specifying the name. -# -# Be sure to include a meta-character into the command line, so that -# really our shell is executed. -# -# $FreeBSD$ -# - -.ifmake sh_test - -.SHELL: path=${.OBJDIR}/sh -sh_test: - @: This is the shell. - -.elifmake csh_test - -.SHELL: path=${.OBJDIR}/csh -csh_test: - @: This is the C-shell. - -.elifmake ksh_test - -.SHELL: path=${.OBJDIR}/ksh -ksh_test: - @: This is the Korn-shell. - -.endif diff --git a/tools/regression/usr.bin/make/shell/path/expected.status.1 b/tools/regression/usr.bin/make/shell/path/expected.status.1 deleted file mode 100644 index 573541ac9702d..0000000000000 --- a/tools/regression/usr.bin/make/shell/path/expected.status.1 +++ /dev/null @@ -1 +0,0 @@ -0 diff --git a/tools/regression/usr.bin/make/shell/path/expected.status.2 b/tools/regression/usr.bin/make/shell/path/expected.status.2 deleted file mode 100644 index 573541ac9702d..0000000000000 --- a/tools/regression/usr.bin/make/shell/path/expected.status.2 +++ /dev/null @@ -1 +0,0 @@ -0 diff --git a/tools/regression/usr.bin/make/shell/path/expected.stderr.1 b/tools/regression/usr.bin/make/shell/path/expected.stderr.1 deleted file mode 100644 index e69de29bb2d1d..0000000000000 --- a/tools/regression/usr.bin/make/shell/path/expected.stderr.1 +++ /dev/null diff --git a/tools/regression/usr.bin/make/shell/path/expected.stderr.2 b/tools/regression/usr.bin/make/shell/path/expected.stderr.2 deleted file mode 100644 index e69de29bb2d1d..0000000000000 --- a/tools/regression/usr.bin/make/shell/path/expected.stderr.2 +++ /dev/null diff --git a/tools/regression/usr.bin/make/shell/path/expected.stdout.1 b/tools/regression/usr.bin/make/shell/path/expected.stdout.1 deleted file mode 100644 index d881364744b27..0000000000000 --- a/tools/regression/usr.bin/make/shell/path/expected.stdout.1 +++ /dev/null @@ -1 +0,0 @@ --ec : This is the shell. diff --git a/tools/regression/usr.bin/make/shell/path/expected.stdout.2 b/tools/regression/usr.bin/make/shell/path/expected.stdout.2 deleted file mode 100644 index de3fc89cc9e21..0000000000000 --- a/tools/regression/usr.bin/make/shell/path/expected.stdout.2 +++ /dev/null @@ -1 +0,0 @@ --ec : This is the C-shell. diff --git a/tools/regression/usr.bin/make/shell/path/sh b/tools/regression/usr.bin/make/shell/path/sh deleted file mode 100644 index 46169eb6efc2b..0000000000000 --- a/tools/regression/usr.bin/make/shell/path/sh +++ /dev/null @@ -1,6 +0,0 @@ -#!/bin/sh -# $FreeBSD$ -echo $@ -if ! test -t 0 ; then - cat -fi diff --git a/tools/regression/usr.bin/make/shell/path/test.t b/tools/regression/usr.bin/make/shell/path/test.t deleted file mode 100644 index 72ff252af70ef..0000000000000 --- a/tools/regression/usr.bin/make/shell/path/test.t +++ /dev/null @@ -1,22 +0,0 @@ -#!/bin/sh - -# $FreeBSD$ - -cd `dirname $0` -. ../../common.sh - -# Description -DESC="New path for builtin shells." - -# Setup -TEST_COPY_FILES="sh 755" -TEST_LINKS="sh csh sh ksh" - -# Run -TEST_N=3 -TEST_1="sh_test" -TEST_2="csh_test" -TEST_3="ksh_test" -TEST_3_SKIP="no ksh on FreeBSD" - -eval_cmd $* diff --git a/tools/regression/usr.bin/make/shell/path_select/Makefile b/tools/regression/usr.bin/make/shell/path_select/Makefile deleted file mode 100644 index 05cfb27f3fd9a..0000000000000 --- a/tools/regression/usr.bin/make/shell/path_select/Makefile +++ /dev/null @@ -1,31 +0,0 @@ -# -# Change the path for builtin shells. There are two methods to do this. -# This is the second of them when both a path and a name are specified. -# This selects a builtin shell according to the name, but executes it -# from the specified path. -# -# Be sure to include a meta-character into the command line, so that -# really our shell is executed. -# -# $FreeBSD$ -# - -.ifmake sh_test - -.SHELL: name=sh path=${.CURDIR}/shell -sh_test: - @: This is the shell. - -.elifmake csh_test - -.SHELL: name=csh path=${.CURDIR}/shell -csh_test: - @: This is the C-shell. - -.elifmake ksh_test - -.SHELL: name=ksh path=${.CURDIR}/shell -ksh_test: - @: This is the Korn-shell. - -.endif diff --git a/tools/regression/usr.bin/make/shell/path_select/expected.status.1 b/tools/regression/usr.bin/make/shell/path_select/expected.status.1 deleted file mode 100644 index 573541ac9702d..0000000000000 --- a/tools/regression/usr.bin/make/shell/path_select/expected.status.1 +++ /dev/null @@ -1 +0,0 @@ -0 diff --git a/tools/regression/usr.bin/make/shell/path_select/expected.status.2 b/tools/regression/usr.bin/make/shell/path_select/expected.status.2 deleted file mode 100644 index 573541ac9702d..0000000000000 --- a/tools/regression/usr.bin/make/shell/path_select/expected.status.2 +++ /dev/null @@ -1 +0,0 @@ -0 diff --git a/tools/regression/usr.bin/make/shell/path_select/expected.stderr.1 b/tools/regression/usr.bin/make/shell/path_select/expected.stderr.1 deleted file mode 100644 index e69de29bb2d1d..0000000000000 --- a/tools/regression/usr.bin/make/shell/path_select/expected.stderr.1 +++ /dev/null diff --git a/tools/regression/usr.bin/make/shell/path_select/expected.stderr.2 b/tools/regression/usr.bin/make/shell/path_select/expected.stderr.2 deleted file mode 100644 index e69de29bb2d1d..0000000000000 --- a/tools/regression/usr.bin/make/shell/path_select/expected.stderr.2 +++ /dev/null diff --git a/tools/regression/usr.bin/make/shell/path_select/expected.stdout.1 b/tools/regression/usr.bin/make/shell/path_select/expected.stdout.1 deleted file mode 100644 index d881364744b27..0000000000000 --- a/tools/regression/usr.bin/make/shell/path_select/expected.stdout.1 +++ /dev/null @@ -1 +0,0 @@ --ec : This is the shell. diff --git a/tools/regression/usr.bin/make/shell/path_select/expected.stdout.2 b/tools/regression/usr.bin/make/shell/path_select/expected.stdout.2 deleted file mode 100644 index de3fc89cc9e21..0000000000000 --- a/tools/regression/usr.bin/make/shell/path_select/expected.stdout.2 +++ /dev/null @@ -1 +0,0 @@ --ec : This is the C-shell. diff --git a/tools/regression/usr.bin/make/shell/path_select/shell b/tools/regression/usr.bin/make/shell/path_select/shell deleted file mode 100644 index 46169eb6efc2b..0000000000000 --- a/tools/regression/usr.bin/make/shell/path_select/shell +++ /dev/null @@ -1,6 +0,0 @@ -#!/bin/sh -# $FreeBSD$ -echo $@ -if ! test -t 0 ; then - cat -fi diff --git a/tools/regression/usr.bin/make/shell/path_select/test.t b/tools/regression/usr.bin/make/shell/path_select/test.t deleted file mode 100644 index 5bac6316722e8..0000000000000 --- a/tools/regression/usr.bin/make/shell/path_select/test.t +++ /dev/null @@ -1,21 +0,0 @@ -#!/bin/sh - -# $FreeBSD$ - -cd `dirname $0` -. ../../common.sh - -# Description -DESC="New path for builtin shells (2)." - -# Setup -TEST_COPY_FILES="shell 755" - -# Run -TEST_N=3 -TEST_1="sh_test" -TEST_2="csh_test" -TEST_3="ksh_test" -TEST_3_SKIP="no ksh on FreeBSD" - -eval_cmd $* diff --git a/tools/regression/usr.bin/make/shell/replace/Makefile b/tools/regression/usr.bin/make/shell/replace/Makefile deleted file mode 100644 index 2160dbfb57762..0000000000000 --- a/tools/regression/usr.bin/make/shell/replace/Makefile +++ /dev/null @@ -1,21 +0,0 @@ -# -# Test that we can replace the shell and set all the shell parameters -# (except meta and builtin which have their own test). This is done by -# using a shell script for the shell that echoes all command line -# arguments and its standard input. The shell name should not be one of -# the builtin shells. -# -# XXX There seems to be a problem here in -j1 mode: for the line without -# @- make should switch on echoing again, but it doesn't. -# -# $FreeBSD$ - -.SHELL: name="shell" path="${.CURDIR}/shell" \ - quiet="be quiet" echo="be verbose" filter="be verbose" \ - echoFlag="x" errFlag="y" \ - hasErrCtl=y check="check errors" ignore="ignore errors" - -.PHONY: test1 -test1: - -@funny $$ - funnier $$ diff --git a/tools/regression/usr.bin/make/shell/replace/expected.status.1 b/tools/regression/usr.bin/make/shell/replace/expected.status.1 deleted file mode 100644 index 573541ac9702d..0000000000000 --- a/tools/regression/usr.bin/make/shell/replace/expected.status.1 +++ /dev/null @@ -1 +0,0 @@ -0 diff --git a/tools/regression/usr.bin/make/shell/replace/expected.status.2 b/tools/regression/usr.bin/make/shell/replace/expected.status.2 deleted file mode 100644 index 573541ac9702d..0000000000000 --- a/tools/regression/usr.bin/make/shell/replace/expected.status.2 +++ /dev/null @@ -1 +0,0 @@ -0 diff --git a/tools/regression/usr.bin/make/shell/replace/expected.stderr.1 b/tools/regression/usr.bin/make/shell/replace/expected.stderr.1 deleted file mode 100644 index e69de29bb2d1d..0000000000000 --- a/tools/regression/usr.bin/make/shell/replace/expected.stderr.1 +++ /dev/null diff --git a/tools/regression/usr.bin/make/shell/replace/expected.stderr.2 b/tools/regression/usr.bin/make/shell/replace/expected.stderr.2 deleted file mode 100644 index e69de29bb2d1d..0000000000000 --- a/tools/regression/usr.bin/make/shell/replace/expected.stderr.2 +++ /dev/null diff --git a/tools/regression/usr.bin/make/shell/replace/expected.stdout.1 b/tools/regression/usr.bin/make/shell/replace/expected.stdout.1 deleted file mode 100644 index eff99ea17ab2a..0000000000000 --- a/tools/regression/usr.bin/make/shell/replace/expected.stdout.1 +++ /dev/null @@ -1,3 +0,0 @@ --c funny $ -funnier $ --ec funnier $ diff --git a/tools/regression/usr.bin/make/shell/replace/expected.stdout.2 b/tools/regression/usr.bin/make/shell/replace/expected.stdout.2 deleted file mode 100644 index c79a09af29165..0000000000000 --- a/tools/regression/usr.bin/make/shell/replace/expected.stdout.2 +++ /dev/null @@ -1,6 +0,0 @@ --yx -be quiet -ignore errors -funny $ -check errors -funnier $ diff --git a/tools/regression/usr.bin/make/shell/replace/shell b/tools/regression/usr.bin/make/shell/replace/shell deleted file mode 100644 index 46169eb6efc2b..0000000000000 --- a/tools/regression/usr.bin/make/shell/replace/shell +++ /dev/null @@ -1,6 +0,0 @@ -#!/bin/sh -# $FreeBSD$ -echo $@ -if ! test -t 0 ; then - cat -fi diff --git a/tools/regression/usr.bin/make/shell/replace/test.t b/tools/regression/usr.bin/make/shell/replace/test.t deleted file mode 100644 index 5c91cf9e03e86..0000000000000 --- a/tools/regression/usr.bin/make/shell/replace/test.t +++ /dev/null @@ -1,19 +0,0 @@ -#!/bin/sh - -# $FreeBSD$ - -cd `dirname $0` -. ../../common.sh - -# Description -DESC="Check that the shell can be replaced." - -# Setup -TEST_COPY_FILES="shell 755" - -# Run -TEST_N=2 -TEST_1= -TEST_2=-j2 - -eval_cmd $* diff --git a/tools/regression/usr.bin/make/shell/select/Makefile b/tools/regression/usr.bin/make/shell/select/Makefile deleted file mode 100644 index e1ff0231c737e..0000000000000 --- a/tools/regression/usr.bin/make/shell/select/Makefile +++ /dev/null @@ -1,28 +0,0 @@ -# -# We just select the builtin shells and check whether it is really -# executed. This should print just the shell paths. Because we -# normally don't have a ksh, we make this test conditional. This means -# one has to recreate the test results once ksh is installed. -# -# $FreeBSD$ -# - -.ifmake sh_test - -.SHELL: name=sh -sh_test: print_path - -.elifmake csh_test - -.SHELL: name=csh -csh_test: print_path - -.elifmake ksh_test - -.SHELL: name=ksh -ksh_test: print_path - -.endif - -print_path: - @ps -opid,command | awk '$$1=='$$$$' { print $$2; }' diff --git a/tools/regression/usr.bin/make/shell/select/expected.status.1 b/tools/regression/usr.bin/make/shell/select/expected.status.1 deleted file mode 100644 index 573541ac9702d..0000000000000 --- a/tools/regression/usr.bin/make/shell/select/expected.status.1 +++ /dev/null @@ -1 +0,0 @@ -0 diff --git a/tools/regression/usr.bin/make/shell/select/expected.status.2 b/tools/regression/usr.bin/make/shell/select/expected.status.2 deleted file mode 100644 index 573541ac9702d..0000000000000 --- a/tools/regression/usr.bin/make/shell/select/expected.status.2 +++ /dev/null @@ -1 +0,0 @@ -0 diff --git a/tools/regression/usr.bin/make/shell/select/expected.stderr.1 b/tools/regression/usr.bin/make/shell/select/expected.stderr.1 deleted file mode 100644 index e69de29bb2d1d..0000000000000 --- a/tools/regression/usr.bin/make/shell/select/expected.stderr.1 +++ /dev/null diff --git a/tools/regression/usr.bin/make/shell/select/expected.stderr.2 b/tools/regression/usr.bin/make/shell/select/expected.stderr.2 deleted file mode 100644 index e69de29bb2d1d..0000000000000 --- a/tools/regression/usr.bin/make/shell/select/expected.stderr.2 +++ /dev/null diff --git a/tools/regression/usr.bin/make/shell/select/expected.stdout.1 b/tools/regression/usr.bin/make/shell/select/expected.stdout.1 deleted file mode 100644 index c2cdaa0f27c1a..0000000000000 --- a/tools/regression/usr.bin/make/shell/select/expected.stdout.1 +++ /dev/null @@ -1 +0,0 @@ -/bin/sh diff --git a/tools/regression/usr.bin/make/shell/select/expected.stdout.2 b/tools/regression/usr.bin/make/shell/select/expected.stdout.2 deleted file mode 100644 index 5a831e82da122..0000000000000 --- a/tools/regression/usr.bin/make/shell/select/expected.stdout.2 +++ /dev/null @@ -1 +0,0 @@ -/bin/csh diff --git a/tools/regression/usr.bin/make/shell/select/test.t b/tools/regression/usr.bin/make/shell/select/test.t deleted file mode 100644 index 7f73f9b24e25f..0000000000000 --- a/tools/regression/usr.bin/make/shell/select/test.t +++ /dev/null @@ -1,18 +0,0 @@ -#!/bin/sh - -# $FreeBSD$ - -cd `dirname $0` -. ../../common.sh - -# Description -DESC="Select the builtin sh shell." - -# Run -TEST_N=3 -TEST_1="sh_test" -TEST_2="csh_test" -TEST_3="ksh_test" -TEST_3_SKIP="no ksh on FreeBSD" - -eval_cmd $* diff --git a/tools/regression/usr.bin/make/suffixes/basic/Makefile b/tools/regression/usr.bin/make/suffixes/basic/Makefile deleted file mode 100644 index 45d9130eed977..0000000000000 --- a/tools/regression/usr.bin/make/suffixes/basic/Makefile +++ /dev/null @@ -1,13 +0,0 @@ -# $FreeBSD$ -# -# Check that a simple suffix rule is correctly processed. - -test1: TEST1.b - diff -u TEST1.a TEST1.b - -.SUFFIXES: - -.SUFFIXES: .a .b - -.a.b: - cat ${.IMPSRC} >${.TARGET} diff --git a/tools/regression/usr.bin/make/suffixes/basic/TEST1.a b/tools/regression/usr.bin/make/suffixes/basic/TEST1.a deleted file mode 100644 index da5569b525e32..0000000000000 --- a/tools/regression/usr.bin/make/suffixes/basic/TEST1.a +++ /dev/null @@ -1 +0,0 @@ -I'm test file 1. diff --git a/tools/regression/usr.bin/make/suffixes/basic/expected.status.1 b/tools/regression/usr.bin/make/suffixes/basic/expected.status.1 deleted file mode 100644 index 573541ac9702d..0000000000000 --- a/tools/regression/usr.bin/make/suffixes/basic/expected.status.1 +++ /dev/null @@ -1 +0,0 @@ -0 diff --git a/tools/regression/usr.bin/make/suffixes/basic/expected.stderr.1 b/tools/regression/usr.bin/make/suffixes/basic/expected.stderr.1 deleted file mode 100644 index e69de29bb2d1d..0000000000000 --- a/tools/regression/usr.bin/make/suffixes/basic/expected.stderr.1 +++ /dev/null diff --git a/tools/regression/usr.bin/make/suffixes/basic/expected.stdout.1 b/tools/regression/usr.bin/make/suffixes/basic/expected.stdout.1 deleted file mode 100644 index 582927e8e98e5..0000000000000 --- a/tools/regression/usr.bin/make/suffixes/basic/expected.stdout.1 +++ /dev/null @@ -1,2 +0,0 @@ -cat TEST1.a >TEST1.b -diff -u TEST1.a TEST1.b diff --git a/tools/regression/usr.bin/make/suffixes/basic/test.t b/tools/regression/usr.bin/make/suffixes/basic/test.t deleted file mode 100644 index 0b387c8ce9e15..0000000000000 --- a/tools/regression/usr.bin/make/suffixes/basic/test.t +++ /dev/null @@ -1,21 +0,0 @@ -#!/bin/sh - -# $FreeBSD$ - -cd `dirname $0` -. ../../common.sh - -# Description -DESC="Basic suffix operation." - -# Setup -TEST_COPY_FILES="TEST1.a 644" - -# Reset -TEST_CLEAN="Test1.b" - -# Run -TEST_N=1 -TEST_1="-r test1" - -eval_cmd $* diff --git a/tools/regression/usr.bin/make/suffixes/src_wild1/Makefile b/tools/regression/usr.bin/make/suffixes/src_wild1/Makefile deleted file mode 100644 index d0258ad126c6b..0000000000000 --- a/tools/regression/usr.bin/make/suffixes/src_wild1/Makefile +++ /dev/null @@ -1,7 +0,0 @@ -# $FreeBSD$ - -test1: TEST1.b - cat TEST1.a TEST2.a | diff -u - TEST1.b - -TEST1.b: *.a - cat ${.ALLSRC} >${.TARGET} diff --git a/tools/regression/usr.bin/make/suffixes/src_wild1/TEST1.a b/tools/regression/usr.bin/make/suffixes/src_wild1/TEST1.a deleted file mode 100644 index da5569b525e32..0000000000000 --- a/tools/regression/usr.bin/make/suffixes/src_wild1/TEST1.a +++ /dev/null @@ -1 +0,0 @@ -I'm test file 1. diff --git a/tools/regression/usr.bin/make/suffixes/src_wild1/TEST2.a b/tools/regression/usr.bin/make/suffixes/src_wild1/TEST2.a deleted file mode 100644 index 34f850858dc09..0000000000000 --- a/tools/regression/usr.bin/make/suffixes/src_wild1/TEST2.a +++ /dev/null @@ -1 +0,0 @@ -I'm test file 2. diff --git a/tools/regression/usr.bin/make/suffixes/src_wild1/expected.status.1 b/tools/regression/usr.bin/make/suffixes/src_wild1/expected.status.1 deleted file mode 100644 index 573541ac9702d..0000000000000 --- a/tools/regression/usr.bin/make/suffixes/src_wild1/expected.status.1 +++ /dev/null @@ -1 +0,0 @@ -0 diff --git a/tools/regression/usr.bin/make/suffixes/src_wild1/expected.stderr.1 b/tools/regression/usr.bin/make/suffixes/src_wild1/expected.stderr.1 deleted file mode 100644 index e69de29bb2d1d..0000000000000 --- a/tools/regression/usr.bin/make/suffixes/src_wild1/expected.stderr.1 +++ /dev/null diff --git a/tools/regression/usr.bin/make/suffixes/src_wild1/expected.stdout.1 b/tools/regression/usr.bin/make/suffixes/src_wild1/expected.stdout.1 deleted file mode 100644 index 3cd2129260c12..0000000000000 --- a/tools/regression/usr.bin/make/suffixes/src_wild1/expected.stdout.1 +++ /dev/null @@ -1,2 +0,0 @@ -cat TEST1.a TEST2.a >TEST1.b -cat TEST1.a TEST2.a | diff -u - TEST1.b diff --git a/tools/regression/usr.bin/make/suffixes/src_wild1/test.t b/tools/regression/usr.bin/make/suffixes/src_wild1/test.t deleted file mode 100644 index 6b3111836453e..0000000000000 --- a/tools/regression/usr.bin/make/suffixes/src_wild1/test.t +++ /dev/null @@ -1,21 +0,0 @@ -#!/bin/sh - -# $FreeBSD$ - -cd `dirname $0` -. ../../common.sh - -# Description -DESC="Source wildcard expansion." - -# Setup -TEST_COPY_FILES="TEST1.a 644 TEST2.a 644" - -# Reset -TEST_CLEAN="TEST1.b" - -# Run -TEST_N=1 -TEST_1="-r test1" - -eval_cmd $* diff --git a/tools/regression/usr.bin/make/suffixes/src_wild2/Makefile b/tools/regression/usr.bin/make/suffixes/src_wild2/Makefile deleted file mode 100644 index 1dea7ea967ec7..0000000000000 --- a/tools/regression/usr.bin/make/suffixes/src_wild2/Makefile +++ /dev/null @@ -1,12 +0,0 @@ -# $FreeBSD$ -# -# Source expansion with the source in a macro -# - -SRC=*.a - -test1: TEST1.b - cat TEST1.a TEST2.a | diff -u - TEST1.b - -TEST1.b: ${SRC} - cat ${.ALLSRC} >${.TARGET} diff --git a/tools/regression/usr.bin/make/suffixes/src_wild2/TEST1.a b/tools/regression/usr.bin/make/suffixes/src_wild2/TEST1.a deleted file mode 100644 index da5569b525e32..0000000000000 --- a/tools/regression/usr.bin/make/suffixes/src_wild2/TEST1.a +++ /dev/null @@ -1 +0,0 @@ -I'm test file 1. diff --git a/tools/regression/usr.bin/make/suffixes/src_wild2/TEST2.a b/tools/regression/usr.bin/make/suffixes/src_wild2/TEST2.a deleted file mode 100644 index 34f850858dc09..0000000000000 --- a/tools/regression/usr.bin/make/suffixes/src_wild2/TEST2.a +++ /dev/null @@ -1 +0,0 @@ -I'm test file 2. diff --git a/tools/regression/usr.bin/make/suffixes/src_wild2/expected.status.1 b/tools/regression/usr.bin/make/suffixes/src_wild2/expected.status.1 deleted file mode 100644 index 573541ac9702d..0000000000000 --- a/tools/regression/usr.bin/make/suffixes/src_wild2/expected.status.1 +++ /dev/null @@ -1 +0,0 @@ -0 diff --git a/tools/regression/usr.bin/make/suffixes/src_wild2/expected.stderr.1 b/tools/regression/usr.bin/make/suffixes/src_wild2/expected.stderr.1 deleted file mode 100644 index e69de29bb2d1d..0000000000000 --- a/tools/regression/usr.bin/make/suffixes/src_wild2/expected.stderr.1 +++ /dev/null diff --git a/tools/regression/usr.bin/make/suffixes/src_wild2/expected.stdout.1 b/tools/regression/usr.bin/make/suffixes/src_wild2/expected.stdout.1 deleted file mode 100644 index 3cd2129260c12..0000000000000 --- a/tools/regression/usr.bin/make/suffixes/src_wild2/expected.stdout.1 +++ /dev/null @@ -1,2 +0,0 @@ -cat TEST1.a TEST2.a >TEST1.b -cat TEST1.a TEST2.a | diff -u - TEST1.b diff --git a/tools/regression/usr.bin/make/suffixes/src_wild2/test.t b/tools/regression/usr.bin/make/suffixes/src_wild2/test.t deleted file mode 100644 index 0d40e3d1a07a8..0000000000000 --- a/tools/regression/usr.bin/make/suffixes/src_wild2/test.t +++ /dev/null @@ -1,21 +0,0 @@ -#!/bin/sh - -# $FreeBSD$ - -cd `dirname $0` -. ../../common.sh - -# Description -DESC="Source wildcard expansion (2)." - -# Setup -TEST_COPY_FILES="TEST1.a 644 TEST2.a 644" - -# Reset -TEST_CLEAN="TEST1.b" - -# Run -TEST_N=1 -TEST_1="-r test1" - -eval_cmd $* diff --git a/tools/regression/usr.bin/make/syntax/directive-t0/Makefile b/tools/regression/usr.bin/make/syntax/directive-t0/Makefile deleted file mode 100644 index 0f95a2161164e..0000000000000 --- a/tools/regression/usr.bin/make/syntax/directive-t0/Makefile +++ /dev/null @@ -1,8 +0,0 @@ -# $FreeBSD$ -# -# A typo'ed directive. -# - -.uudef foo - -all: diff --git a/tools/regression/usr.bin/make/syntax/directive-t0/expected.status.1 b/tools/regression/usr.bin/make/syntax/directive-t0/expected.status.1 deleted file mode 100644 index d00491fd7e5bb..0000000000000 --- a/tools/regression/usr.bin/make/syntax/directive-t0/expected.status.1 +++ /dev/null @@ -1 +0,0 @@ -1 diff --git a/tools/regression/usr.bin/make/syntax/directive-t0/expected.stderr.1 b/tools/regression/usr.bin/make/syntax/directive-t0/expected.stderr.1 deleted file mode 100644 index de66fcc377529..0000000000000 --- a/tools/regression/usr.bin/make/syntax/directive-t0/expected.stderr.1 +++ /dev/null @@ -1,2 +0,0 @@ -"Makefile", line 6: Unknown directive -make: fatal errors encountered -- cannot continue diff --git a/tools/regression/usr.bin/make/syntax/directive-t0/expected.stdout.1 b/tools/regression/usr.bin/make/syntax/directive-t0/expected.stdout.1 deleted file mode 100644 index e69de29bb2d1d..0000000000000 --- a/tools/regression/usr.bin/make/syntax/directive-t0/expected.stdout.1 +++ /dev/null diff --git a/tools/regression/usr.bin/make/syntax/directive-t0/test.t b/tools/regression/usr.bin/make/syntax/directive-t0/test.t deleted file mode 100644 index 4b71de3f56be0..0000000000000 --- a/tools/regression/usr.bin/make/syntax/directive-t0/test.t +++ /dev/null @@ -1,14 +0,0 @@ -#! /bin/sh -# $FreeBSD$ - -cd `dirname $0` -. ../../common.sh - -# Description -DESC="A typo'ed directive." - -# Run -TEST_N=1 -TEST_1= - -eval_cmd $* diff --git a/tools/regression/usr.bin/make/syntax/enl/Makefile b/tools/regression/usr.bin/make/syntax/enl/Makefile deleted file mode 100644 index a7c69555f2446..0000000000000 --- a/tools/regression/usr.bin/make/syntax/enl/Makefile +++ /dev/null @@ -1,59 +0,0 @@ -# $FreeBSD$ -# -# Test handling of escaped newlines. -# - -.ifmake test1 - -# This should succeed -\ -\ -\ -test1: - @echo ok - -.elifmake test2 - -# This should print ok because the second assignment to foo is actually -# a continued comment. -FOO=ok -#\ -\ -FOO=not ok -test2: - @echo "${FOO}" - -.elifmake test3 - -# Make sure an escaped newline inserts a space -test3: a\ -b - -a: - @echo a - -b: - @echo b - -.elifmake test4 - -# Make sure an escaped newline inserts exactly one space -FOO=a\ - b - -test4: - @echo "${FOO}" - -.elifmake test5 - -# Make sure each escaped newline inserts exactly one space -FOO=a\ -\ -\ -\ -b - -test5: - @echo "${FOO}" - -.endif diff --git a/tools/regression/usr.bin/make/syntax/enl/expected.status.1 b/tools/regression/usr.bin/make/syntax/enl/expected.status.1 deleted file mode 100644 index 573541ac9702d..0000000000000 --- a/tools/regression/usr.bin/make/syntax/enl/expected.status.1 +++ /dev/null @@ -1 +0,0 @@ -0 diff --git a/tools/regression/usr.bin/make/syntax/enl/expected.status.2 b/tools/regression/usr.bin/make/syntax/enl/expected.status.2 deleted file mode 100644 index 573541ac9702d..0000000000000 --- a/tools/regression/usr.bin/make/syntax/enl/expected.status.2 +++ /dev/null @@ -1 +0,0 @@ -0 diff --git a/tools/regression/usr.bin/make/syntax/enl/expected.status.3 b/tools/regression/usr.bin/make/syntax/enl/expected.status.3 deleted file mode 100644 index 573541ac9702d..0000000000000 --- a/tools/regression/usr.bin/make/syntax/enl/expected.status.3 +++ /dev/null @@ -1 +0,0 @@ -0 diff --git a/tools/regression/usr.bin/make/syntax/enl/expected.status.4 b/tools/regression/usr.bin/make/syntax/enl/expected.status.4 deleted file mode 100644 index 573541ac9702d..0000000000000 --- a/tools/regression/usr.bin/make/syntax/enl/expected.status.4 +++ /dev/null @@ -1 +0,0 @@ -0 diff --git a/tools/regression/usr.bin/make/syntax/enl/expected.status.5 b/tools/regression/usr.bin/make/syntax/enl/expected.status.5 deleted file mode 100644 index 573541ac9702d..0000000000000 --- a/tools/regression/usr.bin/make/syntax/enl/expected.status.5 +++ /dev/null @@ -1 +0,0 @@ -0 diff --git a/tools/regression/usr.bin/make/syntax/enl/expected.stderr.1 b/tools/regression/usr.bin/make/syntax/enl/expected.stderr.1 deleted file mode 100644 index e69de29bb2d1d..0000000000000 --- a/tools/regression/usr.bin/make/syntax/enl/expected.stderr.1 +++ /dev/null diff --git a/tools/regression/usr.bin/make/syntax/enl/expected.stderr.2 b/tools/regression/usr.bin/make/syntax/enl/expected.stderr.2 deleted file mode 100644 index e69de29bb2d1d..0000000000000 --- a/tools/regression/usr.bin/make/syntax/enl/expected.stderr.2 +++ /dev/null diff --git a/tools/regression/usr.bin/make/syntax/enl/expected.stderr.3 b/tools/regression/usr.bin/make/syntax/enl/expected.stderr.3 deleted file mode 100644 index e69de29bb2d1d..0000000000000 --- a/tools/regression/usr.bin/make/syntax/enl/expected.stderr.3 +++ /dev/null diff --git a/tools/regression/usr.bin/make/syntax/enl/expected.stderr.4 b/tools/regression/usr.bin/make/syntax/enl/expected.stderr.4 deleted file mode 100644 index e69de29bb2d1d..0000000000000 --- a/tools/regression/usr.bin/make/syntax/enl/expected.stderr.4 +++ /dev/null diff --git a/tools/regression/usr.bin/make/syntax/enl/expected.stderr.5 b/tools/regression/usr.bin/make/syntax/enl/expected.stderr.5 deleted file mode 100644 index e69de29bb2d1d..0000000000000 --- a/tools/regression/usr.bin/make/syntax/enl/expected.stderr.5 +++ /dev/null diff --git a/tools/regression/usr.bin/make/syntax/enl/expected.stdout.1 b/tools/regression/usr.bin/make/syntax/enl/expected.stdout.1 deleted file mode 100644 index 9766475a4185a..0000000000000 --- a/tools/regression/usr.bin/make/syntax/enl/expected.stdout.1 +++ /dev/null @@ -1 +0,0 @@ -ok diff --git a/tools/regression/usr.bin/make/syntax/enl/expected.stdout.2 b/tools/regression/usr.bin/make/syntax/enl/expected.stdout.2 deleted file mode 100644 index 9766475a4185a..0000000000000 --- a/tools/regression/usr.bin/make/syntax/enl/expected.stdout.2 +++ /dev/null @@ -1 +0,0 @@ -ok diff --git a/tools/regression/usr.bin/make/syntax/enl/expected.stdout.3 b/tools/regression/usr.bin/make/syntax/enl/expected.stdout.3 deleted file mode 100644 index 422c2b7ab3b3c..0000000000000 --- a/tools/regression/usr.bin/make/syntax/enl/expected.stdout.3 +++ /dev/null @@ -1,2 +0,0 @@ -a -b diff --git a/tools/regression/usr.bin/make/syntax/enl/expected.stdout.4 b/tools/regression/usr.bin/make/syntax/enl/expected.stdout.4 deleted file mode 100644 index b2901ea97cfc0..0000000000000 --- a/tools/regression/usr.bin/make/syntax/enl/expected.stdout.4 +++ /dev/null @@ -1 +0,0 @@ -a b diff --git a/tools/regression/usr.bin/make/syntax/enl/expected.stdout.5 b/tools/regression/usr.bin/make/syntax/enl/expected.stdout.5 deleted file mode 100644 index 51200767c6166..0000000000000 --- a/tools/regression/usr.bin/make/syntax/enl/expected.stdout.5 +++ /dev/null @@ -1 +0,0 @@ -a b diff --git a/tools/regression/usr.bin/make/syntax/enl/test.t b/tools/regression/usr.bin/make/syntax/enl/test.t deleted file mode 100644 index 2e5d12c033574..0000000000000 --- a/tools/regression/usr.bin/make/syntax/enl/test.t +++ /dev/null @@ -1,15 +0,0 @@ -#!/bin/sh - -# $FreeBSD$ - -cd `dirname $0` -. ../../common.sh - -# Description -DESC="Test escaped new-lines handling." - -# Run -TEST_N=5 -TEST_2_TODO="bug in parser" - -eval_cmd $* diff --git a/tools/regression/usr.bin/make/syntax/funny-targets/Makefile b/tools/regression/usr.bin/make/syntax/funny-targets/Makefile deleted file mode 100644 index 064ab3a9435f4..0000000000000 --- a/tools/regression/usr.bin/make/syntax/funny-targets/Makefile +++ /dev/null @@ -1,14 +0,0 @@ -# $FreeBSD$ -# -# PR bin/6612 / GRN r102178 -# - -test1: colons::colons::target - -colons::colons::target: - @echo '${.TARGET}' - -test2: exclamation!target - -exclamation!target: - @echo '${.TARGET} diff --git a/tools/regression/usr.bin/make/syntax/funny-targets/expected.status.1 b/tools/regression/usr.bin/make/syntax/funny-targets/expected.status.1 deleted file mode 100644 index 573541ac9702d..0000000000000 --- a/tools/regression/usr.bin/make/syntax/funny-targets/expected.status.1 +++ /dev/null @@ -1 +0,0 @@ -0 diff --git a/tools/regression/usr.bin/make/syntax/funny-targets/expected.status.2 b/tools/regression/usr.bin/make/syntax/funny-targets/expected.status.2 deleted file mode 100644 index 573541ac9702d..0000000000000 --- a/tools/regression/usr.bin/make/syntax/funny-targets/expected.status.2 +++ /dev/null @@ -1 +0,0 @@ -0 diff --git a/tools/regression/usr.bin/make/syntax/funny-targets/expected.stderr.1 b/tools/regression/usr.bin/make/syntax/funny-targets/expected.stderr.1 deleted file mode 100644 index e69de29bb2d1d..0000000000000 --- a/tools/regression/usr.bin/make/syntax/funny-targets/expected.stderr.1 +++ /dev/null diff --git a/tools/regression/usr.bin/make/syntax/funny-targets/expected.stderr.2 b/tools/regression/usr.bin/make/syntax/funny-targets/expected.stderr.2 deleted file mode 100644 index e69de29bb2d1d..0000000000000 --- a/tools/regression/usr.bin/make/syntax/funny-targets/expected.stderr.2 +++ /dev/null diff --git a/tools/regression/usr.bin/make/syntax/funny-targets/expected.stdout.1 b/tools/regression/usr.bin/make/syntax/funny-targets/expected.stdout.1 deleted file mode 100644 index 09cb2328e9f7c..0000000000000 --- a/tools/regression/usr.bin/make/syntax/funny-targets/expected.stdout.1 +++ /dev/null @@ -1 +0,0 @@ -colons::colons::target diff --git a/tools/regression/usr.bin/make/syntax/funny-targets/expected.stdout.2 b/tools/regression/usr.bin/make/syntax/funny-targets/expected.stdout.2 deleted file mode 100644 index b2f03648b48db..0000000000000 --- a/tools/regression/usr.bin/make/syntax/funny-targets/expected.stdout.2 +++ /dev/null @@ -1 +0,0 @@ -exclamation!target diff --git a/tools/regression/usr.bin/make/syntax/funny-targets/test.t b/tools/regression/usr.bin/make/syntax/funny-targets/test.t deleted file mode 100644 index ec7e75c7a3a18..0000000000000 --- a/tools/regression/usr.bin/make/syntax/funny-targets/test.t +++ /dev/null @@ -1,14 +0,0 @@ -#!/bin/sh - -# $FreeBSD$ - -cd `dirname $0` -. ../../common.sh - -# Description -DESC='Target names with "funny" embeded characters.' - -# Run -TEST_N=2 - -eval_cmd $* diff --git a/tools/regression/usr.bin/make/syntax/semi/Makefile b/tools/regression/usr.bin/make/syntax/semi/Makefile deleted file mode 100644 index 12f52255ee12e..0000000000000 --- a/tools/regression/usr.bin/make/syntax/semi/Makefile +++ /dev/null @@ -1,26 +0,0 @@ -# $FreeBSD$ -# -# Test handling of escaped newlines. -# - -.ifmake test1 - -FOO= -BAR=bar -FOO != echo ${FOO} ; echo ${BAR} - -test1: - echo ${FOO} - -.endif - -.ifmake test2 - -FOO=foo -BAR=bar -FOO != echo ${FOO} ; echo ${BAR} - -test2: - echo ${FOO} - -.endif diff --git a/tools/regression/usr.bin/make/syntax/semi/expected.status.1 b/tools/regression/usr.bin/make/syntax/semi/expected.status.1 deleted file mode 100644 index 573541ac9702d..0000000000000 --- a/tools/regression/usr.bin/make/syntax/semi/expected.status.1 +++ /dev/null @@ -1 +0,0 @@ -0 diff --git a/tools/regression/usr.bin/make/syntax/semi/expected.status.2 b/tools/regression/usr.bin/make/syntax/semi/expected.status.2 deleted file mode 100644 index 573541ac9702d..0000000000000 --- a/tools/regression/usr.bin/make/syntax/semi/expected.status.2 +++ /dev/null @@ -1 +0,0 @@ -0 diff --git a/tools/regression/usr.bin/make/syntax/semi/expected.stderr.1 b/tools/regression/usr.bin/make/syntax/semi/expected.stderr.1 deleted file mode 100644 index e69de29bb2d1d..0000000000000 --- a/tools/regression/usr.bin/make/syntax/semi/expected.stderr.1 +++ /dev/null diff --git a/tools/regression/usr.bin/make/syntax/semi/expected.stderr.2 b/tools/regression/usr.bin/make/syntax/semi/expected.stderr.2 deleted file mode 100644 index e69de29bb2d1d..0000000000000 --- a/tools/regression/usr.bin/make/syntax/semi/expected.stderr.2 +++ /dev/null diff --git a/tools/regression/usr.bin/make/syntax/semi/expected.stdout.1 b/tools/regression/usr.bin/make/syntax/semi/expected.stdout.1 deleted file mode 100644 index 12b9617511d6a..0000000000000 --- a/tools/regression/usr.bin/make/syntax/semi/expected.stdout.1 +++ /dev/null @@ -1,2 +0,0 @@ -echo bar -bar diff --git a/tools/regression/usr.bin/make/syntax/semi/expected.stdout.2 b/tools/regression/usr.bin/make/syntax/semi/expected.stdout.2 deleted file mode 100644 index be0fa55566661..0000000000000 --- a/tools/regression/usr.bin/make/syntax/semi/expected.stdout.2 +++ /dev/null @@ -1,2 +0,0 @@ -echo foo bar -foo bar diff --git a/tools/regression/usr.bin/make/syntax/semi/test.t b/tools/regression/usr.bin/make/syntax/semi/test.t deleted file mode 100644 index f52c9ab9ead14..0000000000000 --- a/tools/regression/usr.bin/make/syntax/semi/test.t +++ /dev/null @@ -1,15 +0,0 @@ -#!/bin/sh - -# $FreeBSD$ - -cd `dirname $0` -. ../../common.sh - -# Description -DESC="Test semicolon handling." - -# Run -TEST_N=2 -TEST_1_TODO="parser bug" - -eval_cmd $* diff --git a/tools/regression/usr.bin/make/sysmk/t0/2/1/Makefile b/tools/regression/usr.bin/make/sysmk/t0/2/1/Makefile deleted file mode 100644 index fc95f46e679ea..0000000000000 --- a/tools/regression/usr.bin/make/sysmk/t0/2/1/Makefile +++ /dev/null @@ -1,6 +0,0 @@ -# $FreeBSD$ -# -# Can we traverse up to / and find a 'mk/sys.mk'? -# -all: - @echo ${DASH_M_DOTDOTDOT} diff --git a/tools/regression/usr.bin/make/sysmk/t0/2/1/expected.status.1 b/tools/regression/usr.bin/make/sysmk/t0/2/1/expected.status.1 deleted file mode 100644 index 573541ac9702d..0000000000000 --- a/tools/regression/usr.bin/make/sysmk/t0/2/1/expected.status.1 +++ /dev/null @@ -1 +0,0 @@ -0 diff --git a/tools/regression/usr.bin/make/sysmk/t0/2/1/expected.stderr.1 b/tools/regression/usr.bin/make/sysmk/t0/2/1/expected.stderr.1 deleted file mode 100644 index e69de29bb2d1d..0000000000000 --- a/tools/regression/usr.bin/make/sysmk/t0/2/1/expected.stderr.1 +++ /dev/null diff --git a/tools/regression/usr.bin/make/sysmk/t0/2/1/expected.stdout.1 b/tools/regression/usr.bin/make/sysmk/t0/2/1/expected.stdout.1 deleted file mode 100644 index 6f29307aecc3c..0000000000000 --- a/tools/regression/usr.bin/make/sysmk/t0/2/1/expected.stdout.1 +++ /dev/null @@ -1 +0,0 @@ -Found_DotDotDot_sys_mk diff --git a/tools/regression/usr.bin/make/sysmk/t0/2/1/test.t b/tools/regression/usr.bin/make/sysmk/t0/2/1/test.t deleted file mode 100644 index 9a781570fd157..0000000000000 --- a/tools/regression/usr.bin/make/sysmk/t0/2/1/test.t +++ /dev/null @@ -1,17 +0,0 @@ -#!/bin/sh - -# $FreeBSD$ - -cd `dirname $0` -. ../../../../common.sh - -# Description -DESC="Can we traverse up to / and find a 'mk/sys.mk'?" - -# Run -TEST_N=1 -TEST_1="-m .../mk" -TEST_MAKE_DIRS="../../mk 755" -TEST_COPY_FILES="../../mk/sys.mk 644" - -eval_cmd $* diff --git a/tools/regression/usr.bin/make/sysmk/t0/mk/sys.mk b/tools/regression/usr.bin/make/sysmk/t0/mk/sys.mk deleted file mode 100644 index 60f195533ed24..0000000000000 --- a/tools/regression/usr.bin/make/sysmk/t0/mk/sys.mk +++ /dev/null @@ -1,3 +0,0 @@ -# $FreeBSD$ - -DASH_M_DOTDOTDOT=Found_DotDotDot_sys_mk diff --git a/tools/regression/usr.bin/make/sysmk/t1/2/1/cleanup b/tools/regression/usr.bin/make/sysmk/t1/2/1/cleanup deleted file mode 100644 index c3d58b79e422c..0000000000000 --- a/tools/regression/usr.bin/make/sysmk/t1/2/1/cleanup +++ /dev/null @@ -1,3 +0,0 @@ -# $FreeBSD$ - -rm -rf ${WORK_DIR}/../../../t0/2/1 diff --git a/tools/regression/usr.bin/make/sysmk/t1/2/1/expected.status.1 b/tools/regression/usr.bin/make/sysmk/t1/2/1/expected.status.1 deleted file mode 100644 index 573541ac9702d..0000000000000 --- a/tools/regression/usr.bin/make/sysmk/t1/2/1/expected.status.1 +++ /dev/null @@ -1 +0,0 @@ -0 diff --git a/tools/regression/usr.bin/make/sysmk/t1/2/1/expected.stderr.1 b/tools/regression/usr.bin/make/sysmk/t1/2/1/expected.stderr.1 deleted file mode 100644 index e69de29bb2d1d..0000000000000 --- a/tools/regression/usr.bin/make/sysmk/t1/2/1/expected.stderr.1 +++ /dev/null diff --git a/tools/regression/usr.bin/make/sysmk/t1/2/1/expected.stdout.1 b/tools/regression/usr.bin/make/sysmk/t1/2/1/expected.stdout.1 deleted file mode 100644 index 6f29307aecc3c..0000000000000 --- a/tools/regression/usr.bin/make/sysmk/t1/2/1/expected.stdout.1 +++ /dev/null @@ -1 +0,0 @@ -Found_DotDotDot_sys_mk diff --git a/tools/regression/usr.bin/make/sysmk/t1/2/1/test.t b/tools/regression/usr.bin/make/sysmk/t1/2/1/test.t deleted file mode 100644 index ad1584f82d1dc..0000000000000 --- a/tools/regression/usr.bin/make/sysmk/t1/2/1/test.t +++ /dev/null @@ -1,19 +0,0 @@ -#!/bin/sh - -# $FreeBSD$ - -cd `dirname $0` -. ../../../../common.sh - -# Description -DESC="Can we traverse up to / and find a 'mk/sys.mk' with -C -m?" - -# Run -TEST_N=1 -TEST_1="-C ../../../t0/2/1 -m .../mk" -TEST_MAKE_DIRS="../../mk 755 ../../../t0/mk 755 ../../../t0/2/1 755" -TEST_COPY_FILES="../../mk/sys.mk 644 ../../../t0/mk/sys.mk 644 ../../../t0/2/1/Makefile 644" -TEST_CLEAN_FILES="../../../t0/2/1" -TEST_CLEANUP=clean-special - -eval_cmd $* diff --git a/tools/regression/usr.bin/make/sysmk/t1/mk/sys.mk b/tools/regression/usr.bin/make/sysmk/t1/mk/sys.mk deleted file mode 100644 index 99b8ecc1d3893..0000000000000 --- a/tools/regression/usr.bin/make/sysmk/t1/mk/sys.mk +++ /dev/null @@ -1,3 +0,0 @@ -# $FreeBSD$ - -DASH_M_DOTDOTDOT=Found_WRONG_DotDotDot_sys_mk__with_C_before_m diff --git a/tools/regression/usr.bin/make/sysmk/t2/2/1/cleanup b/tools/regression/usr.bin/make/sysmk/t2/2/1/cleanup deleted file mode 100644 index c3d58b79e422c..0000000000000 --- a/tools/regression/usr.bin/make/sysmk/t2/2/1/cleanup +++ /dev/null @@ -1,3 +0,0 @@ -# $FreeBSD$ - -rm -rf ${WORK_DIR}/../../../t0/2/1 diff --git a/tools/regression/usr.bin/make/sysmk/t2/2/1/expected.status.1 b/tools/regression/usr.bin/make/sysmk/t2/2/1/expected.status.1 deleted file mode 100644 index 573541ac9702d..0000000000000 --- a/tools/regression/usr.bin/make/sysmk/t2/2/1/expected.status.1 +++ /dev/null @@ -1 +0,0 @@ -0 diff --git a/tools/regression/usr.bin/make/sysmk/t2/2/1/expected.stderr.1 b/tools/regression/usr.bin/make/sysmk/t2/2/1/expected.stderr.1 deleted file mode 100644 index e69de29bb2d1d..0000000000000 --- a/tools/regression/usr.bin/make/sysmk/t2/2/1/expected.stderr.1 +++ /dev/null diff --git a/tools/regression/usr.bin/make/sysmk/t2/2/1/expected.stdout.1 b/tools/regression/usr.bin/make/sysmk/t2/2/1/expected.stdout.1 deleted file mode 100644 index 70f1be3c507c7..0000000000000 --- a/tools/regression/usr.bin/make/sysmk/t2/2/1/expected.stdout.1 +++ /dev/null @@ -1 +0,0 @@ -Found_DotDotDot_sys_mk__with_m_before_C diff --git a/tools/regression/usr.bin/make/sysmk/t2/2/1/test.t b/tools/regression/usr.bin/make/sysmk/t2/2/1/test.t deleted file mode 100644 index 2c4dff35bde12..0000000000000 --- a/tools/regression/usr.bin/make/sysmk/t2/2/1/test.t +++ /dev/null @@ -1,19 +0,0 @@ -#!/bin/sh - -# $FreeBSD$ - -cd `dirname $0` -. ../../../../common.sh - -# Description -DESC="Can we traverse up to / and find a 'mk/sys.mk' with -m -C?" - -# Run -TEST_N=1 -TEST_1="-m .../mk -C ../../../t0/2/1" -TEST_MAKE_DIRS="../../mk 755 ../../../t0/mk 755 ../../../t0/2/1 755" -TEST_COPY_FILES="../../mk/sys.mk 644 ../../../t0/mk/sys.mk 644 ../../../t0/2/1/Makefile 644" -TEST_CLEAN_FILES="../../../t0/2/1" -TEST_CLEANUP=clean-special - -eval_cmd $* diff --git a/tools/regression/usr.bin/make/sysmk/t2/mk/sys.mk b/tools/regression/usr.bin/make/sysmk/t2/mk/sys.mk deleted file mode 100644 index 55632fdc90a42..0000000000000 --- a/tools/regression/usr.bin/make/sysmk/t2/mk/sys.mk +++ /dev/null @@ -1,3 +0,0 @@ -# $FreeBSD$ - -DASH_M_DOTDOTDOT=Found_DotDotDot_sys_mk__with_m_before_C diff --git a/tools/regression/usr.bin/make/test-new.mk b/tools/regression/usr.bin/make/test-new.mk deleted file mode 100644 index f200833f81f18..0000000000000 --- a/tools/regression/usr.bin/make/test-new.mk +++ /dev/null @@ -1,9 +0,0 @@ -# $FreeBSD$ - -NEW_DIR!= make -C ${.CURDIR}/../../../../usr.bin/make -V .OBJDIR - -all: - rm -rf /tmp/${USER}.make.test - env MAKE_PROG=${NEW_DIR}/make ${.SHELL} ./all.sh - -.include <bsd.obj.mk> diff --git a/tools/regression/usr.bin/make/variables/modifier_M/Makefile b/tools/regression/usr.bin/make/variables/modifier_M/Makefile deleted file mode 100644 index 34d4cd44a95bf..0000000000000 --- a/tools/regression/usr.bin/make/variables/modifier_M/Makefile +++ /dev/null @@ -1,18 +0,0 @@ -# $FreeBSD$ -# -# Test the M modifier. -# -FILES = \ - main.c globals.h \ - util.c util.h \ - map.c map.h \ - parser.y lexer.l \ - cmdman.1 format.5 -test1: - @echo "all files: ${FILES}" - @echo "cfiles: ${FILES:M*.c}" - @echo "hfiles: ${FILES:M*.h}" - @echo "grammar and lexer: ${FILES:M*.[ly]}" - @echo "man page: ${FILES:M*.[1-9]}" - @echo "utility files: ${FILES:Mutil.?}" - @echo "m files: ${FILES:Mm*}" diff --git a/tools/regression/usr.bin/make/variables/modifier_M/expected.status.1 b/tools/regression/usr.bin/make/variables/modifier_M/expected.status.1 deleted file mode 100644 index 573541ac9702d..0000000000000 --- a/tools/regression/usr.bin/make/variables/modifier_M/expected.status.1 +++ /dev/null @@ -1 +0,0 @@ -0 diff --git a/tools/regression/usr.bin/make/variables/modifier_M/expected.stderr.1 b/tools/regression/usr.bin/make/variables/modifier_M/expected.stderr.1 deleted file mode 100644 index e69de29bb2d1d..0000000000000 --- a/tools/regression/usr.bin/make/variables/modifier_M/expected.stderr.1 +++ /dev/null diff --git a/tools/regression/usr.bin/make/variables/modifier_M/expected.stdout.1 b/tools/regression/usr.bin/make/variables/modifier_M/expected.stdout.1 deleted file mode 100644 index b29e6df102338..0000000000000 --- a/tools/regression/usr.bin/make/variables/modifier_M/expected.stdout.1 +++ /dev/null @@ -1,7 +0,0 @@ -all files: main.c globals.h util.c util.h map.c map.h parser.y lexer.l cmdman.1 format.5 -cfiles: main.c util.c map.c -hfiles: globals.h util.h map.h -grammar and lexer: parser.y lexer.l -man page: cmdman.1 format.5 -utility files: util.c util.h -m files: main.c map.c map.h diff --git a/tools/regression/usr.bin/make/variables/modifier_M/test.t b/tools/regression/usr.bin/make/variables/modifier_M/test.t deleted file mode 100644 index 979778f12e904..0000000000000 --- a/tools/regression/usr.bin/make/variables/modifier_M/test.t +++ /dev/null @@ -1,11 +0,0 @@ -#!/bin/sh - -# $FreeBSD$ - -cd `dirname $0` -. ../../common.sh - -# Description -DESC="Variable expansion with M modifier" - -eval_cmd $* diff --git a/tools/regression/usr.bin/make/variables/modifier_t/Makefile b/tools/regression/usr.bin/make/variables/modifier_t/Makefile deleted file mode 100644 index 53844eecf5735..0000000000000 --- a/tools/regression/usr.bin/make/variables/modifier_t/Makefile +++ /dev/null @@ -1,15 +0,0 @@ -# $FreeBSD$ -# -# Test the t modifier. -# -# below is missing ' -ASCII= !"\#$$%&()*+,-./0123456789:;<=>?@ABCDEFGHIJKLMNOPQRSTUVWXYZ[\]^_`abcdefghijklmnopqrstuvwxyz{|}~ - -test1: - @echo '${ASCII}' - -test2: - @echo '${ASCII:tl}' - -test3: - @echo '${ASCII:tu}' diff --git a/tools/regression/usr.bin/make/variables/modifier_t/expected.status.1 b/tools/regression/usr.bin/make/variables/modifier_t/expected.status.1 deleted file mode 100644 index 573541ac9702d..0000000000000 --- a/tools/regression/usr.bin/make/variables/modifier_t/expected.status.1 +++ /dev/null @@ -1 +0,0 @@ -0 diff --git a/tools/regression/usr.bin/make/variables/modifier_t/expected.status.2 b/tools/regression/usr.bin/make/variables/modifier_t/expected.status.2 deleted file mode 100644 index 573541ac9702d..0000000000000 --- a/tools/regression/usr.bin/make/variables/modifier_t/expected.status.2 +++ /dev/null @@ -1 +0,0 @@ -0 diff --git a/tools/regression/usr.bin/make/variables/modifier_t/expected.status.3 b/tools/regression/usr.bin/make/variables/modifier_t/expected.status.3 deleted file mode 100644 index 573541ac9702d..0000000000000 --- a/tools/regression/usr.bin/make/variables/modifier_t/expected.status.3 +++ /dev/null @@ -1 +0,0 @@ -0 diff --git a/tools/regression/usr.bin/make/variables/modifier_t/expected.stderr.1 b/tools/regression/usr.bin/make/variables/modifier_t/expected.stderr.1 deleted file mode 100644 index e69de29bb2d1d..0000000000000 --- a/tools/regression/usr.bin/make/variables/modifier_t/expected.stderr.1 +++ /dev/null diff --git a/tools/regression/usr.bin/make/variables/modifier_t/expected.stderr.2 b/tools/regression/usr.bin/make/variables/modifier_t/expected.stderr.2 deleted file mode 100644 index e69de29bb2d1d..0000000000000 --- a/tools/regression/usr.bin/make/variables/modifier_t/expected.stderr.2 +++ /dev/null diff --git a/tools/regression/usr.bin/make/variables/modifier_t/expected.stderr.3 b/tools/regression/usr.bin/make/variables/modifier_t/expected.stderr.3 deleted file mode 100644 index e69de29bb2d1d..0000000000000 --- a/tools/regression/usr.bin/make/variables/modifier_t/expected.stderr.3 +++ /dev/null diff --git a/tools/regression/usr.bin/make/variables/modifier_t/expected.stdout.1 b/tools/regression/usr.bin/make/variables/modifier_t/expected.stdout.1 deleted file mode 100644 index dff38fdd07ffb..0000000000000 --- a/tools/regression/usr.bin/make/variables/modifier_t/expected.stdout.1 +++ /dev/null @@ -1 +0,0 @@ -!"#$%&()*+,-./0123456789:;<=>?@ABCDEFGHIJKLMNOPQRSTUVWXYZ[\]^_`abcdefghijklmnopqrstuvwxyz{|}~ diff --git a/tools/regression/usr.bin/make/variables/modifier_t/expected.stdout.2 b/tools/regression/usr.bin/make/variables/modifier_t/expected.stdout.2 deleted file mode 100644 index 71a0f6077ef21..0000000000000 --- a/tools/regression/usr.bin/make/variables/modifier_t/expected.stdout.2 +++ /dev/null @@ -1 +0,0 @@ -!"#$%&()*+,-./0123456789:;<=>?@abcdefghijklmnopqrstuvwxyz[\]^_`abcdefghijklmnopqrstuvwxyz{|}~ diff --git a/tools/regression/usr.bin/make/variables/modifier_t/expected.stdout.3 b/tools/regression/usr.bin/make/variables/modifier_t/expected.stdout.3 deleted file mode 100644 index 6434c7ba74342..0000000000000 --- a/tools/regression/usr.bin/make/variables/modifier_t/expected.stdout.3 +++ /dev/null @@ -1 +0,0 @@ -!"#$%&()*+,-./0123456789:;<=>?@ABCDEFGHIJKLMNOPQRSTUVWXYZ[\]^_`ABCDEFGHIJKLMNOPQRSTUVWXYZ{|}~ diff --git a/tools/regression/usr.bin/make/variables/modifier_t/test.t b/tools/regression/usr.bin/make/variables/modifier_t/test.t deleted file mode 100644 index f564f6ea991a2..0000000000000 --- a/tools/regression/usr.bin/make/variables/modifier_t/test.t +++ /dev/null @@ -1,14 +0,0 @@ -#!/bin/sh - -# $FreeBSD$ - -cd `dirname $0` -. ../../common.sh - -# Description -DESC="Variable expansion with t modifiers" - -# Run -TEST_N=3 - -eval_cmd $* diff --git a/tools/regression/usr.bin/make/variables/opt_V/Makefile b/tools/regression/usr.bin/make/variables/opt_V/Makefile deleted file mode 100644 index 128e5118bc410..0000000000000 --- a/tools/regression/usr.bin/make/variables/opt_V/Makefile +++ /dev/null @@ -1,15 +0,0 @@ -# $FreeBSD$ -# -# Test the -V option -# - -FOO= foo -FOOBAR= ${FOO}bar - -test1: - @echo "-V FOOBAR" - @${MAKE} -V FOOBAR - -test2: - @echo '-V "$${FOOBAR}"' - @${MAKE} -V '$${FOOBAR}' diff --git a/tools/regression/usr.bin/make/variables/opt_V/expected.status.1 b/tools/regression/usr.bin/make/variables/opt_V/expected.status.1 deleted file mode 100644 index 573541ac9702d..0000000000000 --- a/tools/regression/usr.bin/make/variables/opt_V/expected.status.1 +++ /dev/null @@ -1 +0,0 @@ -0 diff --git a/tools/regression/usr.bin/make/variables/opt_V/expected.status.2 b/tools/regression/usr.bin/make/variables/opt_V/expected.status.2 deleted file mode 100644 index 573541ac9702d..0000000000000 --- a/tools/regression/usr.bin/make/variables/opt_V/expected.status.2 +++ /dev/null @@ -1 +0,0 @@ -0 diff --git a/tools/regression/usr.bin/make/variables/opt_V/expected.stderr.1 b/tools/regression/usr.bin/make/variables/opt_V/expected.stderr.1 deleted file mode 100644 index e69de29bb2d1d..0000000000000 --- a/tools/regression/usr.bin/make/variables/opt_V/expected.stderr.1 +++ /dev/null diff --git a/tools/regression/usr.bin/make/variables/opt_V/expected.stderr.2 b/tools/regression/usr.bin/make/variables/opt_V/expected.stderr.2 deleted file mode 100644 index e69de29bb2d1d..0000000000000 --- a/tools/regression/usr.bin/make/variables/opt_V/expected.stderr.2 +++ /dev/null diff --git a/tools/regression/usr.bin/make/variables/opt_V/expected.stdout.1 b/tools/regression/usr.bin/make/variables/opt_V/expected.stdout.1 deleted file mode 100644 index 050db40eed2bc..0000000000000 --- a/tools/regression/usr.bin/make/variables/opt_V/expected.stdout.1 +++ /dev/null @@ -1,2 +0,0 @@ --V FOOBAR -foobar diff --git a/tools/regression/usr.bin/make/variables/opt_V/expected.stdout.2 b/tools/regression/usr.bin/make/variables/opt_V/expected.stdout.2 deleted file mode 100644 index 4da2aeffad3e9..0000000000000 --- a/tools/regression/usr.bin/make/variables/opt_V/expected.stdout.2 +++ /dev/null @@ -1,2 +0,0 @@ --V "${FOOBAR}" -foobar diff --git a/tools/regression/usr.bin/make/variables/opt_V/test.t b/tools/regression/usr.bin/make/variables/opt_V/test.t deleted file mode 100644 index 32a74b6c4a9e2..0000000000000 --- a/tools/regression/usr.bin/make/variables/opt_V/test.t +++ /dev/null @@ -1,14 +0,0 @@ -#!/bin/sh - -# $FreeBSD$ - -cd `dirname $0` -. ../../common.sh - -# Description -DESC="Variable expansion using command line '-V'" - -# Run -TEST_N=2 - -eval_cmd $* diff --git a/tools/regression/usr.bin/make/variables/t0/Makefile b/tools/regression/usr.bin/make/variables/t0/Makefile deleted file mode 100644 index 1cc58eefa493a..0000000000000 --- a/tools/regression/usr.bin/make/variables/t0/Makefile +++ /dev/null @@ -1,23 +0,0 @@ -# $FreeBSD$ -# -# A unsorted set of macro expansions. This should be sorted out. -# -A = 0 -AV = 1 -test1: - @echo $A - @echo ${AV} - @echo ${A} - @# The following are soo broken why no syntax error? - @echo $( - @echo $) - @echo ${ - @echo ${A - @echo ${A) - @echo ${A){ - @echo ${AV - @echo ${AV) - @echo ${AV){ - @echo ${AV{ - @echo ${A{ - @echo $} diff --git a/tools/regression/usr.bin/make/variables/t0/expected.status.1 b/tools/regression/usr.bin/make/variables/t0/expected.status.1 deleted file mode 100644 index 573541ac9702d..0000000000000 --- a/tools/regression/usr.bin/make/variables/t0/expected.status.1 +++ /dev/null @@ -1 +0,0 @@ -0 diff --git a/tools/regression/usr.bin/make/variables/t0/expected.stderr.1 b/tools/regression/usr.bin/make/variables/t0/expected.stderr.1 deleted file mode 100644 index e69de29bb2d1d..0000000000000 --- a/tools/regression/usr.bin/make/variables/t0/expected.stderr.1 +++ /dev/null diff --git a/tools/regression/usr.bin/make/variables/t0/expected.stdout.1 b/tools/regression/usr.bin/make/variables/t0/expected.stdout.1 deleted file mode 100644 index e2c70dedf68f3..0000000000000 --- a/tools/regression/usr.bin/make/variables/t0/expected.stdout.1 +++ /dev/null @@ -1,15 +0,0 @@ -0 -1 -0 - - - - - - - - - - - - diff --git a/tools/regression/usr.bin/make/variables/t0/test.t b/tools/regression/usr.bin/make/variables/t0/test.t deleted file mode 100644 index 7e4f42729d263..0000000000000 --- a/tools/regression/usr.bin/make/variables/t0/test.t +++ /dev/null @@ -1,11 +0,0 @@ -#!/bin/sh - -# $FreeBSD$ - -cd `dirname $0` -. ../../common.sh - -# Description -DESC="Variable expansion." - -eval_cmd $* |