From patchwork Thu Dec 7 17:00:11 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "H.J. Lu" X-Patchwork-Id: 81700 Return-Path: X-Original-To: patchwork@sourceware.org Delivered-To: patchwork@sourceware.org Received: from server2.sourceware.org (localhost [IPv6:::1]) by sourceware.org (Postfix) with ESMTP id EB5E2385C40F for ; Thu, 7 Dec 2023 17:00:27 +0000 (GMT) X-Original-To: libc-alpha@sourceware.org Delivered-To: libc-alpha@sourceware.org Received: from mail-pj1-x1033.google.com (mail-pj1-x1033.google.com [IPv6:2607:f8b0:4864:20::1033]) by sourceware.org (Postfix) with ESMTPS id C74E5385DC2F for ; Thu, 7 Dec 2023 17:00:13 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org C74E5385DC2F Authentication-Results: sourceware.org; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: sourceware.org; spf=pass smtp.mailfrom=gmail.com ARC-Filter: OpenARC Filter v1.0.0 sourceware.org C74E5385DC2F Authentication-Results: server2.sourceware.org; arc=none smtp.remote-ip=2607:f8b0:4864:20::1033 ARC-Seal: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1701968415; cv=none; b=GIteuaChbBUHhCiNWSgAb5OrvuXA0HaR3ywl/mFuqkZQCA93fibPiP2TscV/ojwSkWHfM6Hi6vq0uU99N9LafTeh2Bxek7d5A3nB5ZyWwpMkqd47i5WGmVea/Jd8+kbkCX3NuDBl5/CcBUb7dv8EzGpDW+2ulIKxlRhAgVnQiV4= ARC-Message-Signature: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1701968415; c=relaxed/simple; bh=aBHi/z854vC9ghMgKR90j0M4o+kWeYcHfCVU/yTiVMQ=; h=DKIM-Signature:From:To:Subject:Date:Message-ID:MIME-Version; b=xobx+lHR8AcypbHwOq6taDSPcAaAQxHUuRdvA5Lg2VZ5e13f6h5nq32rDcOBt33PYPk5WbEqt1TgypApuKQGlHGhutU+TvxhieHyco24j1tjmZ2ObMBIWX4ZnRsWGQvu4wSapA+l+03G5ubMjh0e0IcSOnZVXs5CsA73cJ8DmZI= ARC-Authentication-Results: i=1; server2.sourceware.org Received: by mail-pj1-x1033.google.com with SMTP id 98e67ed59e1d1-2866af9d73bso941144a91.3 for ; Thu, 07 Dec 2023 09:00:13 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1701968413; x=1702573213; darn=sourceware.org; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:from:to:cc:subject:date:message-id:reply-to; bh=JnGwLfSv6f+D7j2Md/UEModhXV7CfvvIkfS0vjKcGTE=; b=BxlVTBMuToIXToQKOM2H3aokfGYmEuzoDjjOr/0HAKt/e5StVJJb9DNMJiZgt5Es6N 6E5aw9xkdmp79c1AP58RZteW7z7ciZHKTpFUPqpXzNN9J8LAAJN8K01so5h929q+tXcc Lkf0PcyE879WJf2ea7WEaQm7QLvhsT8nBrESAoG24YwJvdSovOcpvN8cZHsrBLOOlm2e DDULKbP02/cV50mCzeL0Rmopu63n/a+y+AUeLiJe2PfzLNLC5VNAs+YD/SOA6/oSKXMb 2aHkVa9Mzc8654yfzGd74nsfoN12licmjrFy+ivySDK1NBxVX9IN7QHlw0PnpnxgjjeF vNZg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1701968413; x=1702573213; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:x-gm-message-state:from:to:cc:subject:date:message-id :reply-to; bh=JnGwLfSv6f+D7j2Md/UEModhXV7CfvvIkfS0vjKcGTE=; b=CcTHvEptSWPJi77VYm2A1APap8t1DMxJjWyVxE1+xdJKyh0ZVACTI4k2a9p6IkotAS C4xrs8PEwAfdnn7lJuADl4cgLX/wXyitdwlqnN+bplvdNf8bFnrVFyrCGC+cAY1HdH1U r7CTim+LY92dEYxd9DuGOWDPraopoB0X1LJjuksLXo2aKPRMBIyrDNR6DcaJbRuGZmSd 0XI4heNbytrKQ51ESzLrpPqH1BgooBHMt1VFWHHfK66z7mWwn4wlckk5U60mOuuFFMMv wwG9Rh6++iY9Mof7LlidM4/8294RWZ8X8rINeQHjB/WOVba9OtVAKTBIhuNQHdRrFjq9 ge9g== X-Gm-Message-State: AOJu0Yw49qlBftq1TTdSfmxdut9a7nnrAyQ72s5lvfHUo/rZbyL8ndkB 1p5fhMGaz57ACLZ4anqSIy+JWO3Wmo0= X-Google-Smtp-Source: AGHT+IHHVhfVShjJ2qZ03JUvVhpcX3td5JqT+5t38yoSHMkR4WTmkYYwPqObIiXC1yTViu94FIoEBw== X-Received: by 2002:a17:90b:4c0b:b0:285:b876:5033 with SMTP id na11-20020a17090b4c0b00b00285b8765033mr2654864pjb.49.1701968412598; Thu, 07 Dec 2023 09:00:12 -0800 (PST) Received: from gnu-cfl-3.localdomain ([172.59.129.147]) by smtp.gmail.com with ESMTPSA id px6-20020a17090b270600b002609cadc56esm134865pjb.11.2023.12.07.09.00.12 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 07 Dec 2023 09:00:12 -0800 (PST) Received: from gnu-cfl-3.. (localhost [IPv6:::1]) by gnu-cfl-3.localdomain (Postfix) with ESMTP id 43707740093; Thu, 7 Dec 2023 09:00:11 -0800 (PST) From: "H.J. Lu" To: libc-alpha@sourceware.org Cc: Noah Goldstein Subject: [PATCH] sysdeps/x86/Makefile: Split and sort tests Date: Thu, 7 Dec 2023 09:00:11 -0800 Message-ID: <20231207170011.6145-1-hjl.tools@gmail.com> X-Mailer: git-send-email 2.43.0 MIME-Version: 1.0 X-Spam-Status: No, score=-3025.1 required=5.0 tests=BAYES_00, DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, DKIM_VALID_EF, FREEMAIL_FROM, GIT_PATCH_0, RCVD_IN_DNSWL_NONE, SPF_HELO_NONE, SPF_PASS, TXREP, T_SCC_BODY_TEXT_LINE autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on server2.sourceware.org X-BeenThere: libc-alpha@sourceware.org X-Mailman-Version: 2.1.30 Precedence: list List-Id: Libc-alpha mailing list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: libc-alpha-bounces+patchwork=sourceware.org@sourceware.org Put each test on a separate line and sort tests. --- sysdeps/x86/Makefile | 110 ++++++++++++++++++++++++++++++------------- 1 file changed, 78 insertions(+), 32 deletions(-) diff --git a/sysdeps/x86/Makefile b/sysdeps/x86/Makefile index 917c26f116..5631a59a26 100644 --- a/sysdeps/x86/Makefile +++ b/sysdeps/x86/Makefile @@ -10,36 +10,51 @@ sysdep_headers += sys/platform/x86.h bits/platform/x86.h CFLAGS-dl-get-cpu-features.os += $(rtld-early-cflags) CFLAGS-get-cpuid-feature-leaf.o += $(no-stack-protector) -tests += tst-get-cpu-features tst-get-cpu-features-static \ - tst-cpu-features-cpuinfo tst-cpu-features-cpuinfo-static \ - tst-cpu-features-supports tst-cpu-features-supports-static -tests-static += tst-get-cpu-features-static \ - tst-cpu-features-cpuinfo-static \ - tst-cpu-features-supports-static +tests += \ + tst-get-cpu-features \ + tst-get-cpu-features-static \ + tst-cpu-features-cpuinfo \ + tst-cpu-features-cpuinfo-static \ + tst-cpu-features-supports \ + tst-cpu-features-supports-static \ +# tests +tests-static += \ + tst-get-cpu-features-static \ + tst-cpu-features-cpuinfo-static \ + tst-cpu-features-supports-static \ +# tests-static ifeq (yes,$(have-ifunc)) ifeq (yes,$(have-gcc-ifunc)) tests += \ tst-ifunc-isa-1 \ - tst-ifunc-isa-1-static + tst-ifunc-isa-1-static \ +# tests tests-static += \ - tst-ifunc-isa-1-static + tst-ifunc-isa-1-static \ +# tests-static test-xfail-tst-ifunc-isa-1 = $(with-lld) test-xfail-tst-ifunc-isa-1-static = $(with-lld) tests += \ tst-ifunc-isa-2 \ - tst-ifunc-isa-2-static + tst-ifunc-isa-2-static \ +# tests tests-static += \ - tst-ifunc-isa-2-static + tst-ifunc-isa-2-static \ +# tests-static test-xfail-tst-ifunc-isa-2 = $(with-lld) test-xfail-tst-ifunc-isa-2-static = $(with-lld) endif endif ifeq (yes,$(enable-x86-isa-level)) -tests += tst-isa-level-1 -modules-names += tst-isa-level-mod-1-baseline \ - tst-isa-level-mod-1-v2 \ - tst-isa-level-mod-1-v3 \ - tst-isa-level-mod-1-v4 \ +tests += \ + tst-isa-level-1 \ +# tests +modules-names += \ + tst-isa-level-mod-1-baseline \ + tst-isa-level-mod-1-v2 \ + tst-isa-level-mod-1-v3 \ + tst-isa-level-mod-1-v4 \ +# modules-names # X86 ISA level baseline CFLAGS-tst-isa-level-mod-1-baseline.c += -DINCLUDE_X86_ISA_LEVEL \ @@ -68,14 +83,18 @@ tst-ifunc-isa-2-static-ENV = $(tst-ifunc-isa-2-ENV) endif ifeq ($(subdir),math) -tests += tst-ldbl-nonnormal-printf +tests += \ + tst-ldbl-nonnormal-printf \ +# tests endif # $(subdir) == math ifeq ($(subdir),setjmp) gen-as-const-headers += jmp_buf-ssp.sym sysdep_routines += __longjmp_cancel ifneq ($(enable-cet),no) -tests += tst-setjmp-cet +tests += \ + tst-setjmp-cet \ +# tests tst-setjmp-cet-ENV = GLIBC_TUNABLES=glibc.cpu.x86_ibt=on:glibc.cpu.x86_shstk=on endif endif @@ -122,20 +141,45 @@ ifneq ($(enable-cet),no) ifeq ($(subdir),elf) sysdep-dl-routines += dl-cet -tests += tst-cet-legacy-1 tst-cet-legacy-1a tst-cet-legacy-2 \ - tst-cet-legacy-2a tst-cet-legacy-3 tst-cet-legacy-4 \ - tst-cet-legacy-5a tst-cet-legacy-6a tst-cet-legacy-7 \ - tst-cet-legacy-8 tst-cet-legacy-9 tst-cet-legacy-9-static \ - tst-cet-legacy-10 tst-cet-legacy-10-static -tests-static += tst-cet-legacy-9-static tst-cet-legacy-10-static +tests += \ + tst-cet-legacy-1 \ + tst-cet-legacy-1a \ + tst-cet-legacy-2 \ + tst-cet-legacy-2a \ + tst-cet-legacy-3 \ + tst-cet-legacy-4 \ + tst-cet-legacy-5a \ + tst-cet-legacy-6a \ + tst-cet-legacy-7 \ + tst-cet-legacy-8 \ + tst-cet-legacy-9 \ + tst-cet-legacy-9-static \ + tst-cet-legacy-10 \ + tst-cet-legacy-10-static \ +# tests +tests-static += \ + tst-cet-legacy-9-static \ + tst-cet-legacy-10-static \ +# tests-static tst-cet-legacy-1a-ARGS = -- $(host-test-program-cmd) -tests += tst-cet-legacy-4a tst-cet-legacy-4b tst-cet-legacy-4c \ - tst-cet-legacy-5b tst-cet-legacy-6b -modules-names += tst-cet-legacy-mod-1 tst-cet-legacy-mod-2 \ - tst-cet-legacy-mod-4 tst-cet-legacy-mod-5a \ - tst-cet-legacy-mod-5b tst-cet-legacy-mod-5c \ - tst-cet-legacy-mod-6a tst-cet-legacy-mod-6b \ - tst-cet-legacy-mod-6c +tests += \ + tst-cet-legacy-4a \ + tst-cet-legacy-4b \ + tst-cet-legacy-4c \ + tst-cet-legacy-5b \ + tst-cet-legacy-6b \ +# tests +modules-names += \ + tst-cet-legacy-mod-1 \ + tst-cet-legacy-mod-2 \ + tst-cet-legacy-mod-4 \ + tst-cet-legacy-mod-5a \ + tst-cet-legacy-mod-5b \ + tst-cet-legacy-mod-5c \ + tst-cet-legacy-mod-6a \ + tst-cet-legacy-mod-6b \ + tst-cet-legacy-mod-6c \ +# modules-names CFLAGS-tst-cet-legacy-2.c += -fcf-protection=branch CFLAGS-tst-cet-legacy-2a.c += -fcf-protection @@ -243,7 +287,9 @@ endif ifeq ($(subdir),posix) tests += \ tst-sysconf-cache-linesize \ - tst-sysconf-cache-linesize-static + tst-sysconf-cache-linesize-static \ +# tests tests-static += \ - tst-sysconf-cache-linesize-static + tst-sysconf-cache-linesize-static \ +# tests-static endif