From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on dcvr.yhbt.net X-Spam-Level: X-Spam-Status: No, score=-3.6 required=3.0 tests=AWL,BAYES_00,DKIM_INVALID, DKIM_SIGNED,HEADER_FROM_DIFFERENT_DOMAINS,MAILING_LIST_MULTI, RCVD_IN_DNSWL_BLOCKED,RCVD_IN_MSPIKE_H4,RCVD_IN_MSPIKE_WL, SPF_HELO_PASS,SPF_PASS shortcircuit=no autolearn=ham autolearn_force=no version=3.4.2 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by dcvr.yhbt.net (Postfix) with ESMTPS id 4ED0B1F4B4 for ; Fri, 1 Jan 2021 00:33:03 +0000 (UTC) Received: from localhost ([::1]:40974 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1kv8NJ-0007EX-Om for normalperson@yhbt.net; Thu, 31 Dec 2020 19:33:01 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:35188) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kv8NG-0007EQ-MG for bug-gnulib@gnu.org; Thu, 31 Dec 2020 19:32:58 -0500 Received: from mo4-p00-ob.smtp.rzone.de ([81.169.146.218]:33782) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kv8NE-0007ft-K3 for bug-gnulib@gnu.org; Thu, 31 Dec 2020 19:32:58 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; t=1609461174; s=strato-dkim-0002; d=clisp.org; h=Message-ID:Date:Subject:To:From:From:Subject:Sender; bh=2J2uEsS5MZRUqZVT++GWrydAzK3ZCmorfYaIoA44xRc=; b=QeBH+wZ5fYHpatXQlidCAPy2OrBkpwAhwfbhuVILvp084Oc4+FNkSuqcfdsM/+abKY kdKZScoSStU8wQwHTrrcwkmCqNvppSFuVrIx/agMZWHDq84R1cv5ntvnKZvols/Z3nRv CwWL1m3XclEt8RO8BWvBgvhtv+0RFPm1Ds/58dW1oKIq+uJYfPVMo/BQKLrVXpqyMk3K Uq87IdR8ijAm2+7r1atWHCzTrh1vY/YWHGswordl7UtidTtfx9/Dx4qSvanvLPwONxjQ ULdoDiv4uf9S6Jx6d+2oCTnG2TvrLKWeLB3Az3PrDJP+y+2ZTzqQGhCze+Net6NNScBI Ek7g== X-RZG-AUTH: ":Ln4Re0+Ic/6oZXR1YgKryK8brlshOcZlIWs+iCP5vnk6shH+AHjwLuWOH6f3z/s=" X-RZG-CLASS-ID: mo00 Received: from bruno.haible.de by smtp.strato.de (RZmta 47.10.7 DYNA|AUTH) with ESMTPSA id e012d5x010WrWiN (using TLSv1 with cipher ECDHE-RSA-AES256-SHA (curve X9_62_prime256v1 with 256 ECDH bits, eq. 3072 bits RSA)) (Client did not present a certificate); Fri, 1 Jan 2021 01:32:53 +0100 (CET) From: Bruno Haible To: bug-gnulib@gnu.org Subject: ptsname_r: Fix test failure on Solaris Date: Fri, 01 Jan 2021 01:32:52 +0100 Message-ID: <2902930.uBPCLKOMD8@omega> User-Agent: KMail/5.1.3 (Linux/4.4.0-197-generic; KDE/5.18.0; x86_64; ; ) MIME-Version: 1.0 Content-Transfer-Encoding: 7Bit Content-Type: text/plain; charset="us-ascii" Received-SPF: none client-ip=81.169.146.218; envelope-from=bruno@clisp.org; helo=mo4-p00-ob.smtp.rzone.de X-Spam_score_int: -27 X-Spam_score: -2.8 X-Spam_bar: -- X-Spam_report: (-2.8 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_LOW=-0.7, RCVD_IN_MSPIKE_H4=0.001, RCVD_IN_MSPIKE_WL=0.001, SPF_HELO_PASS=-0.001, SPF_NONE=0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: bug-gnulib@gnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: Gnulib discussion list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: bug-gnulib-bounces+normalperson=yhbt.net@gnu.org Sender: "bug-gnulib" The ptsname_r test fails on Solaris 11 OpenIndiana and Solaris 11 OmniOS: ../../gltests/test-ptsname_r.c:167: assertion 'result == 0' failed FAIL test-ptsname_r (exit status: 262) This patch fixes it, by removing the test on the major number of the device. This major number is (according to 'ls -l /dev/pts/'): - 24 on Solaris 10, - 221 on Solaris 11.3, - 195 on Solaris OpenIndiana, - 180 on Solaris OmniOS. 2020-12-31 Bruno Haible ptsname_r: Fix test failure on Solaris. * lib/ptsname_r.c (__ptsname_r) [__sun]: Don't test the major number of the device. diff --git a/lib/ptsname_r.c b/lib/ptsname_r.c index 0008b95..c2fc65f 100644 --- a/lib/ptsname_r.c +++ b/lib/ptsname_r.c @@ -97,7 +97,7 @@ __ptsname_r (int fd, char *buf, size_t buflen) # if defined __sun /* Solaris */ if (fstat (fd, &st) < 0) return errno; - if (!(S_ISCHR (st.st_mode) && major (st.st_rdev) == 0)) + if (!S_ISCHR (st.st_mode)) { errno = ENOTTY; return errno;