From patchwork Thu Dec 21 16:49:14 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Christophe Lyon X-Patchwork-Id: 82674 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 4215D3864879 for ; Thu, 21 Dec 2023 16:49:55 +0000 (GMT) X-Original-To: gcc-patches@gcc.gnu.org Delivered-To: gcc-patches@gcc.gnu.org Received: from mail-oa1-x2e.google.com (mail-oa1-x2e.google.com [IPv6:2001:4860:4864:20::2e]) by sourceware.org (Postfix) with ESMTPS id 5AC3B3858404 for ; Thu, 21 Dec 2023 16:49:33 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org 5AC3B3858404 Authentication-Results: sourceware.org; dmarc=pass (p=none dis=none) header.from=linaro.org Authentication-Results: sourceware.org; spf=pass smtp.mailfrom=linaro.org ARC-Filter: OpenARC Filter v1.0.0 sourceware.org 5AC3B3858404 Authentication-Results: server2.sourceware.org; arc=none smtp.remote-ip=2001:4860:4864:20::2e ARC-Seal: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1703177376; cv=none; b=Bzc3LONMQVu5y+0AICw5fIEgeuPDyr2pqGU2vdjfwUr88F2KcjoBfvFnojUMwCgJiOcdt0IxERPkS++m7X/qdomMAqJjyqCDoGg4YpglIfx9rjtS+q4Dn5KJ3y859QpWO35QOrp3LmN/QSi7uX6qziolAWEF9b6Wtr/H8SgoxYg= ARC-Message-Signature: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1703177376; c=relaxed/simple; bh=rRgyfZZaLhZjWsJ2L6i6MZ36mF3/Yjgx/9cfmhkbxN4=; h=DKIM-Signature:From:To:Subject:Date:Message-Id:MIME-Version; b=NyfkiLUZpTU91k2oBoafpGEpzB9SxwWP2qlwNnQQKjY0XBo3kRW58Y2Lsnyeqzxauma6XWeKYp6o6nCdaySz4IzLIbljTke4BOxTKkDaSihboJ5aG2Pc2gt4zwIbIkqvXqxWL//megGBFvNtBBpARIVD5FEKTRrSuDPKpNJtI20= ARC-Authentication-Results: i=1; server2.sourceware.org Received: by mail-oa1-x2e.google.com with SMTP id 586e51a60fabf-203ae9903a6so611339fac.0 for ; Thu, 21 Dec 2023 08:49:33 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1703177372; x=1703782172; darn=gcc.gnu.org; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:from:to:cc:subject:date:message-id:reply-to; bh=Kijd6HPlKfEYX2Pd0TVw5PEHOuh9ZV2RXdgMg+LiXbg=; b=GwHb5gBq/Geg1yOHvjMedGUIzDI1CvrmtMxClZhmX0pOqAHDZmGSegrmep6LXXj9Au JX2UAkLitKPvtJ6n7Y+Wf0LLG6sIk8T4OVLVg5jWQmzUqXUqAqnWHFTo8w889/B6I7Nt qAsbFLfGheHC6nwkXAI7YxfYGeeSgiUinLAUcrxteS1UbBG/w9mzMRMxUl2SYb/I6r13 9SfUmCqWSdOF4QQB2L6e0DjZ6c2FsRORoLgmzKhdU9RlRkWDkuLF2DIS9X17J/px9zug jRvfzZBjBlsqPrKlz99kmEcNx3v4GZRBnbma9uR2NRyNtL782MWv1HQXDtN3SsXDZ0VS LQ/w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1703177372; x=1703782172; 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=Kijd6HPlKfEYX2Pd0TVw5PEHOuh9ZV2RXdgMg+LiXbg=; b=Eqon7vQ9hLJVj33o7MwlZpNJm/tRb071wZujWVAy+sWJ5MPm/gexzo71AY+CQSPE+a tsNNnBxfJA48IfxBIh3ygSfk94Rmai3Nv1RB2e09Jo/h636Nlo6K0R5E9ZDzoFAh1Hqb RxxRCxXGvb1r7WSpOxTEPTzPrkKP6yPWJp7/v4hLd6YE6gy8Dx13yEG7JLpxV322h8h/ y/6576x/KKayim0WnHXG+Dgob6SOm46Pi54h3vUgR9YynDwLW7Ust+1pEs5agl5Axm08 x1M4RKTLcoaccIeFjnqHGSZzuycoixeEA8Rb9UvxW0VkkU8O1Fp0XNlyfZ0gG4FZdRv4 8raA== X-Gm-Message-State: AOJu0YzO4d+yefl3QtNRConxzaZsLeTKq8+RGk4tJEWo6XIB8/weyS65 khJC2Mgi1kfXvoR+JEf60tuYQj7xMX/PHnUdN+rXoNFpSi1/Sg== X-Google-Smtp-Source: AGHT+IHNRs4GJDSpyiDln8OjbH1zWtboDo/Obk+KAWAsQS5V6++mKx5gBugXwUY3hHJu6T2AjD0y+A== X-Received: by 2002:a05:6870:1646:b0:204:69d:9b83 with SMTP id c6-20020a056870164600b00204069d9b83mr64175oae.82.1703177372237; Thu, 21 Dec 2023 08:49:32 -0800 (PST) Received: from localhost.localdomain ([139.178.84.207]) by smtp.gmail.com with ESMTPSA id z2-20020a9d7a42000000b006d811e1d91dsm374554otm.72.2023.12.21.08.49.31 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 21 Dec 2023 08:49:31 -0800 (PST) From: Christophe Lyon To: gcc-patches@gcc.gnu.org, libstdc++@gcc.gnu.org, bonzini@gnu.org, neroden@gcc.gnu.org, aoliva@gcc.gnu.org, Ralf.Wildenhues@gmx.de Cc: Christophe Lyon Subject: [PATCH] Allow overriding EXPECT Date: Thu, 21 Dec 2023 16:49:14 +0000 Message-Id: <20231221164914.943125-1-christophe.lyon@linaro.org> X-Mailer: git-send-email 2.34.1 MIME-Version: 1.0 X-Spam-Status: No, score=-13.7 required=5.0 tests=BAYES_00, DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, DKIM_VALID_EF, 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: gcc-patches@gcc.gnu.org X-Mailman-Version: 2.1.30 Precedence: list List-Id: Gcc-patches mailing list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: gcc-patches-bounces+patchwork=sourceware.org@gcc.gnu.org While investigating possible race conditions in the GCC testsuites caused by bufferization issues, I wanted to investigate workarounds similar to GDB's READ1 [1], and I noticed it was not always possible to override EXPECT when running 'make check'. This patch adds the missing support in various Makefiles. I was not able to test the patch for all the libraries updated here, but I confirmed it works as intended/needed for libstdc++. libatomic, libitm, libgomp already work as intended because their Makefiles do not have: MAKEOVERRIDES= Tested on (native) aarch64-linux-gnu, confirmed the patch introduces the behaviour I want in gcc, g++, gfortran and libstdc++. I updated (but could not test) libgm2, libphobos, libquadmath and libssp for consistency since their Makefiles have MAKEOVERRIDES= libffi, libgo, libsanitizer seem to need a similar update, but they are imported from their respective upstream repo, so should not be patched here. [1] https://github.com/bminor/binutils-gdb/blob/master/gdb/testsuite/README#L269 2023-12-21 Christophe Lyon gcc/ * Makefile.in: Allow overriding EXEPCT. libgm2/ * Makefile.am: Allow overriding EXEPCT. * Makefile.in: Regenerate. libphobos/ * Makefile.am: Allow overriding EXEPCT. * Makefile.in: Regenerate. libquadmath/ * Makefile.am: Allow overriding EXEPCT. * Makefile.in: Regenerate. libssp/ * Makefile.am: Allow overriding EXEPCT. * Makefile.in: Regenerate. libstdc++-v3/ * Makefile.am: Allow overriding EXEPCT. * Makefile.in: Regenerate. --- gcc/Makefile.in | 3 +++ libgm2/Makefile.am | 1 + libgm2/Makefile.in | 1 + libphobos/Makefile.am | 1 + libphobos/Makefile.in | 1 + libquadmath/Makefile.am | 1 + libquadmath/Makefile.in | 1 + libssp/Makefile.am | 1 + libssp/Makefile.in | 1 + libstdc++-v3/Makefile.am | 1 + libstdc++-v3/Makefile.in | 1 + 11 files changed, 13 insertions(+) diff --git a/gcc/Makefile.in b/gcc/Makefile.in index f284c1387e2..bc35a1bd237 100644 --- a/gcc/Makefile.in +++ b/gcc/Makefile.in @@ -4303,6 +4303,7 @@ $(lang_checks_parallel): site.exp vardots=`echo "$$variant" | sed 's,/,.,g'`; \ $(MAKE) TESTSUITEDIR="testsuite.$$vardots" \ RUNTESTFLAGS="--target_board=$$variant $(RUNTESTFLAGS)" \ + EXPECT=$(EXPECT) \ "$$target" TESTSUITEDIR = testsuite @@ -4368,6 +4369,7 @@ $(lang_checks_parallelized): check-% : site.exp GCC_RUNTEST_PARALLELIZE_DIR=`${PWD_COMMAND}`/$(TESTSUITEDIR)/$(check_p_tool)-parallel ; \ export GCC_RUNTEST_PARALLELIZE_DIR ; \ $(MAKE) TESTSUITEDIR="$(TESTSUITEDIR)" RUNTESTFLAGS="$(RUNTESTFLAGS)" \ + EXPECT=$(EXPECT) \ check-parallel-$* \ $(patsubst %,check-parallel-$*_%, $(check_p_subdirs)); \ sums= ; logs= ; \ @@ -4386,6 +4388,7 @@ $(lang_checks_parallelized): check-% : site.exp rm -rf $(TESTSUITEDIR)/$*-parallel || true; \ else \ $(MAKE) TESTSUITEDIR="$(TESTSUITEDIR)" RUNTESTFLAGS="$(RUNTESTFLAGS)" \ + EXPECT=$(EXPECT) \ check_$*_parallelize= check-parallel-$*; \ fi diff --git a/libgm2/Makefile.am b/libgm2/Makefile.am index d2eadfc51aa..72391d01291 100644 --- a/libgm2/Makefile.am +++ b/libgm2/Makefile.am @@ -69,6 +69,7 @@ AM_MAKEFLAGS = \ "CFLAGS_FOR_BUILD=$(CFLAGS_FOR_BUILD)" \ "CFLAGS_FOR_TARGET=$(CFLAGS_FOR_TARGET)" \ "CFLAGS_LONGDOUBLE=$(CFLAGS_LONGDOUBLE)" \ + "EXPECT=$(EXPECT)" \ "INSTALL=$(INSTALL)" \ "INSTALL_DATA=$(INSTALL_DATA)" \ "INSTALL_PROGRAM=$(INSTALL_PROGRAM)" \ diff --git a/libgm2/Makefile.in b/libgm2/Makefile.in index 5a96f98edc9..4c30d2b034f 100644 --- a/libgm2/Makefile.in +++ b/libgm2/Makefile.in @@ -371,6 +371,7 @@ AM_MAKEFLAGS = \ "CFLAGS_FOR_BUILD=$(CFLAGS_FOR_BUILD)" \ "CFLAGS_FOR_TARGET=$(CFLAGS_FOR_TARGET)" \ "CFLAGS_LONGDOUBLE=$(CFLAGS_LONGDOUBLE)" \ + "EXPECT=$(EXPECT)" \ "INSTALL=$(INSTALL)" \ "INSTALL_DATA=$(INSTALL_DATA)" \ "INSTALL_PROGRAM=$(INSTALL_PROGRAM)" \ diff --git a/libphobos/Makefile.am b/libphobos/Makefile.am index d46cfef533e..307c57c8b22 100644 --- a/libphobos/Makefile.am +++ b/libphobos/Makefile.am @@ -38,6 +38,7 @@ AM_MAKEFLAGS = \ "CXXFLAGS=$(CXXFLAGS)" \ "CFLAGS_FOR_BUILD=$(CFLAGS_FOR_BUILD)" \ "CFLAGS_FOR_TARGET=$(CFLAGS_FOR_TARGET)" \ + "EXPECT=$(EXPECT)" \ "GDC_FOR_TARGET=$(GDC_FOR_TARGET)" \ "GDC=$(GDC)" \ "GDCFLAGS=$(GDCFLAGS)" \ diff --git a/libphobos/Makefile.in b/libphobos/Makefile.in index 8d62c31dab0..eef750bc46e 100644 --- a/libphobos/Makefile.in +++ b/libphobos/Makefile.in @@ -365,6 +365,7 @@ AM_MAKEFLAGS = \ "CXXFLAGS=$(CXXFLAGS)" \ "CFLAGS_FOR_BUILD=$(CFLAGS_FOR_BUILD)" \ "CFLAGS_FOR_TARGET=$(CFLAGS_FOR_TARGET)" \ + "EXPECT=$(EXPECT)" \ "GDC_FOR_TARGET=$(GDC_FOR_TARGET)" \ "GDC=$(GDC)" \ "GDCFLAGS=$(GDCFLAGS)" \ diff --git a/libquadmath/Makefile.am b/libquadmath/Makefile.am index 0d02c95e738..3ddebe14b93 100644 --- a/libquadmath/Makefile.am +++ b/libquadmath/Makefile.am @@ -88,6 +88,7 @@ AM_MAKEFLAGS = \ "CXXFLAGS=$(CXXFLAGS)" \ "CFLAGS_FOR_BUILD=$(CFLAGS_FOR_BUILD)" \ "CFLAGS_FOR_TARGET=$(CFLAGS_FOR_TARGET)" \ + "EXPECT=$(EXPECT)" \ "INSTALL=$(INSTALL)" \ "INSTALL_DATA=$(INSTALL_DATA)" \ "INSTALL_PROGRAM=$(INSTALL_PROGRAM)" \ diff --git a/libquadmath/Makefile.in b/libquadmath/Makefile.in index 068af559457..06dca1534ff 100644 --- a/libquadmath/Makefile.in +++ b/libquadmath/Makefile.in @@ -512,6 +512,7 @@ AUTOMAKE_OPTIONS = foreign info-in-builddir @BUILD_LIBQUADMATH_TRUE@ "CXXFLAGS=$(CXXFLAGS)" \ @BUILD_LIBQUADMATH_TRUE@ "CFLAGS_FOR_BUILD=$(CFLAGS_FOR_BUILD)" \ @BUILD_LIBQUADMATH_TRUE@ "CFLAGS_FOR_TARGET=$(CFLAGS_FOR_TARGET)" \ +@BUILD_LIBQUADMATH_TRUE@ "EXPECT=$(EXPECT)" \ @BUILD_LIBQUADMATH_TRUE@ "INSTALL=$(INSTALL)" \ @BUILD_LIBQUADMATH_TRUE@ "INSTALL_DATA=$(INSTALL_DATA)" \ @BUILD_LIBQUADMATH_TRUE@ "INSTALL_PROGRAM=$(INSTALL_PROGRAM)" \ diff --git a/libssp/Makefile.am b/libssp/Makefile.am index f7ed2aa6043..b1269489a8d 100644 --- a/libssp/Makefile.am +++ b/libssp/Makefile.am @@ -77,6 +77,7 @@ AM_MAKEFLAGS = \ "CXXFLAGS=$(CXXFLAGS)" \ "CFLAGS_FOR_BUILD=$(CFLAGS_FOR_BUILD)" \ "CFLAGS_FOR_TARGET=$(CFLAGS_FOR_TARGET)" \ + "EXPECT=$(EXPECT)" \ "INSTALL=$(INSTALL)" \ "INSTALL_DATA=$(INSTALL_DATA)" \ "INSTALL_PROGRAM=$(INSTALL_PROGRAM)" \ diff --git a/libssp/Makefile.in b/libssp/Makefile.in index 1cf86361b96..168f620a1f8 100644 --- a/libssp/Makefile.in +++ b/libssp/Makefile.in @@ -403,6 +403,7 @@ AM_MAKEFLAGS = \ "CXXFLAGS=$(CXXFLAGS)" \ "CFLAGS_FOR_BUILD=$(CFLAGS_FOR_BUILD)" \ "CFLAGS_FOR_TARGET=$(CFLAGS_FOR_TARGET)" \ + "EXPECT=$(EXPECT)" \ "INSTALL=$(INSTALL)" \ "INSTALL_DATA=$(INSTALL_DATA)" \ "INSTALL_PROGRAM=$(INSTALL_PROGRAM)" \ diff --git a/libstdc++-v3/Makefile.am b/libstdc++-v3/Makefile.am index 5fbf393bfdf..0ad40b69e45 100644 --- a/libstdc++-v3/Makefile.am +++ b/libstdc++-v3/Makefile.am @@ -142,6 +142,7 @@ AM_MAKEFLAGS = \ "CXXFLAGS=$(CXXFLAGS)" \ "CFLAGS_FOR_BUILD=$(CFLAGS_FOR_BUILD)" \ "CFLAGS_FOR_TARGET=$(CFLAGS_FOR_TARGET)" \ + "EXPECT=$(EXPECT)" \ "INSTALL=$(INSTALL)" \ "INSTALL_DATA=$(INSTALL_DATA)" \ "INSTALL_PROGRAM=$(INSTALL_PROGRAM)" \ diff --git a/libstdc++-v3/Makefile.in b/libstdc++-v3/Makefile.in index 500c0d75282..cf8dd8bca50 100644 --- a/libstdc++-v3/Makefile.in +++ b/libstdc++-v3/Makefile.in @@ -460,6 +460,7 @@ AM_MAKEFLAGS = \ "CXXFLAGS=$(CXXFLAGS)" \ "CFLAGS_FOR_BUILD=$(CFLAGS_FOR_BUILD)" \ "CFLAGS_FOR_TARGET=$(CFLAGS_FOR_TARGET)" \ + "EXPECT=$(EXPECT)" \ "INSTALL=$(INSTALL)" \ "INSTALL_DATA=$(INSTALL_DATA)" \ "INSTALL_PROGRAM=$(INSTALL_PROGRAM)" \