From owner-svn-src-all@FreeBSD.ORG Wed Nov 30 05:49:17 2011 Return-Path: Delivered-To: svn-src-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id E0232106566B; Wed, 30 Nov 2011 05:49:17 +0000 (UTC) (envelope-from fjoe@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id CE3378FC0A; Wed, 30 Nov 2011 05:49:17 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.4/8.14.4) with ESMTP id pAU5nHcl083806; Wed, 30 Nov 2011 05:49:17 GMT (envelope-from fjoe@svn.freebsd.org) Received: (from fjoe@localhost) by svn.freebsd.org (8.14.4/8.14.4/Submit) id pAU5nH9R083791; Wed, 30 Nov 2011 05:49:17 GMT (envelope-from fjoe@svn.freebsd.org) Message-Id: <201111300549.pAU5nH9R083791@svn.freebsd.org> From: Max Khon Date: Wed, 30 Nov 2011 05:49:17 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org X-SVN-Group: head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r228149 - in head/tools/regression/usr.bin/make/execution: . ellipsis empty plus X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 30 Nov 2011 05:49:18 -0000 Author: fjoe Date: Wed Nov 30 05:49:17 2011 New Revision: 228149 URL: http://svn.freebsd.org/changeset/base/228149 Log: Add three execution tests for make(1): - plus: execute "+command" when run with -jX -n - ellipsis: ellipsis ("...") from variable - empty: empty command (from variable) Currently make(1) fails all three tests: - plus: segmentation fault due to incorrect command list handling - ellipsis: works in compat mode but fails in job (-jX) mode - empty: - compat mode: prints error message - job mode: works but prints empty string Added: head/tools/regression/usr.bin/make/execution/ head/tools/regression/usr.bin/make/execution/ellipsis/ head/tools/regression/usr.bin/make/execution/ellipsis/Makefile (contents, props changed) head/tools/regression/usr.bin/make/execution/ellipsis/expected.status.1 (contents, props changed) head/tools/regression/usr.bin/make/execution/ellipsis/expected.stderr.1 (contents, props changed) head/tools/regression/usr.bin/make/execution/ellipsis/expected.stdout.1 (contents, props changed) head/tools/regression/usr.bin/make/execution/ellipsis/test.t (contents, props changed) head/tools/regression/usr.bin/make/execution/empty/ head/tools/regression/usr.bin/make/execution/empty/Makefile (contents, props changed) head/tools/regression/usr.bin/make/execution/empty/expected.status.1 (contents, props changed) head/tools/regression/usr.bin/make/execution/empty/expected.stderr.1 (contents, props changed) head/tools/regression/usr.bin/make/execution/empty/expected.stdout.1 (contents, props changed) head/tools/regression/usr.bin/make/execution/empty/test.t (contents, props changed) head/tools/regression/usr.bin/make/execution/plus/ head/tools/regression/usr.bin/make/execution/plus/Makefile (contents, props changed) head/tools/regression/usr.bin/make/execution/plus/expected.status.1 (contents, props changed) head/tools/regression/usr.bin/make/execution/plus/expected.stderr.1 (contents, props changed) head/tools/regression/usr.bin/make/execution/plus/expected.stdout.1 (contents, props changed) head/tools/regression/usr.bin/make/execution/plus/test.t (contents, props changed) Added: head/tools/regression/usr.bin/make/execution/ellipsis/Makefile ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/tools/regression/usr.bin/make/execution/ellipsis/Makefile Wed Nov 30 05:49:17 2011 (r228149) @@ -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 $@ Added: head/tools/regression/usr.bin/make/execution/ellipsis/expected.status.1 ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/tools/regression/usr.bin/make/execution/ellipsis/expected.status.1 Wed Nov 30 05:49:17 2011 (r228149) @@ -0,0 +1 @@ +0 Added: head/tools/regression/usr.bin/make/execution/ellipsis/expected.stderr.1 ============================================================================== Added: head/tools/regression/usr.bin/make/execution/ellipsis/expected.stdout.1 ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/tools/regression/usr.bin/make/execution/ellipsis/expected.stdout.1 Wed Nov 30 05:49:17 2011 (r228149) @@ -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 Added: head/tools/regression/usr.bin/make/execution/ellipsis/test.t ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/tools/regression/usr.bin/make/execution/ellipsis/test.t Wed Nov 30 05:49:17 2011 (r228149) @@ -0,0 +1,15 @@ +#!/bin/sh + +# $FreeBSD$ + +cd `dirname $0` +. ../../common.sh + +# Description +DESC="Ellipsis command from variable" + +# Run +TEST_N=1 +TEST_1= + +eval_cmd $* Added: head/tools/regression/usr.bin/make/execution/empty/Makefile ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/tools/regression/usr.bin/make/execution/empty/Makefile Wed Nov 30 05:49:17 2011 (r228149) @@ -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} Added: head/tools/regression/usr.bin/make/execution/empty/expected.status.1 ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/tools/regression/usr.bin/make/execution/empty/expected.status.1 Wed Nov 30 05:49:17 2011 (r228149) @@ -0,0 +1 @@ +0 Added: head/tools/regression/usr.bin/make/execution/empty/expected.stderr.1 ============================================================================== Added: head/tools/regression/usr.bin/make/execution/empty/expected.stdout.1 ============================================================================== Added: head/tools/regression/usr.bin/make/execution/empty/test.t ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/tools/regression/usr.bin/make/execution/empty/test.t Wed Nov 30 05:49:17 2011 (r228149) @@ -0,0 +1,15 @@ +#!/bin/sh + +# $FreeBSD$ + +cd `dirname $0` +. ../../common.sh + +# Description +DESC="Empty command (from variable)" + +# Run +TEST_N=1 +TEST_1= + +eval_cmd $* Added: head/tools/regression/usr.bin/make/execution/plus/Makefile ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/tools/regression/usr.bin/make/execution/plus/Makefile Wed Nov 30 05:49:17 2011 (r228149) @@ -0,0 +1,7 @@ +# $FreeBSD$ + +check-+: + @${MAKE} -f ${MAKEFILE} -j2 -n do-$@ + +do-check-+: + @+echo $@ Added: head/tools/regression/usr.bin/make/execution/plus/expected.status.1 ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/tools/regression/usr.bin/make/execution/plus/expected.status.1 Wed Nov 30 05:49:17 2011 (r228149) @@ -0,0 +1 @@ +0 Added: head/tools/regression/usr.bin/make/execution/plus/expected.stderr.1 ============================================================================== Added: head/tools/regression/usr.bin/make/execution/plus/expected.stdout.1 ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/tools/regression/usr.bin/make/execution/plus/expected.stdout.1 Wed Nov 30 05:49:17 2011 (r228149) @@ -0,0 +1 @@ +do-check-+ Added: head/tools/regression/usr.bin/make/execution/plus/test.t ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/tools/regression/usr.bin/make/execution/plus/test.t Wed Nov 30 05:49:17 2011 (r228149) @@ -0,0 +1,15 @@ +#!/bin/sh + +# $FreeBSD$ + +cd `dirname $0` +. ../../common.sh + +# Description +DESC="Test '+command' execution with -n -jX" + +# Run +TEST_N=1 +TEST_1= + +eval_cmd $*