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.8 required=3.0 tests=AWL,BAYES_00,DKIM_INVALID, DKIM_SIGNED,HEADER_FROM_DIFFERENT_DOMAINS,MAILING_LIST_MULTI, RCVD_IN_DNSWL_MED,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 2A4F51F8C4 for ; Sun, 7 Feb 2021 16:23:24 +0000 (UTC) Received: from localhost ([::1]:53582 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1l8mqH-0001Pl-QS for normalperson@yhbt.net; Sun, 07 Feb 2021 11:23:21 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:34700) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1l8mq6-0001OL-6o for bug-gnulib@gnu.org; Sun, 07 Feb 2021 11:23:10 -0500 Received: from mo4-p00-ob.smtp.rzone.de ([85.215.255.24]:30401) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1l8mq2-0002AP-3r for bug-gnulib@gnu.org; Sun, 07 Feb 2021 11:23:10 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; t=1612714977; s=strato-dkim-0002; d=clisp.org; h=Message-ID:Date:Subject:To:From:Cc:Date:From:Subject:Sender; bh=noagF7S8LMNnF3VBy0kFQc/zVnj/NSPWon5xmUEd+Oc=; b=A6MS9rNCS1KLieWuvQQsWsxiNric9MR14qmFdQM/MO5xzcbo0znQTcoSZJEfgKVMUf QZfFT8FDCHmx5n7I6dLKAACQgUzW+x2FCl9aBrR5fjbcgci57owrBuoKCCoY3OyS6LCu YbtjQLiVV0bL/6aR/XvjPZopa068n+zo2pzoTowAsDwmlKHfhqeC9MAHGzRZClmNLg+a wKymIzv1zlDy4XHrY/xEeKejO6nSagyZt1A45+iEdpCePEjDD6FJOtTfVp2Qql2xtXtx L2z/+lhQqcVgxrPDo12e6cDAc45Fhvcsnds7c8396Uyr3RJvKn7ZN19OQ+eTO3z5qWpo 1ldg== X-RZG-AUTH: ":Ln4Re0+Ic/6oZXR1YgKryK8brlshOcZlIWs+iCP5vnk6shH+AHjwLuWOH6f3zZ9W" X-RZG-CLASS-ID: mo00 Received: from bruno.haible.de by smtp.strato.de (RZmta 47.17.1 DYNA|AUTH) with ESMTPSA id e06c68x17GMu0Cs (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); Sun, 7 Feb 2021 17:22:56 +0100 (CET) From: Bruno Haible To: bug-gnulib@gnu.org Subject: c32is*: Avoid test failures on MidnightBSD Date: Sun, 07 Feb 2021 17:22:56 +0100 Message-ID: <115196926.zuznfjxeYG@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=85.215.255.24; envelope-from=bruno@clisp.org; helo=mo4-p00-ob.smtp.rzone.de X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 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_NONE=-0.0001, RCVD_IN_MSPIKE_H2=-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" MidnightBSD is a FreeBSD derivative [1]. At the uname level, it identifies itself as "MidnightBSD", but on the preprocessor level it merely defines __FreeBSD__. I see a couple of test failures on MidnightBSD 1.1: FAIL: test-c32isalnum.sh ======================== ../../gltests/test-c32isalnum.c:155: assertion 'is != 0' failed Abort trap FAIL test-c32isalnum.sh (exit status: 1) FAIL: test-c32isalpha.sh ======================== ../../gltests/test-c32isalpha.c:153: assertion 'is != 0' failed Abort trap FAIL test-c32isalpha.sh (exit status: 1) FAIL: test-c32isblank.sh ======================== ../../gltests/test-c32isblank.c:107: assertion 'is == 0' failed Abort trap FAIL test-c32isblank.sh (exit status: 1) FAIL: test-c32islower.sh ======================== ../../gltests/test-c32islower.c:162: assertion 'is != 0' failed Abort trap FAIL test-c32islower.sh (exit status: 1) FAIL: test-c32isupper.sh ======================== ../../gltests/test-c32isupper.c:157: assertion 'is != 0' failed Abort trap FAIL test-c32isupper.sh (exit status: 1) This patch fixes them. [1] https://en.wikipedia.org/wiki/MidnightBSD 2021-02-07 Bruno Haible c32is*: Avoid test failures on MidnightBSD. * tests/test-c32isalnum.c (main): On FreeBSD, disable tests that fail on MidnightBSD 1.1. * tests/test-c32isalpha.c (main): Likewise. * tests/test-c32isblank.c (main): Likewise. * tests/test-c32islower.c (main): Likewise. * tests/test-c32isupper.c (main): Likewise. diff --git a/tests/test-c32isalnum.c b/tests/test-c32isalnum.c index 3720810..8f61ad9 100644 --- a/tests/test-c32isalnum.c +++ b/tests/test-c32isalnum.c @@ -149,7 +149,7 @@ main (int argc, char *argv[]) /* U+00D7 MULTIPLICATION SIGN */ is = for_character ("\241\337", 2); ASSERT (is == 0); - #if !(defined __APPLE__ && defined __MACH__) + #if !((defined __APPLE__ && defined __MACH__) || defined __FreeBSD__) /* U+00D8 LATIN CAPITAL LETTER O WITH STROKE */ is = for_character ("\217\251\254", 3); ASSERT (is != 0); @@ -165,7 +165,7 @@ main (int argc, char *argv[]) is = for_character ("\243\261", 2); ASSERT (is != 0); #endif - #if !((defined __APPLE__ && defined __MACH__) || defined __NetBSD__) + #if !((defined __APPLE__ && defined __MACH__) || defined __FreeBSD__ || defined __NetBSD__) /* U+FF4D FULLWIDTH LATIN SMALL LETTER M */ is = for_character ("\243\355", 2); ASSERT (is != 0); diff --git a/tests/test-c32isalpha.c b/tests/test-c32isalpha.c index 5be0178..9b07186 100644 --- a/tests/test-c32isalpha.c +++ b/tests/test-c32isalpha.c @@ -147,7 +147,7 @@ main (int argc, char *argv[]) /* U+00D7 MULTIPLICATION SIGN */ is = for_character ("\241\337", 2); ASSERT (is == 0); - #if !(defined __APPLE__ && defined __MACH__) + #if !((defined __APPLE__ && defined __MACH__) || defined __FreeBSD__) /* U+00D8 LATIN CAPITAL LETTER O WITH STROKE */ is = for_character ("\217\251\254", 3); ASSERT (is != 0); @@ -163,7 +163,7 @@ main (int argc, char *argv[]) is = for_character ("\243\261", 2); ASSERT (is == 0); #endif - #if !((defined __APPLE__ && defined __MACH__) || defined __NetBSD__) + #if !((defined __APPLE__ && defined __MACH__) || defined __FreeBSD__ || defined __NetBSD__) /* U+FF4D FULLWIDTH LATIN SMALL LETTER M */ is = for_character ("\243\355", 2); ASSERT (is != 0); diff --git a/tests/test-c32isblank.c b/tests/test-c32isblank.c index 984d0d8..a615388 100644 --- a/tests/test-c32isblank.c +++ b/tests/test-c32isblank.c @@ -74,7 +74,7 @@ main (int argc, char *argv[]) switch (c) { case '\t': - #if !defined __NetBSD__ + #if !(defined __FreeBSD__ || defined __NetBSD__) case '\v': #endif case '\f': diff --git a/tests/test-c32islower.c b/tests/test-c32islower.c index 8bcffaf..0b811fd 100644 --- a/tests/test-c32islower.c +++ b/tests/test-c32islower.c @@ -156,12 +156,12 @@ main (int argc, char *argv[]) /* U+00C9 LATIN CAPITAL LETTER E WITH ACUTE */ is = for_character ("\217\252\261", 3); ASSERT (is == 0); - #if !((defined __APPLE__ && defined __MACH__) || defined __NetBSD__ || defined __CYGWIN__) + #if !((defined __APPLE__ && defined __MACH__) || defined __FreeBSD__ || defined __NetBSD__ || defined __CYGWIN__) /* U+00DF LATIN SMALL LETTER SHARP S */ is = for_character ("\217\251\316", 3); ASSERT (is != 0); #endif - #if !((defined __APPLE__ && defined __MACH__) || defined __NetBSD__) + #if !((defined __APPLE__ && defined __MACH__) || defined __FreeBSD__ || defined __NetBSD__) /* U+00E9 LATIN SMALL LETTER E WITH ACUTE */ is = for_character ("\217\253\261", 3); ASSERT (is != 0); @@ -172,7 +172,7 @@ main (int argc, char *argv[]) /* U+0141 LATIN CAPITAL LETTER L WITH STROKE */ is = for_character ("\217\251\250", 3); ASSERT (is == 0); - #if !((defined __APPLE__ && defined __MACH__) || defined __NetBSD__) + #if !((defined __APPLE__ && defined __MACH__) || defined __FreeBSD__ || defined __NetBSD__) /* U+0142 LATIN SMALL LETTER L WITH STROKE */ is = for_character ("\217\251\310", 3); ASSERT (is != 0); @@ -269,7 +269,7 @@ main (int argc, char *argv[]) /* U+00B2 SUPERSCRIPT TWO */ is = for_character ("\201\060\205\065", 4); ASSERT (is == 0); - #if !(defined __GLIBC__ || (defined __APPLE__ && defined __MACH__) || defined __NetBSD__) + #if !(defined __GLIBC__ || (defined __APPLE__ && defined __MACH__) || defined __FreeBSD__ || defined __NetBSD__) /* U+00B5 MICRO SIGN */ is = for_character ("\201\060\205\070", 4); ASSERT (is == 0); diff --git a/tests/test-c32isupper.c b/tests/test-c32isupper.c index 05b969d..5604a8f 100644 --- a/tests/test-c32isupper.c +++ b/tests/test-c32isupper.c @@ -151,7 +151,7 @@ main (int argc, char *argv[]) case '2': /* Locale encoding is EUC-JP. */ { - #if !((defined __APPLE__ && defined __MACH__) || defined __NetBSD__) + #if !((defined __APPLE__ && defined __MACH__) || defined __FreeBSD__ || defined __NetBSD__) /* U+00C9 LATIN CAPITAL LETTER E WITH ACUTE */ is = for_character ("\217\252\261", 3); ASSERT (is != 0); @@ -165,7 +165,7 @@ main (int argc, char *argv[]) /* U+00FF LATIN SMALL LETTER Y WITH DIAERESIS */ is = for_character ("\217\253\363", 3); ASSERT (is == 0); - #if !((defined __APPLE__ && defined __MACH__) || defined __NetBSD__) + #if !((defined __APPLE__ && defined __MACH__) || defined __FreeBSD__ || defined __NetBSD__) /* U+0141 LATIN CAPITAL LETTER L WITH STROKE */ is = for_character ("\217\251\250", 3); ASSERT (is != 0);