diff options
| author | Julio Merino <jmmv@FreeBSD.org> | 2014-05-14 18:43:13 +0000 |
|---|---|---|
| committer | Julio Merino <jmmv@FreeBSD.org> | 2014-05-14 18:43:13 +0000 |
| commit | 5ae59dec60e3815b621ae87f74a377cf3449ca55 (patch) | |
| tree | 5f8bd4d7669fed59fe6c95a88d3b3489b23849e8 /usr.bin/bmake/tests/execution | |
| parent | a9069ffab45e259fbbc5626ee11fd3215bf0e399 (diff) | |
Notes
Diffstat (limited to 'usr.bin/bmake/tests/execution')
25 files changed, 299 insertions, 0 deletions
diff --git a/usr.bin/bmake/tests/execution/Makefile b/usr.bin/bmake/tests/execution/Makefile new file mode 100644 index 000000000000..2c91bbba23ea --- /dev/null +++ b/usr.bin/bmake/tests/execution/Makefile @@ -0,0 +1,7 @@ +# $FreeBSD$ + +TESTSDIR= ${TESTSBASE}/usr.bin/bmake/execution + +TESTS_SUBDIRS= ellipsis empty joberr plus + +.include <bsd.test.mk> diff --git a/usr.bin/bmake/tests/execution/ellipsis/Makefile b/usr.bin/bmake/tests/execution/ellipsis/Makefile new file mode 100644 index 000000000000..5629b4bb0018 --- /dev/null +++ b/usr.bin/bmake/tests/execution/ellipsis/Makefile @@ -0,0 +1,13 @@ +# $FreeBSD$ + +TESTSDIR= ${TESTSBASE}/usr.bin/bmake/execution/ellipsis + +TAP_TESTS_SH= legacy_test + +FILESDIR= ${TESTSDIR} +FILES= Makefile.test +FILES+= expected.status.1 +FILES+= expected.stderr.1 +FILES+= expected.stdout.1 + +.include <bsd.test.mk> diff --git a/usr.bin/bmake/tests/execution/ellipsis/Makefile.test b/usr.bin/bmake/tests/execution/ellipsis/Makefile.test new file mode 100644 index 000000000000..d19f64259c52 --- /dev/null +++ b/usr.bin/bmake/tests/execution/ellipsis/Makefile.test @@ -0,0 +1,21 @@ +# $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/usr.bin/bmake/tests/execution/ellipsis/expected.status.1 b/usr.bin/bmake/tests/execution/ellipsis/expected.status.1 new file mode 100644 index 000000000000..573541ac9702 --- /dev/null +++ b/usr.bin/bmake/tests/execution/ellipsis/expected.status.1 @@ -0,0 +1 @@ +0 diff --git a/usr.bin/bmake/tests/execution/ellipsis/expected.stderr.1 b/usr.bin/bmake/tests/execution/ellipsis/expected.stderr.1 new file mode 100644 index 000000000000..e69de29bb2d1 --- /dev/null +++ b/usr.bin/bmake/tests/execution/ellipsis/expected.stderr.1 diff --git a/usr.bin/bmake/tests/execution/ellipsis/expected.stdout.1 b/usr.bin/bmake/tests/execution/ellipsis/expected.stdout.1 new file mode 100644 index 000000000000..a7e5727b5181 --- /dev/null +++ b/usr.bin/bmake/tests/execution/ellipsis/expected.stdout.1 @@ -0,0 +1,12 @@ +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/usr.bin/bmake/tests/execution/ellipsis/legacy_test.sh b/usr.bin/bmake/tests/execution/ellipsis/legacy_test.sh new file mode 100644 index 000000000000..9e9cd01ff297 --- /dev/null +++ b/usr.bin/bmake/tests/execution/ellipsis/legacy_test.sh @@ -0,0 +1,13 @@ +#! /bin/sh +# $FreeBSD$ + +. $(dirname $0)/../../common.sh + +# Description +DESC="Ellipsis command from variable" + +# Run +TEST_N=1 +TEST_1= + +eval_cmd $* diff --git a/usr.bin/bmake/tests/execution/empty/Makefile b/usr.bin/bmake/tests/execution/empty/Makefile new file mode 100644 index 000000000000..6421b9620e9e --- /dev/null +++ b/usr.bin/bmake/tests/execution/empty/Makefile @@ -0,0 +1,13 @@ +# $FreeBSD$ + +TESTSDIR= ${TESTSBASE}/usr.bin/bmake/execution/empty + +TAP_TESTS_SH= legacy_test + +FILESDIR= ${TESTSDIR} +FILES= Makefile.test +FILES+= expected.status.1 +FILES+= expected.stderr.1 +FILES+= expected.stdout.1 + +.include <bsd.test.mk> diff --git a/usr.bin/bmake/tests/execution/empty/Makefile.test b/usr.bin/bmake/tests/execution/empty/Makefile.test new file mode 100644 index 000000000000..f687bce7f245 --- /dev/null +++ b/usr.bin/bmake/tests/execution/empty/Makefile.test @@ -0,0 +1,13 @@ +# $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/usr.bin/bmake/tests/execution/empty/expected.status.1 b/usr.bin/bmake/tests/execution/empty/expected.status.1 new file mode 100644 index 000000000000..573541ac9702 --- /dev/null +++ b/usr.bin/bmake/tests/execution/empty/expected.status.1 @@ -0,0 +1 @@ +0 diff --git a/usr.bin/bmake/tests/execution/empty/expected.stderr.1 b/usr.bin/bmake/tests/execution/empty/expected.stderr.1 new file mode 100644 index 000000000000..e69de29bb2d1 --- /dev/null +++ b/usr.bin/bmake/tests/execution/empty/expected.stderr.1 diff --git a/usr.bin/bmake/tests/execution/empty/expected.stdout.1 b/usr.bin/bmake/tests/execution/empty/expected.stdout.1 new file mode 100644 index 000000000000..e69de29bb2d1 --- /dev/null +++ b/usr.bin/bmake/tests/execution/empty/expected.stdout.1 diff --git a/usr.bin/bmake/tests/execution/empty/legacy_test.sh b/usr.bin/bmake/tests/execution/empty/legacy_test.sh new file mode 100644 index 000000000000..e02d175b057d --- /dev/null +++ b/usr.bin/bmake/tests/execution/empty/legacy_test.sh @@ -0,0 +1,13 @@ +#! /bin/sh +# $FreeBSD$ + +. $(dirname $0)/../../common.sh + +# Description +DESC="Empty command (from variable)" + +# Run +TEST_N=1 +TEST_1= + +eval_cmd $* diff --git a/usr.bin/bmake/tests/execution/joberr/Makefile b/usr.bin/bmake/tests/execution/joberr/Makefile new file mode 100644 index 000000000000..d183eb1347d4 --- /dev/null +++ b/usr.bin/bmake/tests/execution/joberr/Makefile @@ -0,0 +1,13 @@ +# $FreeBSD$ + +TESTSDIR= ${TESTSBASE}/usr.bin/bmake/execution/joberr + +TAP_TESTS_SH= legacy_test + +FILESDIR= ${TESTSDIR} +FILES= Makefile.test +FILES+= expected.status.1 +FILES+= expected.stderr.1 +FILES+= expected.stdout.1 + +.include <bsd.test.mk> diff --git a/usr.bin/bmake/tests/execution/joberr/Makefile.test b/usr.bin/bmake/tests/execution/joberr/Makefile.test new file mode 100644 index 000000000000..aca86e87bae8 --- /dev/null +++ b/usr.bin/bmake/tests/execution/joberr/Makefile.test @@ -0,0 +1,10 @@ +# $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/usr.bin/bmake/tests/execution/joberr/expected.status.1 b/usr.bin/bmake/tests/execution/joberr/expected.status.1 new file mode 100644 index 000000000000..573541ac9702 --- /dev/null +++ b/usr.bin/bmake/tests/execution/joberr/expected.status.1 @@ -0,0 +1 @@ +0 diff --git a/usr.bin/bmake/tests/execution/joberr/expected.stderr.1 b/usr.bin/bmake/tests/execution/joberr/expected.stderr.1 new file mode 100644 index 000000000000..d0c8a2eb27b2 --- /dev/null +++ b/usr.bin/bmake/tests/execution/joberr/expected.stderr.1 @@ -0,0 +1,30 @@ +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/usr.bin/bmake/tests/execution/joberr/expected.stdout.1 b/usr.bin/bmake/tests/execution/joberr/expected.stdout.1 new file mode 100644 index 000000000000..0ee28f4fd515 --- /dev/null +++ b/usr.bin/bmake/tests/execution/joberr/expected.stdout.1 @@ -0,0 +1,90 @@ +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/usr.bin/bmake/tests/execution/joberr/legacy_test.sh b/usr.bin/bmake/tests/execution/joberr/legacy_test.sh new file mode 100644 index 000000000000..429bfe1d661c --- /dev/null +++ b/usr.bin/bmake/tests/execution/joberr/legacy_test.sh @@ -0,0 +1,13 @@ +#! /bin/sh +# $FreeBSD$ + +. $(dirname $0)/../../common.sh + +# Description +DESC="Test job make error output" + +# Run +TEST_N=1 +TEST_1= + +eval_cmd $* diff --git a/usr.bin/bmake/tests/execution/plus/Makefile b/usr.bin/bmake/tests/execution/plus/Makefile new file mode 100644 index 000000000000..8b489d56c6cf --- /dev/null +++ b/usr.bin/bmake/tests/execution/plus/Makefile @@ -0,0 +1,13 @@ +# $FreeBSD$ + +TESTSDIR= ${TESTSBASE}/usr.bin/bmake/execution/plus + +TAP_TESTS_SH= legacy_test + +FILESDIR= ${TESTSDIR} +FILES= Makefile.test +FILES+= expected.status.1 +FILES+= expected.stderr.1 +FILES+= expected.stdout.1 + +.include <bsd.test.mk> diff --git a/usr.bin/bmake/tests/execution/plus/Makefile.test b/usr.bin/bmake/tests/execution/plus/Makefile.test new file mode 100644 index 000000000000..ae3bdc30b703 --- /dev/null +++ b/usr.bin/bmake/tests/execution/plus/Makefile.test @@ -0,0 +1,7 @@ +# $FreeBSD$ + +check-+: + @${MAKE} -f ${MAKEFILE} -j2 -n do-$@ + +do-check-+: + @+echo $@ diff --git a/usr.bin/bmake/tests/execution/plus/expected.status.1 b/usr.bin/bmake/tests/execution/plus/expected.status.1 new file mode 100644 index 000000000000..573541ac9702 --- /dev/null +++ b/usr.bin/bmake/tests/execution/plus/expected.status.1 @@ -0,0 +1 @@ +0 diff --git a/usr.bin/bmake/tests/execution/plus/expected.stderr.1 b/usr.bin/bmake/tests/execution/plus/expected.stderr.1 new file mode 100644 index 000000000000..e69de29bb2d1 --- /dev/null +++ b/usr.bin/bmake/tests/execution/plus/expected.stderr.1 diff --git a/usr.bin/bmake/tests/execution/plus/expected.stdout.1 b/usr.bin/bmake/tests/execution/plus/expected.stdout.1 new file mode 100644 index 000000000000..b334fc734706 --- /dev/null +++ b/usr.bin/bmake/tests/execution/plus/expected.stdout.1 @@ -0,0 +1 @@ +do-check-+ diff --git a/usr.bin/bmake/tests/execution/plus/legacy_test.sh b/usr.bin/bmake/tests/execution/plus/legacy_test.sh new file mode 100644 index 000000000000..0737d1bc86b5 --- /dev/null +++ b/usr.bin/bmake/tests/execution/plus/legacy_test.sh @@ -0,0 +1,13 @@ +#! /bin/sh +# $FreeBSD$ + +. $(dirname $0)/../../common.sh + +# Description +DESC="Test '+command' execution with -n -jX" + +# Run +TEST_N=1 +TEST_1= + +eval_cmd $* |