From owner-svn-src-head@freebsd.org Sat Sep 9 06:24:22 2017 Return-Path: Delivered-To: svn-src-head@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 6B169E05730; Sat, 9 Sep 2017 06:24:22 +0000 (UTC) (envelope-from ngie@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 38CBB81AAE; Sat, 9 Sep 2017 06:24:22 +0000 (UTC) (envelope-from ngie@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id v896OL6S059877; Sat, 9 Sep 2017 06:24:21 GMT (envelope-from ngie@FreeBSD.org) Received: (from ngie@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id v896OLjN059876; Sat, 9 Sep 2017 06:24:21 GMT (envelope-from ngie@FreeBSD.org) Message-Id: <201709090624.v896OLjN059876@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: ngie set sender to ngie@FreeBSD.org using -f From: Ngie Cooper Date: Sat, 9 Sep 2017 06:24:21 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r323348 - head/usr.bin/tail/tests X-SVN-Group: head X-SVN-Commit-Author: ngie X-SVN-Commit-Paths: head/usr.bin/tail/tests X-SVN-Commit-Revision: 323348 X-SVN-Commit-Repository: base 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.23 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 09 Sep 2017 06:24:22 -0000 Author: ngie Date: Sat Sep 9 06:24:21 2017 New Revision: 323348 URL: https://svnweb.freebsd.org/changeset/base/323348 Log: Unbreak :broken_pipe - Capture exit code in pipeline and test in output. - Drop awk use in favor of `sleep 2`. This helps guarantee the EPIPE behavior without the potential race. Modified: head/usr.bin/tail/tests/tail_test.sh Modified: head/usr.bin/tail/tests/tail_test.sh ============================================================================== --- head/usr.bin/tail/tests/tail_test.sh Sat Sep 9 06:04:05 2017 (r323347) +++ head/usr.bin/tail/tests/tail_test.sh Sat Sep 9 06:24:21 2017 (r323348) @@ -222,10 +222,10 @@ broken_pipe_head() } broken_pipe_body() { - atf_expect_fail "Can't seem to get testcase to work in test environment. Reproduces easily in interactive shell." - atf_check -o save:ints seq -f '%128g' 1 1000 - atf_check -s exit:1 -o ignore -e "inline:tail: stdout" tail -n 856 ints | awk '{ exit }' + atf_check -s ignore \ + -e "inline:tail: stdout\nexit code: 1\n" \ + -x '(tail -n 856 ints; echo exit code: $? >&2) | sleep 2' } @@ -243,5 +243,5 @@ atf_init_test_cases() atf_add_test_case longfile_rc135782 atf_add_test_case longfile_rc145782_longlines atf_add_test_case longfile_rn2500 - #atf_add_test_case broken_pipe + atf_add_test_case broken_pipe }