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-ASN: AS22989 209.51.188.0/24 X-Spam-Status: No, score=-3.9 required=3.0 tests=AWL,BAYES_00, HEADER_FROM_DIFFERENT_DOMAINS,MAILING_LIST_MULTI,RCVD_IN_DNSWL_MED, SPF_HELO_NONE,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 A76931F463 for ; Sun, 5 Jan 2020 18:31:00 +0000 (UTC) Received: from localhost ([::1]:44286 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1ioAfz-0002KI-EX for normalperson@yhbt.net; Sun, 05 Jan 2020 13:30:59 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:41418) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1ioAft-0002K5-7g for bug-gnulib@gnu.org; Sun, 05 Jan 2020 13:30:55 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1ioAfp-0008MQ-8n for bug-gnulib@gnu.org; Sun, 05 Jan 2020 13:30:53 -0500 Received: from mail-wm1-f48.google.com ([209.85.128.48]:35671) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1ioAfp-0008Lv-1r for bug-gnulib@gnu.org; Sun, 05 Jan 2020 13:30:49 -0500 Received: by mail-wm1-f48.google.com with SMTP id p17so13124148wmb.0 for ; Sun, 05 Jan 2020 10:30:48 -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:from:date:message-id:subject:to; bh=TbqCW1SVduhaxWCQOiCCjpQ37Db2mC/meL4j1H+aek8=; b=o330MCST8eCcVuyi7+OZgl1D6cUzn9ihA7ZD3DqXFxysQkLQkMDEEj0Bm0Cigpg2iY Yx7OyIl/KxRLcfRYT7ZTN+Y5euVEAVaZM7b+eFk345uYeMpuJqBBymgNXaqd1wvIy8E2 e/Kxj0W+MgLq0OGN8K3LO9MQMDqaC+S7+KpGWmoMrfu+iCm8w0OozAARBTiRShz/DJId uWMI646c/ngklAsWebxNKliA8ufJgOzbYWyfqgBPopPkz9lcRhQU1VqtkG0ti5ULLA2C xbEdTgMfyLA/OoXG7QAWwOgZJbQOC8n/SyWJH8PRyqz2tjAtmai8f7ErbWC/9RtOa1Zy Ha5Q== X-Gm-Message-State: APjAAAWcTIBs+3wKV/HyJSXQI+ZUFAJwKhlJuUJd6oEmRSmrb6Lfyb2P +JLXC8mx1aKsy/wGacTgKeZsAE0IaRyA8xctou4CHMhN X-Google-Smtp-Source: APXvYqydcksAKoczUc5eVQQLnyCRFr64m6mby5PldazJlm9vH3nIZ3hqgzMxelQDbz8PnZ/LylfhU4YZZDcrjrgTg/A= X-Received: by 2002:a7b:cf2d:: with SMTP id m13mr30699717wmg.163.1578249046958; Sun, 05 Jan 2020 10:30:46 -0800 (PST) MIME-Version: 1.0 From: Jim Meyering Date: Sun, 5 Jan 2020 10:30:35 -0800 Message-ID: Subject: [PATCH] tests: skip thread-using tests when threading is disabled To: "bug-gnulib@gnu.org List" Content-Type: multipart/mixed; boundary="000000000000cff01d059b68bdfe" X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] [fuzzy] X-Received-From: 209.85.128.48 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" --000000000000cff01d059b68bdfe Content-Type: text/plain; charset="UTF-8" I noticed this while preparing for a new release of sed. I don't like copying the 4-term #if into so many files, but it already appears in ten others. Note that this covers only the gnulib tests used by sed. This probably deserves a full audit and/or auto-run tests with gl_DISABLE_THREADS, but I am stopping with the proposed patch below. ----------- tests: skip thread-using tests when threading is disabled sed's configure.ac specifies gl_DISABLE_THREADS, and that caused three thread-using gnulib tests to fail. Add an #if-guarded exit (77) to each of those, so they are skipped in this case. * tests/test-nl_langinfo-mt.c (main): Exit 77 when threading is disabled. * tests/test-setlocale_null-mt-all.c (main): Likewise. * tests/test-setlocale_null-mt-one.c (main): Likewise. --000000000000cff01d059b68bdfe Content-Type: application/octet-stream; name="gl-mt-skip.diff" Content-Disposition: attachment; filename="gl-mt-skip.diff" Content-Transfer-Encoding: base64 Content-ID: X-Attachment-Id: f_k51ckwy60 RnJvbSAyZjBlNThmOWM2Mjc1NWI2ZWMxOTRkNjM5ODVjNzQzN2JhYzQ4N2Y1IE1vbiBTZXAgMTcg MDA6MDA6MDAgMjAwMQpGcm9tOiBKaW0gTWV5ZXJpbmcgPG1leWVyaW5nQGZiLmNvbT4KRGF0ZTog U3VuLCA1IEphbiAyMDIwIDEwOjI1OjI3IC0wODAwClN1YmplY3Q6IFtQQVRDSF0gdGVzdHM6IHNr aXAgdGhyZWFkLXVzaW5nIHRlc3RzIHdoZW4gdGhyZWFkaW5nIGlzIGRpc2FibGVkCgpzZWQncyBj b25maWd1cmUuYWMgc3BlY2lmaWVzIGdsX0RJU0FCTEVfVEhSRUFEUywgYW5kIHRoYXQgY2F1c2Vk IHRocmVlCnRocmVhZC11c2luZyBnbnVsaWIgdGVzdHMgdG8gZmFpbC4gQWRkIGFuICNpZi1ndWFy ZGVkIGV4aXQgKDc3KSB0byBlYWNoCm9mIHRob3NlLCBzbyB0aGV5IGFyZSBza2lwcGVkIGluIHRo aXMgY2FzZS4KKiB0ZXN0cy90ZXN0LW5sX2xhbmdpbmZvLW10LmMgKG1haW4pOiBFeGl0IDc3IHdo ZW4gdGhyZWFkaW5nIGlzIGRpc2FibGVkLgoqIHRlc3RzL3Rlc3Qtc2V0bG9jYWxlX251bGwtbXQt YWxsLmMgKG1haW4pOiBMaWtld2lzZS4KKiB0ZXN0cy90ZXN0LXNldGxvY2FsZV9udWxsLW10LW9u ZS5jIChtYWluKTogTGlrZXdpc2UuCi0tLQogQ2hhbmdlTG9nICAgICAgICAgICAgICAgICAgICAg ICAgICB8IDEwICsrKysrKysrKysKIHRlc3RzL3Rlc3QtbmxfbGFuZ2luZm8tbXQuYyAgICAgICAg fCAgNSArKysrKwogdGVzdHMvdGVzdC1zZXRsb2NhbGVfbnVsbC1tdC1hbGwuYyB8ICA1ICsrKysr CiB0ZXN0cy90ZXN0LXNldGxvY2FsZV9udWxsLW10LW9uZS5jIHwgIDUgKysrKysKIDQgZmlsZXMg Y2hhbmdlZCwgMjUgaW5zZXJ0aW9ucygrKQoKZGlmZiAtLWdpdCBhL0NoYW5nZUxvZyBiL0NoYW5n ZUxvZwppbmRleCBhNjlkYjg1ODUuLjYxY2IxYzYzZSAxMDA2NDQKLS0tIGEvQ2hhbmdlTG9nCisr KyBiL0NoYW5nZUxvZwpAQCAtMSwzICsxLDEzIEBACisyMDIwLTAxLTA1ICBKaW0gTWV5ZXJpbmcg IDxtZXllcmluZ0BmYi5jb20+CisKKwl0ZXN0czogc2tpcCB0aHJlYWQtdXNpbmcgdGVzdHMgd2hl biB0aHJlYWRpbmcgaXMgZGlzYWJsZWQKKwlzZWQncyBjb25maWd1cmUuYWMgc3BlY2lmaWVzIGds X0RJU0FCTEVfVEhSRUFEUywgYW5kIHRoYXQgY2F1c2VkIHRocmVlCisJdGhyZWFkLXVzaW5nIGdu dWxpYiB0ZXN0cyB0byBmYWlsLiBBZGQgYW4gI2lmLWd1YXJkZWQgZXhpdCAoNzcpIHRvIGVhY2gK KwlvZiB0aG9zZSwgc28gdGhleSBhcmUgc2tpcHBlZCBpbiB0aGlzIGNhc2UuCisJKiB0ZXN0cy90 ZXN0LW5sX2xhbmdpbmZvLW10LmMgKG1haW4pOiBFeGl0IDc3IHdoZW4gdGhyZWFkaW5nIGlzIGRp c2FibGVkLgorCSogdGVzdHMvdGVzdC1zZXRsb2NhbGVfbnVsbC1tdC1hbGwuYyAobWFpbik6IExp a2V3aXNlLgorCSogdGVzdHMvdGVzdC1zZXRsb2NhbGVfbnVsbC1tdC1vbmUuYyAobWFpbik6IExp a2V3aXNlLgorCiAyMDIwLTAxLTA0ICBKaW0gTWV5ZXJpbmcgIDxtZXllcmluZ0BmYi5jb20+Cgog CXVwZGF0ZS1jb3B5cmlnaHQ6IHJlZW5hYmxlIGl0cyBhbHdheXMtc2tpcHBlZCB0ZXN0CmRpZmYg LS1naXQgYS90ZXN0cy90ZXN0LW5sX2xhbmdpbmZvLW10LmMgYi90ZXN0cy90ZXN0LW5sX2xhbmdp bmZvLW10LmMKaW5kZXggNTVmOWRiOThjLi5jYzhiMzAxMTkgMTAwNjQ0Ci0tLSBhL3Rlc3RzL3Rl c3QtbmxfbGFuZ2luZm8tbXQuYworKysgYi90ZXN0cy90ZXN0LW5sX2xhbmdpbmZvLW10LmMKQEAg LTE5Miw2ICsxOTIsNyBAQCB0aHJlYWROX2Z1bmMgKHZvaWQgKmFyZykKIGludAogbWFpbiAoaW50 IGFyZ2MsIGNoYXIgKmFyZ3ZbXSkKIHsKKyNpZiBVU0VfSVNPQ19USFJFQURTIHx8IFVTRV9QT1NJ WF9USFJFQURTIHx8IFVTRV9JU09DX0FORF9QT1NJWF9USFJFQURTIHx8IFVTRV9XSU5ET1dTX1RI UkVBRFMKICAgaWYgKHNldGxvY2FsZSAoTENfQUxMLCBMT0NBTEUxKSA9PSBOVUxMKQogICAgIHsK ICAgICAgIGZwcmludGYgKHN0ZGVyciwgIlNraXBwaW5nIHRlc3Q6IExPQ0FMRTEgbm90IHJlY29n bml6ZWRcbiIpOwpAQCAtMjM1LDQgKzIzNiw4IEBAIG1haW4gKGludCBhcmdjLCBjaGFyICphcmd2 W10pCiAgIH0KCiAgIHJldHVybiAwOworI2Vsc2UKKyAgZnB1dHMgKCJTa2lwcGluZyB0ZXN0OiBt dWx0aXRocmVhZGluZyBub3QgZW5hYmxlZFxuIiwgc3RkZXJyKTsKKyAgcmV0dXJuIDc3OworI2Vu ZGlmCiB9CmRpZmYgLS1naXQgYS90ZXN0cy90ZXN0LXNldGxvY2FsZV9udWxsLW10LWFsbC5jIGIv dGVzdHMvdGVzdC1zZXRsb2NhbGVfbnVsbC1tdC1hbGwuYwppbmRleCBhNGY5MWQ5ODQuLjQxNWI0 OWIwNCAxMDA2NDQKLS0tIGEvdGVzdHMvdGVzdC1zZXRsb2NhbGVfbnVsbC1tdC1hbGwuYworKysg Yi90ZXN0cy90ZXN0LXNldGxvY2FsZV9udWxsLW10LWFsbC5jCkBAIC05Nyw2ICs5Nyw3IEBAIHRo cmVhZDJfZnVuYyAodm9pZCAqYXJnKQogaW50CiBtYWluIChpbnQgYXJnYywgY2hhciAqYXJndltd KQogeworI2lmIFVTRV9JU09DX1RIUkVBRFMgfHwgVVNFX1BPU0lYX1RIUkVBRFMgfHwgVVNFX0lT T0NfQU5EX1BPU0lYX1RIUkVBRFMgfHwgVVNFX1dJTkRPV1NfVEhSRUFEUwogICBpZiAoc2V0bG9j YWxlIChMQ19BTEwsIExPQ0FMRTEpID09IE5VTEwpCiAgICAgewogICAgICAgZnByaW50ZiAoc3Rk ZXJyLCAiU2tpcHBpbmcgdGVzdDogTE9DQUxFMSBub3QgcmVjb2duaXplZFxuIik7CkBAIC0xMjks NiArMTMwLDEwIEBAIG1haW4gKGludCBhcmdjLCBjaGFyICphcmd2W10pCiAgIH0KCiAgIHJldHVy biAwOworI2Vsc2UKKyAgZnB1dHMgKCJTa2lwcGluZyB0ZXN0OiBtdWx0aXRocmVhZGluZyBub3Qg ZW5hYmxlZFxuIiwgc3RkZXJyKTsKKyAgcmV0dXJuIDc3OworI2VuZGlmCiB9CgogLyogV2l0aG91 dCBsb2NraW5nLCB0aGUgcmVzdWx0cyBvZiB0aGlzIHRlc3Qgd291bGQgYmU6CmRpZmYgLS1naXQg YS90ZXN0cy90ZXN0LXNldGxvY2FsZV9udWxsLW10LW9uZS5jIGIvdGVzdHMvdGVzdC1zZXRsb2Nh bGVfbnVsbC1tdC1vbmUuYwppbmRleCBkYzlkNGFhNzkuLmIyY2JlOWE5OCAxMDA2NDQKLS0tIGEv dGVzdHMvdGVzdC1zZXRsb2NhbGVfbnVsbC1tdC1vbmUuYworKysgYi90ZXN0cy90ZXN0LXNldGxv Y2FsZV9udWxsLW10LW9uZS5jCkBAIC05Nyw2ICs5Nyw3IEBAIHRocmVhZDJfZnVuYyAodm9pZCAq YXJnKQogaW50CiBtYWluIChpbnQgYXJnYywgY2hhciAqYXJndltdKQogeworI2lmIFVTRV9JU09D X1RIUkVBRFMgfHwgVVNFX1BPU0lYX1RIUkVBRFMgfHwgVVNFX0lTT0NfQU5EX1BPU0lYX1RIUkVB RFMgfHwgVVNFX1dJTkRPV1NfVEhSRUFEUwogICBpZiAoc2V0bG9jYWxlIChMQ19BTEwsIExPQ0FM RTEpID09IE5VTEwpCiAgICAgewogICAgICAgZnByaW50ZiAoc3RkZXJyLCAiU2tpcHBpbmcgdGVz dDogTE9DQUxFMSBub3QgcmVjb2duaXplZFxuIik7CkBAIC0xMjksNiArMTMwLDEwIEBAIG1haW4g KGludCBhcmdjLCBjaGFyICphcmd2W10pCiAgIH0KCiAgIHJldHVybiAwOworI2Vsc2UKKyAgZnB1 dHMgKCJTa2lwcGluZyB0ZXN0OiBtdWx0aXRocmVhZGluZyBub3QgZW5hYmxlZFxuIiwgc3RkZXJy KTsKKyAgcmV0dXJuIDc3OworI2VuZGlmCiB9CgogLyogV2l0aG91dCBsb2NraW5nLCB0aGUgcmVz dWx0cyBvZiB0aGlzIHRlc3Qgd291bGQgYmU6Ci0tIAoyLjI0LjAuMzkwLmcwODMzNzhjYzM1Cgo= --000000000000cff01d059b68bdfe--