Skip site navigation (1)Skip section navigation (2)
Date:      Sun, 12 Dec 2010 21:18:16 +0000 (UTC)
From:      Jilles Tjoelker <jilles@FreeBSD.org>
To:        src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org
Subject:   svn commit: r216398 - in head/tools/regression/bin/sh: errors execution
Message-ID:  <201012122118.oBCLIGYd060063@svn.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: jilles
Date: Sun Dec 12 21:18:16 2010
New Revision: 216398
URL: http://svn.freebsd.org/changeset/base/216398

Log:
  sh: Fix some tests that used sh instead of ${SH}
  so they tested the wrong sh.
  
  This was caused because these tests were committed after the sh -> ${SH}
  change but were created before.

Modified:
  head/tools/regression/bin/sh/errors/bad-keyword1.0
  head/tools/regression/bin/sh/execution/func3.0

Modified: head/tools/regression/bin/sh/errors/bad-keyword1.0
==============================================================================
--- head/tools/regression/bin/sh/errors/bad-keyword1.0	Sun Dec 12 20:50:44 2010	(r216397)
+++ head/tools/regression/bin/sh/errors/bad-keyword1.0	Sun Dec 12 21:18:16 2010	(r216398)
@@ -1,4 +1,4 @@
 # $FreeBSD$
 
-echo ':; fi' | sh -n 2>/dev/null && exit 1
+echo ':; fi' | ${SH} -n 2>/dev/null && exit 1
 exit 0

Modified: head/tools/regression/bin/sh/execution/func3.0
==============================================================================
--- head/tools/regression/bin/sh/execution/func3.0	Sun Dec 12 20:50:44 2010	(r216397)
+++ head/tools/regression/bin/sh/execution/func3.0	Sun Dec 12 21:18:16 2010	(r216398)
@@ -3,5 +3,5 @@
 # This may fail when parsing or when defining the function, or the definition
 # may silently do nothing. In no event may the function be executed.
 
-sh -c 'unset() { echo overriding function executed, bad; }; v=1; unset v; exit "${v-0}"' 2>/dev/null
+${SH} -c 'unset() { echo overriding function executed, bad; }; v=1; unset v; exit "${v-0}"' 2>/dev/null
 :



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201012122118.oBCLIGYd060063>