From owner-svn-src-all@freebsd.org Sat Apr 9 16:06:14 2016 Return-Path: Delivered-To: svn-src-all@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id EA5E6B09BAA; Sat, 9 Apr 2016 16:06:14 +0000 (UTC) (envelope-from jilles@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::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 A19E510F8; Sat, 9 Apr 2016 16:06:14 +0000 (UTC) (envelope-from jilles@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id u39G6DHl018685; Sat, 9 Apr 2016 16:06:13 GMT (envelope-from jilles@FreeBSD.org) Received: (from jilles@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id u39G6DJg018682; Sat, 9 Apr 2016 16:06:13 GMT (envelope-from jilles@FreeBSD.org) Message-Id: <201604091606.u39G6DJg018682@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: jilles set sender to jilles@FreeBSD.org using -f From: Jilles Tjoelker Date: Sat, 9 Apr 2016 16:06:13 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r297752 - head/bin/sh/tests/builtins 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.21 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: Sat, 09 Apr 2016 16:06:15 -0000 Author: jilles Date: Sat Apr 9 16:06:13 2016 New Revision: 297752 URL: https://svnweb.freebsd.org/changeset/base/297752 Log: sh: Fix some unquoted variables in tests. The builtins/getopts1.0 test failed if a single-character file existed in the current directory. Modified: head/bin/sh/tests/builtins/getopts1.0 head/bin/sh/tests/builtins/getopts2.0 head/bin/sh/tests/builtins/getopts9.0 Modified: head/bin/sh/tests/builtins/getopts1.0 ============================================================================== --- head/bin/sh/tests/builtins/getopts1.0 Sat Apr 9 14:50:47 2016 (r297751) +++ head/bin/sh/tests/builtins/getopts1.0 Sat Apr 9 16:06:13 2016 (r297752) @@ -3,7 +3,7 @@ printf -- '-1-\n' set -- -abc getopts "ab:" OPTION -echo ${OPTION} +printf '%s\n' "${OPTION}" # In this case 'getopts' should realize that we have not provided the # required argument for "-b". @@ -14,12 +14,12 @@ echo ${OPTION} printf -- '-2-\n' set -- -ab getopts "ab:" OPTION -echo ${OPTION} +printf '%s\n' "${OPTION}" getopts "ab:" OPTION 3>&2 2>&1 >&3 3>&- -echo ${OPTION} +printf '%s\n' "${OPTION}" # The 'shift' is aimed at causing an error. printf -- '-3-\n' shift 1 getopts "ab:" OPTION -echo ${OPTION} +printf '%s\n' "${OPTION}" Modified: head/bin/sh/tests/builtins/getopts2.0 ============================================================================== --- head/bin/sh/tests/builtins/getopts2.0 Sat Apr 9 14:50:47 2016 (r297751) +++ head/bin/sh/tests/builtins/getopts2.0 Sat Apr 9 16:06:13 2016 (r297752) @@ -3,4 +3,4 @@ set - -ax getopts ax option set -C getopts ax option -echo $option +printf '%s\n' "$option" Modified: head/bin/sh/tests/builtins/getopts9.0 ============================================================================== --- head/bin/sh/tests/builtins/getopts9.0 Sat Apr 9 14:50:47 2016 (r297751) +++ head/bin/sh/tests/builtins/getopts9.0 Sat Apr 9 16:06:13 2016 (r297752) @@ -2,8 +2,8 @@ args='-ab' getopts ab opt $args -echo $?:$opt:$OPTARG +printf '%s\n' "$?:$opt:$OPTARG" for dummy in dummy1 dummy2; do getopts ab opt $args - echo $?:$opt:$OPTARG + printf '%s\n' "$?:$opt:$OPTARG" done