From owner-dev-commits-src-branches@freebsd.org Wed May 5 08:38:18 2021 Return-Path: Delivered-To: dev-commits-src-branches@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id 1B36363599F; Wed, 5 May 2021 08:38:18 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4FZqqG00mgz3LBt; Wed, 5 May 2021 08:38:18 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id E52C821BD8; Wed, 5 May 2021 08:38:17 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 1458cHxE043618; Wed, 5 May 2021 08:38:17 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 1458cHha043617; Wed, 5 May 2021 08:38:17 GMT (envelope-from git) Date: Wed, 5 May 2021 08:38:17 GMT Message-Id: <202105050838.1458cHha043617@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Baptiste Daroussin Subject: git: 07d72ca90585 - stable/13 - diff: add a test case about the non regular file support MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: bapt X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: 07d72ca90585ee98dbdd8f4fd2bb01bc2329d99c Auto-Submitted: auto-generated X-BeenThere: dev-commits-src-branches@freebsd.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: Commits to the stable branches of the FreeBSD src repository List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 05 May 2021 08:38:18 -0000 The branch stable/13 has been updated by bapt: URL: https://cgit.FreeBSD.org/src/commit/?id=07d72ca90585ee98dbdd8f4fd2bb01bc2329d99c commit 07d72ca90585ee98dbdd8f4fd2bb01bc2329d99c Author: Baptiste Daroussin AuthorDate: 2021-01-26 10:38:36 +0000 Commit: Baptiste Daroussin CommitDate: 2021-05-05 08:37:07 +0000 diff: add a test case about the non regular file support (cherry picked from commit c440e7870a020546ad241848e2ff8e9cb27a3073) --- usr.bin/diff/tests/diff_test.sh | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/usr.bin/diff/tests/diff_test.sh b/usr.bin/diff/tests/diff_test.sh index 6da2bbaea34d..60b56f0d9067 100755 --- a/usr.bin/diff/tests/diff_test.sh +++ b/usr.bin/diff/tests/diff_test.sh @@ -16,6 +16,7 @@ atf_test_case tabsize atf_test_case conflicting_format atf_test_case label atf_test_case report_identical +atf_test_case non_regular_file simple_body() { @@ -236,6 +237,19 @@ report_identical_body() -o empty diff -s A B } +non_regular_file_body() +{ + printf "\tA\n" > A + mkfifo B + printf "\tA\n" > B & + + atf_check diff A B + printf "\tB\n" > B & + atf_check -s exit:1 \ + -o inline:"--- A\n+++ B\n@@ -1 +1 @@\n-\tA\n+\tB\n" \ + diff --label A --label B -u A B +} + atf_init_test_cases() { atf_add_test_case simple @@ -254,4 +268,5 @@ atf_init_test_cases() atf_add_test_case conflicting_format atf_add_test_case label atf_add_test_case report_identical + atf_add_test_case non_regular_file }