From owner-svn-src-head@FreeBSD.ORG  Sun May 12 16:29:10 2013
Return-Path: <owner-svn-src-head@FreeBSD.ORG>
Delivered-To: svn-src-head@freebsd.org
Received: from mx1.freebsd.org (mx1.FreeBSD.org [8.8.178.115])
 by hub.freebsd.org (Postfix) with ESMTP id 0A209E51;
 Sun, 12 May 2013 16:29:10 +0000 (UTC)
 (envelope-from markj@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 by mx1.freebsd.org (Postfix) with ESMTP id F083522A;
 Sun, 12 May 2013 16:29:09 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.6/8.14.6) with ESMTP id r4CGT9L7078492;
 Sun, 12 May 2013 16:29:09 GMT (envelope-from markj@svn.freebsd.org)
Received: (from markj@localhost)
 by svn.freebsd.org (8.14.6/8.14.5/Submit) id r4CGT9uT078490;
 Sun, 12 May 2013 16:29:09 GMT (envelope-from markj@svn.freebsd.org)
Message-Id: <201305121629.r4CGT9uT078490@svn.freebsd.org>
From: Mark Johnston <markj@FreeBSD.org>
Date: Sun, 12 May 2013 16:29:09 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r250575 -
 head/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/pragma
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-head@freebsd.org
X-Mailman-Version: 2.1.14
Precedence: list
List-Id: SVN commit messages for the src tree for head/-current
 <svn-src-head.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-src-head>,
 <mailto:svn-src-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-head>
List-Post: <mailto:svn-src-head@freebsd.org>
List-Help: <mailto:svn-src-head-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-head>,
 <mailto:svn-src-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sun, 12 May 2013 16:29:10 -0000

Author: markj
Date: Sun May 12 16:29:09 2013
New Revision: 250575
URL: http://svnweb.freebsd.org/changeset/base/250575

Log:
  head -n doesn't take negative arguments on FreeBSD, so instead use sed '$d'
  to remove the last line of a file.

Modified:
  head/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/pragma/tst.temporal.ksh
  head/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/pragma/tst.temporal2.ksh

Modified: head/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/pragma/tst.temporal.ksh
==============================================================================
--- head/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/pragma/tst.temporal.ksh	Sun May 12 16:26:33 2013	(r250574)
+++ head/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/pragma/tst.temporal.ksh	Sun May 12 16:29:09 2013	(r250575)
@@ -73,8 +73,8 @@ if [ "$status" -ne 0 ]; then
 fi
 
 # dtrace outputs a blank line at the end, which will sort to the beginning,
-# so use head to remove the blank line.
-head -n -1 $file > $file.2
+# so use sed to remove the blank line.
+sed '$d' $file > $file.2
 
 sort -n $file.2 | diff $file.2 -
 status=$?

Modified: head/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/pragma/tst.temporal2.ksh
==============================================================================
--- head/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/pragma/tst.temporal2.ksh	Sun May 12 16:26:33 2013	(r250574)
+++ head/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/pragma/tst.temporal2.ksh	Sun May 12 16:29:09 2013	(r250575)
@@ -89,8 +89,8 @@ if [ "$status" -ne 0 ]; then
 fi
 
 # dtrace outputs a blank line at the end, which will sort to the beginning,
-# so use grep to remove the blank line.
-head -n -1 $file > $file.2
+# so use sed to remove the blank line.
+sed '$d' $file > $file.2
 
 sort -n $file.2 | diff $file.2 -
 status=$?