From owner-svn-src-all@freebsd.org  Fri Aug 21 18:42:59 2015
Return-Path: <owner-svn-src-all@freebsd.org>
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 26CE99BF656;
 Fri, 21 Aug 2015 18:42:59 +0000 (UTC)
 (envelope-from ngie@FreeBSD.org)
Received: from repo.freebsd.org (repo.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 17B1989E;
 Fri, 21 Aug 2015 18:42:59 +0000 (UTC)
 (envelope-from ngie@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.70])
 by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id t7LIgwi1026749;
 Fri, 21 Aug 2015 18:42:58 GMT (envelope-from ngie@FreeBSD.org)
Received: (from ngie@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id t7LIgwam026747;
 Fri, 21 Aug 2015 18:42:58 GMT (envelope-from ngie@FreeBSD.org)
Message-Id: <201508211842.t7LIgwam026747@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: ngie set sender to
 ngie@FreeBSD.org using -f
From: Garrett Cooper <ngie@FreeBSD.org>
Date: Fri, 21 Aug 2015 18:42:58 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r287005 - head/usr.bin/xargs/tests
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.20
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for &quot;
 user&quot; and &quot; projects&quot; \)" <svn-src-all.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-src-all>,
 <mailto:svn-src-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-all/>
List-Post: <mailto:svn-src-all@freebsd.org>
List-Help: <mailto:svn-src-all-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-src-all>,
 <mailto:svn-src-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Fri, 21 Aug 2015 18:42:59 -0000

Author: ngie
Date: Fri Aug 21 18:42:57 2015
New Revision: 287005
URL: https://svnweb.freebsd.org/changeset/base/287005

Log:
  Fix the racy xargs -P0 -n2 test added in r286289
  
  Sort the output obtained from xargs and the expected output
  to ensure the end result versus the input file is stable
  
  Differential Revision: D3432
  Submitted by: Nikolai Lifanov <lifanov@mail.lifanov.com>

Modified:
  head/usr.bin/xargs/tests/regress.n2P0.out
  head/usr.bin/xargs/tests/regress.sh

Modified: head/usr.bin/xargs/tests/regress.n2P0.out
==============================================================================
--- head/usr.bin/xargs/tests/regress.n2P0.out	Fri Aug 21 17:47:17 2015	(r287004)
+++ head/usr.bin/xargs/tests/regress.n2P0.out	Fri Aug 21 18:42:57 2015	(r287005)
@@ -1,4 +1,4 @@
-quick brown
 fox jumped
-over the
 lazy dog
+over the
+quick brown

Modified: head/usr.bin/xargs/tests/regress.sh
==============================================================================
--- head/usr.bin/xargs/tests/regress.sh	Fri Aug 21 17:47:17 2015	(r287004)
+++ head/usr.bin/xargs/tests/regress.sh	Fri Aug 21 18:42:57 2015	(r287005)
@@ -12,7 +12,7 @@ REGRESSION_TEST(`P1', `xargs -P1 echo <$
 REGRESSION_TEST(`R', `xargs -I% -R1 echo The % % % %% % % <${SRCDIR}/regress.in')
 REGRESSION_TEST(`n1', `xargs -n1 echo <${SRCDIR}/regress.in')
 REGRESSION_TEST(`n2', `xargs -n2 echo <${SRCDIR}/regress.in')
-#REGRESSION_TEST(`n2P0',`xargs -n2 -P0 echo <${SRCDIR}/regress.in')
+REGRESSION_TEST(`n2P0',`xargs -n2 -P0 echo <${SRCDIR}/regress.in | sort')
 REGRESSION_TEST(`n3', `xargs -n3 echo <${SRCDIR}/regress.in')
 REGRESSION_TEST(`0', `xargs -0 -n1 echo <${SRCDIR}/regress.0.in')
 REGRESSION_TEST(`0I', `xargs -0 -I% echo The % %% % <${SRCDIR}/regress.0.in')