From 91f06c38c1dd8fd7c8f71637128faf6dbc9b460e Mon Sep 17 00:00:00 2001 From: June McEnroe Date: Mon, 9 Mar 2020 04:03:18 -0400 Subject: Remove extraneous files from sh sources --- bin/1sh/tests/set-e/Makefile | 46 ------------------------------------- bin/1sh/tests/set-e/Makefile.depend | 11 --------- bin/1sh/tests/set-e/and1.0 | 3 --- bin/1sh/tests/set-e/and2.1 | 4 ---- bin/1sh/tests/set-e/and3.0 | 4 ---- bin/1sh/tests/set-e/and4.0 | 4 ---- bin/1sh/tests/set-e/background1.0 | 3 --- bin/1sh/tests/set-e/cmd1.0 | 3 --- bin/1sh/tests/set-e/cmd2.1 | 4 ---- bin/1sh/tests/set-e/elif1.0 | 7 ------ bin/1sh/tests/set-e/elif2.0 | 7 ------ bin/1sh/tests/set-e/eval1.0 | 3 --- bin/1sh/tests/set-e/eval2.1 | 4 ---- bin/1sh/tests/set-e/for1.0 | 9 -------- bin/1sh/tests/set-e/func1.0 | 7 ------ bin/1sh/tests/set-e/func2.1 | 7 ------ bin/1sh/tests/set-e/if1.0 | 5 ---- bin/1sh/tests/set-e/if2.0 | 7 ------ bin/1sh/tests/set-e/if3.0 | 5 ---- bin/1sh/tests/set-e/not1.0 | 4 ---- bin/1sh/tests/set-e/not2.0 | 4 ---- bin/1sh/tests/set-e/or1.0 | 3 --- bin/1sh/tests/set-e/or2.0 | 3 --- bin/1sh/tests/set-e/or3.1 | 4 ---- bin/1sh/tests/set-e/pipe1.1 | 4 ---- bin/1sh/tests/set-e/pipe2.0 | 3 --- bin/1sh/tests/set-e/return1.0 | 11 --------- bin/1sh/tests/set-e/semi1.1 | 4 ---- bin/1sh/tests/set-e/semi2.1 | 4 ---- bin/1sh/tests/set-e/subshell1.0 | 3 --- bin/1sh/tests/set-e/subshell2.1 | 4 ---- bin/1sh/tests/set-e/until1.0 | 5 ---- bin/1sh/tests/set-e/until2.0 | 5 ---- bin/1sh/tests/set-e/until3.0 | 9 -------- bin/1sh/tests/set-e/while1.0 | 5 ---- bin/1sh/tests/set-e/while2.0 | 5 ---- bin/1sh/tests/set-e/while3.0 | 9 -------- 37 files changed, 232 deletions(-) delete mode 100644 bin/1sh/tests/set-e/Makefile delete mode 100644 bin/1sh/tests/set-e/Makefile.depend delete mode 100644 bin/1sh/tests/set-e/and1.0 delete mode 100644 bin/1sh/tests/set-e/and2.1 delete mode 100644 bin/1sh/tests/set-e/and3.0 delete mode 100644 bin/1sh/tests/set-e/and4.0 delete mode 100644 bin/1sh/tests/set-e/background1.0 delete mode 100644 bin/1sh/tests/set-e/cmd1.0 delete mode 100644 bin/1sh/tests/set-e/cmd2.1 delete mode 100644 bin/1sh/tests/set-e/elif1.0 delete mode 100644 bin/1sh/tests/set-e/elif2.0 delete mode 100644 bin/1sh/tests/set-e/eval1.0 delete mode 100644 bin/1sh/tests/set-e/eval2.1 delete mode 100644 bin/1sh/tests/set-e/for1.0 delete mode 100644 bin/1sh/tests/set-e/func1.0 delete mode 100644 bin/1sh/tests/set-e/func2.1 delete mode 100644 bin/1sh/tests/set-e/if1.0 delete mode 100644 bin/1sh/tests/set-e/if2.0 delete mode 100644 bin/1sh/tests/set-e/if3.0 delete mode 100644 bin/1sh/tests/set-e/not1.0 delete mode 100644 bin/1sh/tests/set-e/not2.0 delete mode 100644 bin/1sh/tests/set-e/or1.0 delete mode 100644 bin/1sh/tests/set-e/or2.0 delete mode 100644 bin/1sh/tests/set-e/or3.1 delete mode 100644 bin/1sh/tests/set-e/pipe1.1 delete mode 100644 bin/1sh/tests/set-e/pipe2.0 delete mode 100644 bin/1sh/tests/set-e/return1.0 delete mode 100644 bin/1sh/tests/set-e/semi1.1 delete mode 100644 bin/1sh/tests/set-e/semi2.1 delete mode 100644 bin/1sh/tests/set-e/subshell1.0 delete mode 100644 bin/1sh/tests/set-e/subshell2.1 delete mode 100644 bin/1sh/tests/set-e/until1.0 delete mode 100644 bin/1sh/tests/set-e/until2.0 delete mode 100644 bin/1sh/tests/set-e/until3.0 delete mode 100644 bin/1sh/tests/set-e/while1.0 delete mode 100644 bin/1sh/tests/set-e/while2.0 delete mode 100644 bin/1sh/tests/set-e/while3.0 (limited to 'bin/1sh/tests/set-e') diff --git a/bin/1sh/tests/set-e/Makefile b/bin/1sh/tests/set-e/Makefile deleted file mode 100644 index d938300e..00000000 --- a/bin/1sh/tests/set-e/Makefile +++ /dev/null @@ -1,46 +0,0 @@ -# $FreeBSD: releng/12.1/bin/sh/tests/set-e/Makefile 299094 2016-05-04 23:20:53Z ngie $ - -PACKAGE= tests - -TESTSDIR= ${TESTSBASE}/bin/sh/${.CURDIR:T} - -.PATH: ${.CURDIR:H} -ATF_TESTS_SH= functional_test - -${PACKAGE}FILES+= and1.0 -${PACKAGE}FILES+= and2.1 -${PACKAGE}FILES+= and3.0 -${PACKAGE}FILES+= and4.0 -${PACKAGE}FILES+= background1.0 -${PACKAGE}FILES+= cmd1.0 -${PACKAGE}FILES+= cmd2.1 -${PACKAGE}FILES+= elif1.0 -${PACKAGE}FILES+= elif2.0 -${PACKAGE}FILES+= eval1.0 -${PACKAGE}FILES+= eval2.1 -${PACKAGE}FILES+= for1.0 -${PACKAGE}FILES+= func1.0 -${PACKAGE}FILES+= func2.1 -${PACKAGE}FILES+= if1.0 -${PACKAGE}FILES+= if2.0 -${PACKAGE}FILES+= if3.0 -${PACKAGE}FILES+= not1.0 -${PACKAGE}FILES+= not2.0 -${PACKAGE}FILES+= or1.0 -${PACKAGE}FILES+= or2.0 -${PACKAGE}FILES+= or3.1 -${PACKAGE}FILES+= pipe1.1 -${PACKAGE}FILES+= pipe2.0 -${PACKAGE}FILES+= return1.0 -${PACKAGE}FILES+= semi1.1 -${PACKAGE}FILES+= semi2.1 -${PACKAGE}FILES+= subshell1.0 -${PACKAGE}FILES+= subshell2.1 -${PACKAGE}FILES+= until1.0 -${PACKAGE}FILES+= until2.0 -${PACKAGE}FILES+= until3.0 -${PACKAGE}FILES+= while1.0 -${PACKAGE}FILES+= while2.0 -${PACKAGE}FILES+= while3.0 - -.include diff --git a/bin/1sh/tests/set-e/Makefile.depend b/bin/1sh/tests/set-e/Makefile.depend deleted file mode 100644 index 110a72e1..00000000 --- a/bin/1sh/tests/set-e/Makefile.depend +++ /dev/null @@ -1,11 +0,0 @@ -# $FreeBSD: releng/12.1/bin/sh/tests/set-e/Makefile.depend 296587 2016-03-09 22:46:01Z bdrewery $ -# Autogenerated - do NOT edit! - -DIRDEPS = \ - - -.include - -.if ${DEP_RELDIR} == ${_DEP_RELDIR} -# local dependencies - needed for -jN in clean tree -.endif diff --git a/bin/1sh/tests/set-e/and1.0 b/bin/1sh/tests/set-e/and1.0 deleted file mode 100644 index dc5a0108..00000000 --- a/bin/1sh/tests/set-e/and1.0 +++ /dev/null @@ -1,3 +0,0 @@ -# $FreeBSD: releng/12.1/bin/sh/tests/set-e/and1.0 149781 2005-09-04 11:59:59Z stefanf $ -set -e -true && true diff --git a/bin/1sh/tests/set-e/and2.1 b/bin/1sh/tests/set-e/and2.1 deleted file mode 100644 index c964f3df..00000000 --- a/bin/1sh/tests/set-e/and2.1 +++ /dev/null @@ -1,4 +0,0 @@ -# $FreeBSD: releng/12.1/bin/sh/tests/set-e/and2.1 149781 2005-09-04 11:59:59Z stefanf $ -set -e -true && false -exit 0 diff --git a/bin/1sh/tests/set-e/and3.0 b/bin/1sh/tests/set-e/and3.0 deleted file mode 100644 index b3ef8b3d..00000000 --- a/bin/1sh/tests/set-e/and3.0 +++ /dev/null @@ -1,4 +0,0 @@ -# $FreeBSD: releng/12.1/bin/sh/tests/set-e/and3.0 149781 2005-09-04 11:59:59Z stefanf $ -set -e -false && true -exit 0 diff --git a/bin/1sh/tests/set-e/and4.0 b/bin/1sh/tests/set-e/and4.0 deleted file mode 100644 index 356804dd..00000000 --- a/bin/1sh/tests/set-e/and4.0 +++ /dev/null @@ -1,4 +0,0 @@ -# $FreeBSD: releng/12.1/bin/sh/tests/set-e/and4.0 149781 2005-09-04 11:59:59Z stefanf $ -set -e -false && false -exit 0 diff --git a/bin/1sh/tests/set-e/background1.0 b/bin/1sh/tests/set-e/background1.0 deleted file mode 100644 index b7d70c7e..00000000 --- a/bin/1sh/tests/set-e/background1.0 +++ /dev/null @@ -1,3 +0,0 @@ -# $FreeBSD: releng/12.1/bin/sh/tests/set-e/background1.0 149781 2005-09-04 11:59:59Z stefanf $ -set -e -false & diff --git a/bin/1sh/tests/set-e/cmd1.0 b/bin/1sh/tests/set-e/cmd1.0 deleted file mode 100644 index f88034f7..00000000 --- a/bin/1sh/tests/set-e/cmd1.0 +++ /dev/null @@ -1,3 +0,0 @@ -# $FreeBSD: releng/12.1/bin/sh/tests/set-e/cmd1.0 149781 2005-09-04 11:59:59Z stefanf $ -set -e -true diff --git a/bin/1sh/tests/set-e/cmd2.1 b/bin/1sh/tests/set-e/cmd2.1 deleted file mode 100644 index a8dbf64f..00000000 --- a/bin/1sh/tests/set-e/cmd2.1 +++ /dev/null @@ -1,4 +0,0 @@ -# $FreeBSD: releng/12.1/bin/sh/tests/set-e/cmd2.1 149781 2005-09-04 11:59:59Z stefanf $ -set -e -false -exit 0 diff --git a/bin/1sh/tests/set-e/elif1.0 b/bin/1sh/tests/set-e/elif1.0 deleted file mode 100644 index aa8ee945..00000000 --- a/bin/1sh/tests/set-e/elif1.0 +++ /dev/null @@ -1,7 +0,0 @@ -# $FreeBSD: releng/12.1/bin/sh/tests/set-e/elif1.0 211399 2010-08-16 17:18:08Z jilles $ -set -e -if false; then - : -elif false; then - : -fi diff --git a/bin/1sh/tests/set-e/elif2.0 b/bin/1sh/tests/set-e/elif2.0 deleted file mode 100644 index f742f81b..00000000 --- a/bin/1sh/tests/set-e/elif2.0 +++ /dev/null @@ -1,7 +0,0 @@ -# $FreeBSD: releng/12.1/bin/sh/tests/set-e/elif2.0 211399 2010-08-16 17:18:08Z jilles $ -set -e -if false; then - : -elif false; false; then - : -fi diff --git a/bin/1sh/tests/set-e/eval1.0 b/bin/1sh/tests/set-e/eval1.0 deleted file mode 100644 index 257ccd06..00000000 --- a/bin/1sh/tests/set-e/eval1.0 +++ /dev/null @@ -1,3 +0,0 @@ -# $FreeBSD: releng/12.1/bin/sh/tests/set-e/eval1.0 193178 2009-05-31 17:23:27Z stefanf $ -set -e -eval false || true diff --git a/bin/1sh/tests/set-e/eval2.1 b/bin/1sh/tests/set-e/eval2.1 deleted file mode 100644 index c6f161b9..00000000 --- a/bin/1sh/tests/set-e/eval2.1 +++ /dev/null @@ -1,4 +0,0 @@ -# $FreeBSD: releng/12.1/bin/sh/tests/set-e/eval2.1 193178 2009-05-31 17:23:27Z stefanf $ -set -e -eval false -exit 0 diff --git a/bin/1sh/tests/set-e/for1.0 b/bin/1sh/tests/set-e/for1.0 deleted file mode 100644 index 344d851c..00000000 --- a/bin/1sh/tests/set-e/for1.0 +++ /dev/null @@ -1,9 +0,0 @@ -# $FreeBSD: releng/12.1/bin/sh/tests/set-e/for1.0 149791 2005-09-05 09:42:10Z stefanf $ -set -e -f() { - for i in a b c; do - false - true - done -} -f || true diff --git a/bin/1sh/tests/set-e/func1.0 b/bin/1sh/tests/set-e/func1.0 deleted file mode 100644 index a3435785..00000000 --- a/bin/1sh/tests/set-e/func1.0 +++ /dev/null @@ -1,7 +0,0 @@ -# $FreeBSD: releng/12.1/bin/sh/tests/set-e/func1.0 149791 2005-09-05 09:42:10Z stefanf $ -set -e -f() { - false - true -} -f || true diff --git a/bin/1sh/tests/set-e/func2.1 b/bin/1sh/tests/set-e/func2.1 deleted file mode 100644 index 1ac1b46f..00000000 --- a/bin/1sh/tests/set-e/func2.1 +++ /dev/null @@ -1,7 +0,0 @@ -# $FreeBSD: releng/12.1/bin/sh/tests/set-e/func2.1 149791 2005-09-05 09:42:10Z stefanf $ -set -e -f() { - false - exit 0 -} -f diff --git a/bin/1sh/tests/set-e/if1.0 b/bin/1sh/tests/set-e/if1.0 deleted file mode 100644 index 19cf155f..00000000 --- a/bin/1sh/tests/set-e/if1.0 +++ /dev/null @@ -1,5 +0,0 @@ -# $FreeBSD: releng/12.1/bin/sh/tests/set-e/if1.0 211399 2010-08-16 17:18:08Z jilles $ -set -e -if false; then - : -fi diff --git a/bin/1sh/tests/set-e/if2.0 b/bin/1sh/tests/set-e/if2.0 deleted file mode 100644 index 52e6e596..00000000 --- a/bin/1sh/tests/set-e/if2.0 +++ /dev/null @@ -1,7 +0,0 @@ -# $FreeBSD: releng/12.1/bin/sh/tests/set-e/if2.0 149781 2005-09-04 11:59:59Z stefanf $ -set -e -# PR 28852 -if true; then - false && true -fi -exit 0 diff --git a/bin/1sh/tests/set-e/if3.0 b/bin/1sh/tests/set-e/if3.0 deleted file mode 100644 index 61598039..00000000 --- a/bin/1sh/tests/set-e/if3.0 +++ /dev/null @@ -1,5 +0,0 @@ -# $FreeBSD: releng/12.1/bin/sh/tests/set-e/if3.0 211399 2010-08-16 17:18:08Z jilles $ -set -e -if false; false; then - : -fi diff --git a/bin/1sh/tests/set-e/not1.0 b/bin/1sh/tests/set-e/not1.0 deleted file mode 100644 index 5421ab4a..00000000 --- a/bin/1sh/tests/set-e/not1.0 +++ /dev/null @@ -1,4 +0,0 @@ -# $FreeBSD: releng/12.1/bin/sh/tests/set-e/not1.0 149781 2005-09-04 11:59:59Z stefanf $ -set -e -! true -exit 0 diff --git a/bin/1sh/tests/set-e/not2.0 b/bin/1sh/tests/set-e/not2.0 deleted file mode 100644 index 146f4949..00000000 --- a/bin/1sh/tests/set-e/not2.0 +++ /dev/null @@ -1,4 +0,0 @@ -# $FreeBSD: releng/12.1/bin/sh/tests/set-e/not2.0 193178 2009-05-31 17:23:27Z stefanf $ -set -e -! false -! eval false diff --git a/bin/1sh/tests/set-e/or1.0 b/bin/1sh/tests/set-e/or1.0 deleted file mode 100644 index bdf99f7a..00000000 --- a/bin/1sh/tests/set-e/or1.0 +++ /dev/null @@ -1,3 +0,0 @@ -# $FreeBSD: releng/12.1/bin/sh/tests/set-e/or1.0 149781 2005-09-04 11:59:59Z stefanf $ -set -e -true || false diff --git a/bin/1sh/tests/set-e/or2.0 b/bin/1sh/tests/set-e/or2.0 deleted file mode 100644 index d96ae4a7..00000000 --- a/bin/1sh/tests/set-e/or2.0 +++ /dev/null @@ -1,3 +0,0 @@ -# $FreeBSD: releng/12.1/bin/sh/tests/set-e/or2.0 149781 2005-09-04 11:59:59Z stefanf $ -set -e -false || true diff --git a/bin/1sh/tests/set-e/or3.1 b/bin/1sh/tests/set-e/or3.1 deleted file mode 100644 index 3cde1bff..00000000 --- a/bin/1sh/tests/set-e/or3.1 +++ /dev/null @@ -1,4 +0,0 @@ -# $FreeBSD: releng/12.1/bin/sh/tests/set-e/or3.1 149781 2005-09-04 11:59:59Z stefanf $ -set -e -false || false -exit 0 diff --git a/bin/1sh/tests/set-e/pipe1.1 b/bin/1sh/tests/set-e/pipe1.1 deleted file mode 100644 index b3937ad4..00000000 --- a/bin/1sh/tests/set-e/pipe1.1 +++ /dev/null @@ -1,4 +0,0 @@ -# $FreeBSD: releng/12.1/bin/sh/tests/set-e/pipe1.1 149781 2005-09-04 11:59:59Z stefanf $ -set -e -true | false -exit 0 diff --git a/bin/1sh/tests/set-e/pipe2.0 b/bin/1sh/tests/set-e/pipe2.0 deleted file mode 100644 index 50d90306..00000000 --- a/bin/1sh/tests/set-e/pipe2.0 +++ /dev/null @@ -1,3 +0,0 @@ -# $FreeBSD: releng/12.1/bin/sh/tests/set-e/pipe2.0 149781 2005-09-04 11:59:59Z stefanf $ -set -e -false | true diff --git a/bin/1sh/tests/set-e/return1.0 b/bin/1sh/tests/set-e/return1.0 deleted file mode 100644 index 39439b51..00000000 --- a/bin/1sh/tests/set-e/return1.0 +++ /dev/null @@ -1,11 +0,0 @@ -# $FreeBSD: releng/12.1/bin/sh/tests/set-e/return1.0 149788 2005-09-04 21:29:09Z stefanf $ -set -e - -# PR 77067, 85267 -f() { - return 1 - true -} - -f || true -exit 0 diff --git a/bin/1sh/tests/set-e/semi1.1 b/bin/1sh/tests/set-e/semi1.1 deleted file mode 100644 index 624d4915..00000000 --- a/bin/1sh/tests/set-e/semi1.1 +++ /dev/null @@ -1,4 +0,0 @@ -# $FreeBSD: releng/12.1/bin/sh/tests/set-e/semi1.1 149781 2005-09-04 11:59:59Z stefanf $ -set -e -false; true -exit 0 diff --git a/bin/1sh/tests/set-e/semi2.1 b/bin/1sh/tests/set-e/semi2.1 deleted file mode 100644 index f6c8d468..00000000 --- a/bin/1sh/tests/set-e/semi2.1 +++ /dev/null @@ -1,4 +0,0 @@ -# $FreeBSD: releng/12.1/bin/sh/tests/set-e/semi2.1 149781 2005-09-04 11:59:59Z stefanf $ -set -e -true; false -exit 0 diff --git a/bin/1sh/tests/set-e/subshell1.0 b/bin/1sh/tests/set-e/subshell1.0 deleted file mode 100644 index 7975eac9..00000000 --- a/bin/1sh/tests/set-e/subshell1.0 +++ /dev/null @@ -1,3 +0,0 @@ -# $FreeBSD: releng/12.1/bin/sh/tests/set-e/subshell1.0 149781 2005-09-04 11:59:59Z stefanf $ -set -e -(true) diff --git a/bin/1sh/tests/set-e/subshell2.1 b/bin/1sh/tests/set-e/subshell2.1 deleted file mode 100644 index 6b441cd5..00000000 --- a/bin/1sh/tests/set-e/subshell2.1 +++ /dev/null @@ -1,4 +0,0 @@ -# $FreeBSD: releng/12.1/bin/sh/tests/set-e/subshell2.1 149781 2005-09-04 11:59:59Z stefanf $ -set -e -(false) -exit 0 diff --git a/bin/1sh/tests/set-e/until1.0 b/bin/1sh/tests/set-e/until1.0 deleted file mode 100644 index 281b4617..00000000 --- a/bin/1sh/tests/set-e/until1.0 +++ /dev/null @@ -1,5 +0,0 @@ -# $FreeBSD: releng/12.1/bin/sh/tests/set-e/until1.0 149781 2005-09-04 11:59:59Z stefanf $ -set -e -until false; do - break -done diff --git a/bin/1sh/tests/set-e/until2.0 b/bin/1sh/tests/set-e/until2.0 deleted file mode 100644 index 8b571d31..00000000 --- a/bin/1sh/tests/set-e/until2.0 +++ /dev/null @@ -1,5 +0,0 @@ -# $FreeBSD: releng/12.1/bin/sh/tests/set-e/until2.0 149781 2005-09-04 11:59:59Z stefanf $ -set -e -until false; false; do - break -done diff --git a/bin/1sh/tests/set-e/until3.0 b/bin/1sh/tests/set-e/until3.0 deleted file mode 100644 index cc39584c..00000000 --- a/bin/1sh/tests/set-e/until3.0 +++ /dev/null @@ -1,9 +0,0 @@ -# $FreeBSD: releng/12.1/bin/sh/tests/set-e/until3.0 149791 2005-09-05 09:42:10Z stefanf $ -set -e -f() { - until false; do - false - break - done -} -f || true diff --git a/bin/1sh/tests/set-e/while1.0 b/bin/1sh/tests/set-e/while1.0 deleted file mode 100644 index a60532c8..00000000 --- a/bin/1sh/tests/set-e/while1.0 +++ /dev/null @@ -1,5 +0,0 @@ -# $FreeBSD: releng/12.1/bin/sh/tests/set-e/while1.0 211399 2010-08-16 17:18:08Z jilles $ -set -e -while false; do - : -done diff --git a/bin/1sh/tests/set-e/while2.0 b/bin/1sh/tests/set-e/while2.0 deleted file mode 100644 index d0e4f71a..00000000 --- a/bin/1sh/tests/set-e/while2.0 +++ /dev/null @@ -1,5 +0,0 @@ -# $FreeBSD: releng/12.1/bin/sh/tests/set-e/while2.0 211399 2010-08-16 17:18:08Z jilles $ -set -e -while false; false; do - : -done diff --git a/bin/1sh/tests/set-e/while3.0 b/bin/1sh/tests/set-e/while3.0 deleted file mode 100644 index 5a1b2695..00000000 --- a/bin/1sh/tests/set-e/while3.0 +++ /dev/null @@ -1,9 +0,0 @@ -# $FreeBSD: releng/12.1/bin/sh/tests/set-e/while3.0 149791 2005-09-05 09:42:10Z stefanf $ -set -e -f() { - while true; do - false - break - done -} -f || true -- cgit 1.4.1