From owner-svn-src-all@FreeBSD.ORG Sun Aug 17 14:26:15 2014 Return-Path: Delivered-To: svn-src-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 5F319D1D; Sun, 17 Aug 2014 14:26:15 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 3F6A62DBB; Sun, 17 Aug 2014 14:26:15 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id s7HEQFx8038616; Sun, 17 Aug 2014 14:26:15 GMT (envelope-from jilles@FreeBSD.org) Received: (from jilles@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id s7HEQCmb038602; Sun, 17 Aug 2014 14:26:12 GMT (envelope-from jilles@FreeBSD.org) Message-Id: <201408171426.s7HEQCmb038602@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: jilles set sender to jilles@FreeBSD.org using -f From: Jilles Tjoelker Date: Sun, 17 Aug 2014 14:26:12 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r270101 - in head/bin/sh/tests: . errors X-SVN-Group: head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.18-1 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: Sun, 17 Aug 2014 14:26:15 -0000 Author: jilles Date: Sun Aug 17 14:26:12 2014 New Revision: 270101 URL: http://svnweb.freebsd.org/changeset/base/270101 Log: sh: Don't hardcode relative paths in the tests stderr files. These paths have had to be adjusted to changes in the testsuite runner several times, so modify the tests to remove the need for such adjustment. A cp in functional_test.sh is now unneeded, but this matters little in performance. Modified: head/bin/sh/tests/errors/bad-parm-exp2.2 head/bin/sh/tests/errors/bad-parm-exp2.2.stderr head/bin/sh/tests/errors/bad-parm-exp3.2 head/bin/sh/tests/errors/bad-parm-exp3.2.stderr head/bin/sh/tests/errors/bad-parm-exp4.2 head/bin/sh/tests/errors/bad-parm-exp4.2.stderr head/bin/sh/tests/errors/bad-parm-exp5.2 head/bin/sh/tests/errors/bad-parm-exp5.2.stderr head/bin/sh/tests/errors/bad-parm-exp6.2 head/bin/sh/tests/errors/bad-parm-exp6.2.stderr head/bin/sh/tests/functional_test.sh Modified: head/bin/sh/tests/errors/bad-parm-exp2.2 ============================================================================== --- head/bin/sh/tests/errors/bad-parm-exp2.2 Sun Aug 17 13:12:07 2014 (r270100) +++ head/bin/sh/tests/errors/bad-parm-exp2.2 Sun Aug 17 14:26:12 2014 (r270101) @@ -1,2 +1,2 @@ # $FreeBSD$ -${} +eval '${}' Modified: head/bin/sh/tests/errors/bad-parm-exp2.2.stderr ============================================================================== --- head/bin/sh/tests/errors/bad-parm-exp2.2.stderr Sun Aug 17 13:12:07 2014 (r270100) +++ head/bin/sh/tests/errors/bad-parm-exp2.2.stderr Sun Aug 17 14:26:12 2014 (r270101) @@ -1 +1 @@ -./bad-parm-exp2.2: ${}: Bad substitution +eval: ${}: Bad substitution Modified: head/bin/sh/tests/errors/bad-parm-exp3.2 ============================================================================== --- head/bin/sh/tests/errors/bad-parm-exp3.2 Sun Aug 17 13:12:07 2014 (r270100) +++ head/bin/sh/tests/errors/bad-parm-exp3.2 Sun Aug 17 14:26:12 2014 (r270101) @@ -1,2 +1,2 @@ # $FreeBSD$ -${foo/} +eval '${foo/}' Modified: head/bin/sh/tests/errors/bad-parm-exp3.2.stderr ============================================================================== --- head/bin/sh/tests/errors/bad-parm-exp3.2.stderr Sun Aug 17 13:12:07 2014 (r270100) +++ head/bin/sh/tests/errors/bad-parm-exp3.2.stderr Sun Aug 17 14:26:12 2014 (r270101) @@ -1 +1 @@ -./bad-parm-exp3.2: ${foo/}: Bad substitution +eval: ${foo/}: Bad substitution Modified: head/bin/sh/tests/errors/bad-parm-exp4.2 ============================================================================== --- head/bin/sh/tests/errors/bad-parm-exp4.2 Sun Aug 17 13:12:07 2014 (r270100) +++ head/bin/sh/tests/errors/bad-parm-exp4.2 Sun Aug 17 14:26:12 2014 (r270101) @@ -1,2 +1,2 @@ # $FreeBSD$ -${foo:@abc} +eval '${foo:@abc}' Modified: head/bin/sh/tests/errors/bad-parm-exp4.2.stderr ============================================================================== --- head/bin/sh/tests/errors/bad-parm-exp4.2.stderr Sun Aug 17 13:12:07 2014 (r270100) +++ head/bin/sh/tests/errors/bad-parm-exp4.2.stderr Sun Aug 17 14:26:12 2014 (r270101) @@ -1 +1 @@ -./bad-parm-exp4.2: ${foo:@...}: Bad substitution +eval: ${foo:@...}: Bad substitution Modified: head/bin/sh/tests/errors/bad-parm-exp5.2 ============================================================================== --- head/bin/sh/tests/errors/bad-parm-exp5.2 Sun Aug 17 13:12:07 2014 (r270100) +++ head/bin/sh/tests/errors/bad-parm-exp5.2 Sun Aug 17 14:26:12 2014 (r270101) @@ -1,2 +1,2 @@ # $FreeBSD$ -${/} +eval '${/}' Modified: head/bin/sh/tests/errors/bad-parm-exp5.2.stderr ============================================================================== --- head/bin/sh/tests/errors/bad-parm-exp5.2.stderr Sun Aug 17 13:12:07 2014 (r270100) +++ head/bin/sh/tests/errors/bad-parm-exp5.2.stderr Sun Aug 17 14:26:12 2014 (r270101) @@ -1 +1 @@ -./bad-parm-exp5.2: ${/}: Bad substitution +eval: ${/}: Bad substitution Modified: head/bin/sh/tests/errors/bad-parm-exp6.2 ============================================================================== --- head/bin/sh/tests/errors/bad-parm-exp6.2 Sun Aug 17 13:12:07 2014 (r270100) +++ head/bin/sh/tests/errors/bad-parm-exp6.2 Sun Aug 17 14:26:12 2014 (r270101) @@ -1,2 +1,2 @@ # $FreeBSD$ -${#foo^} +eval '${#foo^}' Modified: head/bin/sh/tests/errors/bad-parm-exp6.2.stderr ============================================================================== --- head/bin/sh/tests/errors/bad-parm-exp6.2.stderr Sun Aug 17 13:12:07 2014 (r270100) +++ head/bin/sh/tests/errors/bad-parm-exp6.2.stderr Sun Aug 17 14:26:12 2014 (r270101) @@ -1 +1 @@ -./bad-parm-exp6.2: ${foo...}: Bad substitution +eval: ${foo...}: Bad substitution Modified: head/bin/sh/tests/functional_test.sh ============================================================================== --- head/bin/sh/tests/functional_test.sh Sun Aug 17 13:12:07 2014 (r270100) +++ head/bin/sh/tests/functional_test.sh Sun Aug 17 14:26:12 2014 (r270101) @@ -39,13 +39,7 @@ check() local out_file="${SRCDIR}/${tc}.stdout" [ -f "${out_file}" ] && out_flag="-o file:${out_file}" - # We need to copy the testcase scenario file because some of the - # testcases hardcode relative paths in the stderr/stdout. - # - # TODO: we might be able to generate this path at build time - cp ${SRCDIR}/${tc} . - - atf_check -s exit:${tc##*.} ${err_flag} ${out_flag} ${SH} "./${tc}" + atf_check -s exit:${tc##*.} ${err_flag} ${out_flag} ${SH} "${SRCDIR}/${tc}" } add_testcase()