Module Name: src Committed By: rillig Date: Fri Nov 20 00:24:21 UTC 2020
Modified Files: src/usr.bin/make: test-variants.sh Log Message: make(1): run tests with different shells as well, reduce output To generate a diff of this commit: cvs rdiff -u -r1.5 -r1.6 src/usr.bin/make/test-variants.sh Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
Modified files: Index: src/usr.bin/make/test-variants.sh diff -u src/usr.bin/make/test-variants.sh:1.5 src/usr.bin/make/test-variants.sh:1.6 --- src/usr.bin/make/test-variants.sh:1.5 Fri Oct 23 17:59:25 2020 +++ src/usr.bin/make/test-variants.sh Fri Nov 20 00:24:21 2020 @@ -1,5 +1,5 @@ #! /bin/sh -# $NetBSD: test-variants.sh,v 1.5 2020/10/23 17:59:25 rillig Exp $ +# $NetBSD: test-variants.sh,v 1.6 2020/11/20 00:24:21 rillig Exp $ # # Build several variants of make and run the tests on them. # @@ -24,7 +24,8 @@ testcase() { && env -i PATH="$PATH" USETOOLS="no" "$@" \ sh -ce "make -ks all" \ && size *.o make \ - && env -i PATH="$PATH" USETOOLS="no" MALLOC_OPTIONS="JA" "$@" \ + && env -i PATH="$PATH" USETOOLS="no" MALLOC_OPTIONS="JA" \ + _MKMSG_TEST=":" "$@" \ sh -ce "make -s test" \ || fail } @@ -178,4 +179,10 @@ testcase USE_GCC10=yes GCC10BASE=$HOME/p -Wno-error=conversion -Wno-error=sign-conversion -Wno-error=unused-macros \ -Wno-error=unused-parameter -Wno-error=duplicated-branches" +for shell in /usr/pkg/bin/bash /usr/pkg/bin/dash; do + if [ -x "$shell" ]; then + testcase USER_CPPFLAGS=-DDEFSHELL_CUSTOM="\\\"$shell\\\"" + fi +done + test "$failed" = "no"