Date: Fri, 21 Aug 2015 18:42:58 +0000 (UTC) From: Garrett Cooper <ngie@FreeBSD.org> To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r287005 - head/usr.bin/xargs/tests Message-ID: <201508211842.t7LIgwam026747@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
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')
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201508211842.t7LIgwam026747>