From mboxrd@z Thu Jan 1 00:00:00 1970 X-Spam-Checker-Version: SpamAssassin 3.4.4 (2020-01-24) on inbox.vuxu.org X-Spam-Level: X-Spam-Status: No, score=-3.4 required=5.0 tests=DKIM_SIGNED,DKIM_VALID, DKIM_VALID_AU,MAILING_LIST_MULTI,RCVD_IN_DNSWL_MED autolearn=ham autolearn_force=no version=3.4.4 Received: (qmail 31928 invoked from network); 9 Nov 2022 03:30:00 -0000 Received: from zero.zsh.org (2a02:898:31:0:48:4558:7a:7368) by inbox.vuxu.org with ESMTPUTF8; 9 Nov 2022 03:30:00 -0000 ARC-Seal: i=1; cv=none; a=rsa-sha256; d=zsh.org; s=rsa-20210803; t=1667964600; b=hJZrTodEclyxFVfp+jB7g8ge8UKIJ+ObDucv0knwdv1O5B5M19wndDZwLRxJT4CZSSpWd3QoYv +lFRrDpbDVn7pgTM9njFmr8fkQhEkUQgp79NZDhYkkx5yVBtZOoFnYgO/dCsNMAyiMNN7WCcRo iKDXzSbGs6cGTJIfhVCMQ7vbFdAwX1ZTLdAq9hKnqo8VjPcNSmt+P31ZTGgaVdeCl9hP3cdgLZ 3ekxvGQ71UCfZplh0XooSBFtBSAkdIId2oUrwS42COmvW6FhPF556yk+TTf/sr/GdUVBWVxZYy Y9F4rGMPSH49Ii3N/6SEjsrEGdqGo5VdWdImM8cN43Jcmw==; ARC-Authentication-Results: i=1; zsh.org; iprev=pass (iris.zentaur.org) smtp.remote-ip=198.58.127.206; dkim=pass header.d=zentaur.org header.s=dkim20200120 header.a=rsa-sha256; dmarc=pass header.from=zentaur.org; arc=none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed; d=zsh.org; s=rsa-20210803; t=1667964600; bh=fjwp6nPBk3krcax0V9fRpNZdbd97cxAEKv8U4mIOXgA=; h=List-Archive:List-Owner:List-Post:List-Unsubscribe:List-Subscribe:List-Help: List-Id:Sender:In-Reply-To:From:References:To:Subject:MIME-Version:Date: Message-ID:Content-Type:DKIM-Signature:DKIM-Signature; b=QnjHTYdqvRe65zDifbgf0oxVvRwHxSXRSrAbG7Ug2EuNzQ5i61AJk+1D++6UGHwGjTt1LFJFmg tkZqVcZua/Dmg7G1iSTIX16Mg304TCvBhR/bQc/Y7w0sEWSMLhXTgJ6TrN4cvHVJ0MYD2BIFIx FvRSST0i56GDwxKYfKkHdjEGt0ai7MxhtOeoYcMj7R9DT3sfEa4JpdnHlcjJ7Il3dxhiQlFOBO mzn+pcbZdS2rRGCPCnjNNcBNH5q5NhO5403rca73fbLwJyEaQzEb2NPM66k5yMhbyLE457kqy2 74qlywZ+xmqSpB3GShZuRTIGnXkCZzuKi/MpHrtEfpQPPA==; DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=zsh.org; s=rsa-20210803; h=List-Archive:List-Owner:List-Post:List-Unsubscribe: List-Subscribe:List-Help:List-Id:Sender:In-Reply-To:From:References:To: Subject:MIME-Version:Date:Message-ID:Content-Type:Reply-To:Cc: Content-Transfer-Encoding:Content-ID:Content-Description:Resent-Date: Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID; bh=fjwp6nPBk3krcax0V9fRpNZdbd97cxAEKv8U4mIOXgA=; b=b1Kg1cnTyDkhEUKwDhpTD8xReI MFdhT8099bhfy9eV58YDLJAiyL6YDS9/0v8YWNjJR3FE/vthcEc0GIPmmOYNhfwYe9VDQHnv3UHrb xjIm+qUY5C3/13wcmVCgp9AIfnrI7yJL1Pq85LBDYrNn8tpLi7EZ/p39aoiy+kgiimueVpvKUSa7h Bga6s0AhTc/zn9O5g0h3CQwX8e3TGawXp4iP0D93fXUofr/Hqt7Q0V5GjPd+Hno5+Gz9B2rZSUqxQ GSb+/LeqYhL++yvaC+Dc4s9wDZF8vjx3hHKBxavvgjIEKw/xLK2mLPnzpxw9GM/vI5A9qgsI9DKe/ DpCpuSPQ==; Received: by zero.zsh.org with local id 1osbmp-0003Ck-Ex; Wed, 09 Nov 2022 03:29:59 +0000 Authentication-Results: zsh.org; iprev=pass (iris.zentaur.org) smtp.remote-ip=198.58.127.206; dkim=pass header.d=zentaur.org header.s=dkim20200120 header.a=rsa-sha256; dmarc=pass header.from=zentaur.org; arc=none Received: from iris.zentaur.org ([198.58.127.206]:53872) by zero.zsh.org with esmtps (TLS1.2:ECDHE-RSA-AES256-GCM-SHA384:256) id 1osbmA-0002rR-QA; Wed, 09 Nov 2022 03:29:21 +0000 Received: from iris.zentaur.org (localhost [127.0.0.1]) by iris.zentaur.org (Postfix) with ESMTP id 4N6VnT1qLbz3wZj for ; Wed, 9 Nov 2022 03:29:17 +0000 (UTC) Authentication-Results: iris.zentaur.org (amavisd-new); dkim=pass (2048-bit key) reason="pass (just generated, assumed good)" header.d=zentaur.org DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=zentaur.org; h= in-reply-to:from:from:references:to:content-language:subject :subject:user-agent:mime-version:date:date:message-id :content-type:content-type; s=dkim20200120; t=1667964555; x= 1667968156; bh=fjwp6nPBk3krcax0V9fRpNZdbd97cxAEKv8U4mIOXgA=; b=p zxWnDlquCXAhmC8/VsX2EKGkI1OZTl/odEJrGHWhDrWd+yI6MkiTVeF2m3Z94qRI 9bbKpredmm6W24lrv4xrNkrwQup86CtcRJ9PvKnTkpTQyGMkvuv5i1J4ID7qG5ii R2staSEGC6+0k903fnrxSm0za80TULZnrV2vPPI2GG4V/tWEQschroBlcLQO+0+V vaQuTcf4483oXtXvfAbDpvHUfuBp8Fh7YAPTENoCEmlVZ38TYnMttEeNjMIaLN/k 6Hsc/egYLlrxKYP60sQ6Nj3LL1JF5BjVvjF2qidjpoqogc+R5jIqLP0bcSoDFJHo Ymnq1otqy5sL0LajC5G6Q== X-Virus-Scanned: amavisd-new at iris.zentaur.org Received: from iris.zentaur.org ([127.0.0.1]) by iris.zentaur.org (iris.zentaur.org [127.0.0.1]) (amavisd-new, port 10026) with ESMTP id pM4yL06ntWMe for ; Wed, 9 Nov 2022 03:29:15 +0000 (UTC) Received: from [192.168.72.136] (unknown [136.50.213.220]) by iris.zentaur.org (Postfix) with ESMTPSA id 4N6VnR4zrcz3wZb for ; Wed, 9 Nov 2022 03:29:15 +0000 (UTC) Content-Type: multipart/mixed; boundary="------------cMeu7DuvW2XUNNcPHbPSYWZV" Message-ID: Date: Tue, 8 Nov 2022 21:29:04 -0600 MIME-Version: 1.0 User-Agent: Mozilla/5.0 (Windows NT 10.0; Win64; x64; rv:102.0) Gecko/20100101 Thunderbird/102.3.3 Subject: [PATCH] diff for test harness (was: There seems to be a problem with the test harness on Solaris 11.4) Content-Language: en-US To: zsh-workers@zsh.org References: <661bf664-e751-6c2a-0562-46f0e7caf9cd@zentaur.org> From: Clinton Bunch In-Reply-To: <661bf664-e751-6c2a-0562-46f0e7caf9cd@zentaur.org> X-Antivirus: Avast (VPS 221108-6, 11/8/2022), Outbound message X-Antivirus-Status: Clean X-Seq: 50918 Archived-At: X-Loop: zsh-workers@zsh.org Errors-To: zsh-workers-owner@zsh.org Precedence: list Precedence: bulk Sender: zsh-workers-request@zsh.org X-no-archive: yes List-Id: List-Help: , List-Subscribe: , List-Unsubscribe: , List-Post: List-Owner: List-Archive: This is a multi-part message in MIME format. --------------cMeu7DuvW2XUNNcPHbPSYWZV Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: quoted-printable On 11/7/2022 1:39 PM, Clinton Bunch wrote: > On 11/6/2022 1:32 PM, Clinton Bunch wrote: >> On 11/6/2022 1:09 PM, Bart Schaefer wrote: >>> On Sun, Nov 6, 2022 at 10:35 AM Clinton Bunch =20 >>> wrote: >>>> Solaris 11.4 at least also has GNU diff as gdiff. >>> Use of "diff -a" hasn't changed since at least 2017.=C2=A0 Is it poss= ible >>> that there's been a default (or your own) PATH change causing the >>> POSIX diff to be found in preference? >>> >> >> >> > I'm working on a patch to check if diff supports -a, check if gdiff is=20 > in the path.=C2=A0 If both of those fail, do we want to run without -a = or=20 > abort and kindly suggest they install GNU diff? > Here's a patch that has configure check for an appropriate diff in the=20 path and if it fails to find one runs diff without -a in the test harness --------------cMeu7DuvW2XUNNcPHbPSYWZV Content-Type: text/plain; charset=UTF-8; name="zsh-diff-a.patch" Content-Disposition: attachment; filename="zsh-diff-a.patch" Content-Transfer-Encoding: base64 ZGlmZiAtLWdpdCBhL0NvbmZpZy9kZWZzLm1rLmluIGIvQ29uZmlnL2RlZnMubWsuaW4KaW5k ZXggMmJjMTc0ODJhLi5jOTc5MzA3ZjcgMTAwNjQ0Ci0tLSBhL0NvbmZpZy9kZWZzLm1rLmlu CisrKyBiL0NvbmZpZy9kZWZzLm1rLmluCkBAIC03NSw2ICs3NSw3IEBAIElNUE9QVCAgICAg ICAgICA9IEBJTVBPUFRACiAKICMgdXRpbGl0aWVzCiBBV0sgICAgICAgICAgICAgPSBAQVdL QAorRElGRiAgICAgICAgICAgID0gQERJRkZACiBBTlNJMktOUiAgICAgICAgPSBAQU5TSTJL TlJACiBZT0RMICAgICAgICAgICAgPSBAWU9ETEAgQFlPRExfT1BUSU9OU0AKIFlPREwyVFhU ICAgICAgICA9IEBZT0RMQDJ0eHQKZGlmZiAtLWdpdCBhL1Rlc3QvTWFrZWZpbGUuaW4gYi9U ZXN0L01ha2VmaWxlLmluCmluZGV4IDA5ZjM3YmY1My4uNjM2NzQ2YTQ1IDEwMDY0NAotLS0g YS9UZXN0L01ha2VmaWxlLmluCisrKyBiL1Rlc3QvTWFrZWZpbGUuaW4KQEAgLTUzLDYgKzUz LDcgQEAgY2hlY2sgdGVzdDoKIAlpZiBaVFNUX3Rlc3RsaXN0PSJgZm9yIGYgaW4gJChzZGly KS8kKFRFU1ROVU0pKi56dHN0OyBcCiAgICAgICAgICAgIGRvIGVjaG8gJCRmOyBkb25lYCIg XAogCSBaVFNUX3NyY2Rpcj0iJChzZGlyKSIgXAorCSBaVFNUX2RpZmZfcGc9IiQoRElGRiki IFwKIAkgWlRTVF9leGU9JChkaXJfdG9wKS9TcmMvenNoQEVYRUVYVEAgXAogCSAkKGRpcl90 b3ApL1NyYy96c2hARVhFRVhUQCArWiAtZiAkKHNkaXIpLyQkWlRTVF9oYW5kbGVyOyB0aGVu IFwKIAkgc3RhdD0wOyBcCmRpZmYgLS1naXQgYS9UZXN0L3p0c3QuenNoIGIvVGVzdC96dHN0 LnpzaAppbmRleCBlYTFiMDE2ZDUuLjk2YTEzODQ4MyAxMDA3NTUKLS0tIGEvVGVzdC96dHN0 LnpzaAorKysgYi9UZXN0L3p0c3QuenNoCkBAIC0zODIsNyArMzgyLDcgQEAgWlRTVF9kaWZm KCkgewogICAgICAgZGlmZl9yZXQ9MQogICAgIGZpCiAgIGVsc2UKLSAgICBkaWZmX291dD0k KGRpZmYgLWEgIiRAIikKKyAgICBkaWZmX291dD0kKCR7PVpUU1RfZGlmZl9wZ30gICIkQCIp CiAgICAgZGlmZl9yZXQ9IiQ/IgogICAgIGlmIFtbICIkZGlmZl9yZXQiICE9ICIwIiBdXTsg dGhlbgogICAgICAgcHJpbnQgLXIgLS0gIiRkaWZmX291dCIKZGlmZiAtLWdpdCBhL2NvbmZp Z3VyZS5hYyBiL2NvbmZpZ3VyZS5hYwppbmRleCAwNzQxNDFkMzguLjdlOTQyNjE0OCAxMDA2 NDQKLS0tIGEvY29uZmlndXJlLmFjCisrKyBiL2NvbmZpZ3VyZS5hYwpAQCAtNjExLDYgKzYx MSwxOSBAQCBBQ19QUk9HX0FXSyAgICAgICAgICAgICAgICAgZG5sIENoZWNrIGZvciBtYXdr LGdhd2ssbmF3aywgdGhlbiBhd2suCiBBQ19QUk9HX0xOICAgICAgICAgICAgICAgICAgZG5s IENoZWNrIGZvciB3b3JraW5nIGxuLCBmb3IgIm1ha2UgaW5zdGFsbCIKIEFDX1BST0dfTE5f UyAgICAgICAgICAgICAgICBkbmwgVXNlIGxuIC1zL2xuL2NwIGZvciAibWFrZSBpbnN0YWxs LnJ1bmhlbHAiCiBBQ19QUk9HX0VHUkVQICAgICAgICAgICAgICAgZG5sIHNldHMgJEVHUkVQ IHRvIGdyZXAgLUUgb3IgZWdyZXAKKworZG5sIGNoZWNrIGZvciBkaWZmIHRoYXQgc3VwcG9y dHMgLWEKK0FDX0NBQ0hFX0NIRUNLKFtmb3IgZGlmZiB0aGF0IHN1cHBvcnRzIC1hXSxbYWNf Y3ZfcGF0aF9ESUZGXSwKKyAgICBbQUNfUEFUSF9QUk9HU19GRUFUVVJFX0NIRUNLKFtESUZG XSxbZGlmZiBnZGlmZl0sCisgICAgICAgW1sKKwkgICAgZWNobyAiYWJjZGVmIiA+IGNvbmZ0 ZXN0LiQkCisJICAgIGVjaG8gImFiY2RlZiIgPiBjb25mdGVzdDIuJCQKKwkgICAgJGFjX3Bh dGhfRElGRiAtYSBjb25mdGVzdC4kJCBjb25mdGVzdDIuJCQgPiAvZGV2L251bGwgMj4mMQor CSAgICB0ZXN0ICJ4JD8iID0geDAgXAorICAgICAgICAgICAgJiYgYWNfY3ZfcGF0aF9ESUZG PSIkYWNfcGF0aF9ESUZGIC1hIiBhY19wYXRoX0RJRkZfZm91bmQ9Ol1dLAorCVthY19jdl9w YXRoX0RJRkY9ImRpZmYiXSldKQorQUNfU1VCU1QoW0RJRkZdLFskYWNfY3ZfcGF0aF9ESUZG XSkKKwogQUNfQ0hFQ0tfUFJPR1MoW1lPRExdLCBbeW9kbF0sIFs6IHlvZGxdKQogCiBZT0RM X09QVElPTlM9JycK --------------cMeu7DuvW2XUNNcPHbPSYWZV--