From owner-svn-src-all@freebsd.org Tue Jan 14 12:12:45 2020 Return-Path: Delivered-To: svn-src-all@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 B61B81E817B; Tue, 14 Jan 2020 12:12:45 +0000 (UTC) (envelope-from lwhsu.freebsd@gmail.com) Received: from mail-yw1-f44.google.com (mail-yw1-f44.google.com [209.85.161.44]) (using TLSv1.3 with cipher TLS_AES_128_GCM_SHA256 (128/128 bits) server-signature RSA-PSS (4096 bits) client-signature RSA-PSS (2048 bits) client-digest SHA256) (Client CN "smtp.gmail.com", Issuer "GTS CA 1O1" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 47xq8s2bSnz440P; Tue, 14 Jan 2020 12:12:45 +0000 (UTC) (envelope-from lwhsu.freebsd@gmail.com) Received: by mail-yw1-f44.google.com with SMTP id v126so8782106ywc.10; Tue, 14 Jan 2020 04:12:45 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:mime-version:references:in-reply-to:from:date :message-id:subject:to:cc; bh=n8T9xQKARHhWMm/neG2g0/AyBBgCELHx7DdT2PvLZxg=; b=lOQOPwQt+pFjw68RxtrHoO6QUVGAqZsinH9iuDu5wHPqlCBIzREQ71FV+pi1ELF7Wi zQ98AA78Vx0rP4Fyan6GdrR3aPjsGCw9btERsRMv7vqecfuQf+Fu6bcCYMGceruN7Q+1 6hOknYNgxZ8glgq9Qc3OqJ47NcSdvpzj4e/5GiLF1GnXJbUcsbF5ToD2+ghe8MWLCNrU QE7u3Y3pQmbNnm+5DQ/Kpv0zG0qVLVGE153AaWWFliWUOj2qffsq2pmvKThpC0zDuOkB EoipsgYns5kDbOq8klpNvVu6lWp6nZtJXqkA0cmxcDQJWVYmrlIISn6vBmB6cA0wgH4A tA1A== X-Gm-Message-State: APjAAAUnNfEoONjfoBntigm0lODiw7W9SmtM6nrMTA61Z2VJsKMB5mit HmXu3bckTUWavxaiexK/5gJJkIHki1og420X5o6wcnPkWBA= X-Google-Smtp-Source: APXvYqz5bu5Gv6X1Vl7qsg0ynjnAuKzBR8oHSg13hiaw4/aaPk3beqbYc4D9mJCEjVPVdFs3GM/8jIxk1kCSecm0xt0= X-Received: by 2002:a25:7255:: with SMTP id n82mr17108050ybc.176.1579003963474; Tue, 14 Jan 2020 04:12:43 -0800 (PST) MIME-Version: 1.0 References: <202001131829.00DITmev016747@repo.freebsd.org> In-Reply-To: <202001131829.00DITmev016747@repo.freebsd.org> From: Li-Wen Hsu Date: Tue, 14 Jan 2020 20:12:31 +0800 Message-ID: Subject: Re: svn commit: r356695 - head/usr.bin/diff To: Mark Johnston Cc: src-committers , svn-src-all , svn-src-head Content-Type: text/plain; charset="UTF-8" X-Rspamd-Queue-Id: 47xq8s2bSnz440P X-Spamd-Bar: ----- Authentication-Results: mx1.freebsd.org; none X-Spamd-Result: default: False [-6.00 / 15.00]; NEURAL_HAM_MEDIUM(-1.00)[-0.996,0]; REPLY(-4.00)[]; TAGGED_FROM(0.00)[]; NEURAL_HAM_LONG(-1.00)[-1.000,0] X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 14 Jan 2020 12:12:45 -0000 On Tue, Jan 14, 2020 at 2:29 AM Mark Johnston wrote: > > Author: markj > Date: Mon Jan 13 18:29:47 2020 > New Revision: 356695 > URL: https://svnweb.freebsd.org/changeset/base/356695 > > Log: > Optimize diff -q. > > Once we know whether the files differ, we don't need to do any further > work. > > PR: 242828 > Submitted by: fehmi noyan isi (original version) > Reviewed by: bapt, kevans > MFC after: 1 week > Differential Revision: https://reviews.freebsd.org/D23152 > > Modified: > head/usr.bin/diff/diffreg.c > > Modified: head/usr.bin/diff/diffreg.c > ============================================================================== > --- head/usr.bin/diff/diffreg.c Mon Jan 13 18:26:27 2020 (r356694) > +++ head/usr.bin/diff/diffreg.c Mon Jan 13 18:29:47 2020 (r356695) > @@ -349,6 +349,11 @@ diffreg(char *file1, char *file2, int flags, int capsi > goto closem; > } > > + if (diff_format == D_BRIEF) { > + rval = D_DIFFER; > + status |= 1; > + goto closem; > + } > if ((flags & D_FORCEASCII) == 0 && > (!asciifile(f1) || !asciifile(f2))) { > rval = D_BINARY; Hi Mark, This one seems breaks test case usr.sbin.etcupdate.fbsdid_test.main: https://ci.freebsd.org/job/FreeBSD-head-amd64-test/13920/testReport/junit/usr.sbin.etcupdate/fbsdid_test/main/ Revert this can get the case pass. Can you check if the code or the test needs to be fixed? Thanks, Li-Wen