From patchwork Mon Apr 15 15:56:27 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tom de Vries X-Patchwork-Id: 88504 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 7676C3858C60 for ; Mon, 15 Apr 2024 15:58:08 +0000 (GMT) X-Original-To: gdb-patches@sourceware.org Delivered-To: gdb-patches@sourceware.org Received: from smtp-out2.suse.de (smtp-out2.suse.de [195.135.223.131]) by sourceware.org (Postfix) with ESMTPS id 88C523858408 for ; Mon, 15 Apr 2024 15:56:17 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org 88C523858408 Authentication-Results: sourceware.org; dmarc=pass (p=none dis=none) header.from=suse.de Authentication-Results: sourceware.org; spf=pass smtp.mailfrom=suse.de ARC-Filter: OpenARC Filter v1.0.0 sourceware.org 88C523858408 Authentication-Results: server2.sourceware.org; arc=none smtp.remote-ip=195.135.223.131 ARC-Seal: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1713196581; cv=none; b=UjCSXdRYpGYUUCLlQ1cmECM58UmAx7HLbBD88bHT/eOMcK8HuTH9rEBMP3eV+6EYwFM7yN4YD8qlkTZvcHWynKTb1HwHHcQe04ZiuPhzyc7QF2TfrATU51fJrJDEUvkHG2Vc5HY187xO113EC47wuuTJPbr9gBUGO80dS/Povs4= ARC-Message-Signature: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1713196581; c=relaxed/simple; bh=uoCrGR9/qdJFFJcYbaYqmfw1+xCTu8p6IEEVO0xug3A=; h=DKIM-Signature:DKIM-Signature:DKIM-Signature:DKIM-Signature:From: To:Subject:Date:Message-Id:MIME-Version; b=VEn4CEnmlQYjM6F2ZFCxLzmi3PsUTbCGSjjesScm0CgUO36zLBr7x8PqYhO0DSBtt+jnvw6Jqpi8k3zYtrDGcZTAojhbvm7/+M2wAJAjif43oFl0DpWwOyWkNndpXvFIZ5r9yUg+siGvHMbPbRg6jOBBP65U3cqPJVPwJlGpm7c= ARC-Authentication-Results: i=1; server2.sourceware.org Received: from imap1.dmz-prg2.suse.org (imap1.dmz-prg2.suse.org [IPv6:2a07:de40:b281:104:10:150:64:97]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by smtp-out2.suse.de (Postfix) with ESMTPS id 0F8915D2C8 for ; Mon, 15 Apr 2024 15:56:15 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_rsa; t=1713196576; h=from:from:reply-to:date:date:message-id:message-id:to:to:cc: mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=jHJdF6qJNUENq21wP+CpK3BUKD4I/GHZPU93acdvWXA=; b=zw/xVNW88Xx8PCosB681JlJp5RuA6VtVBNgKTiP4jkCNUmcmwMvsle5TxPHPUYUAwgYvM2 m0sRHhTH4IjbiWGfjvgAyb8o3Mm0vCEJA8rYYk+huRQcefFG7W8YuhvtLHpZpZHOR7Qaok ijQDTmbG5JxKcFV8tadXa42EzEbr71I= DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_ed25519; t=1713196576; h=from:from:reply-to:date:date:message-id:message-id:to:to:cc: mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=jHJdF6qJNUENq21wP+CpK3BUKD4I/GHZPU93acdvWXA=; b=AVMGQSlgEpyhyl1NtuG8Q0HSu729E6jWUb5xqW4q82CPVz6Fmby+8H6/WleWlo7X+5VwSz k7RxUOAqx5wAYwAw== Authentication-Results: smtp-out2.suse.de; dkim=pass header.d=suse.de header.s=susede2_rsa header.b=HAAe3p27; dkim=pass header.d=suse.de header.s=susede2_ed25519 header.b=cVElV3yf DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_rsa; t=1713196575; h=from:from:reply-to:date:date:message-id:message-id:to:to:cc: mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=jHJdF6qJNUENq21wP+CpK3BUKD4I/GHZPU93acdvWXA=; b=HAAe3p27PNA4dLv8Pernw+FO448RfPiis8pq1PlAHBifnBeSIRIj/HiqcSYTNET38mdNj4 nHAj9gAVPGluVVK9WN6hDz8lSKNqIDane3okwEd8/V0gI0+5JznCv2lA649j4bGVWjxGDd czzxuRASBkFk505wJaBhpiIWIs0yNL4= DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_ed25519; t=1713196575; h=from:from:reply-to:date:date:message-id:message-id:to:to:cc: mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=jHJdF6qJNUENq21wP+CpK3BUKD4I/GHZPU93acdvWXA=; b=cVElV3yfUxndNyFsryDLMy1bkp7Y/ioUfGSBFG3wg+qfOUyd9HyvVG3ztBFtVp9fqEQkJV bS6jWFIe7dGq/uDw== Received: from imap1.dmz-prg2.suse.org (localhost [127.0.0.1]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by imap1.dmz-prg2.suse.org (Postfix) with ESMTPS id EED9813957 for ; Mon, 15 Apr 2024 15:56:14 +0000 (UTC) Received: from dovecot-director2.suse.de ([2a07:de40:b281:106:10:150:64:167]) by imap1.dmz-prg2.suse.org with ESMTPSA id iN4UOR5OHWaVRgAAD6G6ig (envelope-from ) for ; Mon, 15 Apr 2024 15:56:14 +0000 From: Tom de Vries To: gdb-patches@sourceware.org Subject: [PATCH 7/7] [gdb/testsuite] Use unique portnum in parallel testing (check//% case) Date: Mon, 15 Apr 2024 17:56:27 +0200 Message-Id: <20240415155627.22108-7-tdevries@suse.de> X-Mailer: git-send-email 2.35.3 In-Reply-To: <20240415155627.22108-1-tdevries@suse.de> References: <20240415155627.22108-1-tdevries@suse.de> MIME-Version: 1.0 X-Spam-Level: X-Spamd-Result: default: False [-4.01 / 50.00]; BAYES_HAM(-3.00)[100.00%]; MID_CONTAINS_FROM(1.00)[]; DWL_DNSWL_LOW(-1.00)[suse.de:dkim]; NEURAL_HAM_LONG(-1.00)[-1.000]; R_MISSING_CHARSET(0.50)[]; R_DKIM_ALLOW(-0.20)[suse.de:s=susede2_rsa,suse.de:s=susede2_ed25519]; NEURAL_HAM_SHORT(-0.20)[-1.000]; MIME_GOOD(-0.10)[text/plain]; MX_GOOD(-0.01)[]; DKIM_SIGNED(0.00)[suse.de:s=susede2_rsa,suse.de:s=susede2_ed25519]; TO_MATCH_ENVRCPT_ALL(0.00)[]; RCPT_COUNT_ONE(0.00)[1]; FUZZY_BLOCKED(0.00)[rspamd.com]; MIME_TRACE(0.00)[0:+]; ARC_NA(0.00)[]; RBL_SPAMHAUS_BLOCKED_OPENRESOLVER(0.00)[2a07:de40:b281:104:10:150:64:97:from]; RCVD_TLS_ALL(0.00)[]; DKIM_TRACE(0.00)[suse.de:+]; RCVD_COUNT_TWO(0.00)[2]; FROM_EQ_ENVFROM(0.00)[]; FROM_HAS_DN(0.00)[]; SPAMHAUS_XBL(0.00)[2a07:de40:b281:104:10:150:64:97:from]; TO_DN_NONE(0.00)[]; RECEIVED_SPAMHAUS_BLOCKED_OPENRESOLVER(0.00)[2a07:de40:b281:106:10:150:64:167:received]; PREVIOUSLY_DELIVERED(0.00)[gdb-patches@sourceware.org]; RCVD_VIA_SMTP_AUTH(0.00)[]; DBL_BLOCKED_OPENRESOLVER(0.00)[suse.de:dkim, sourceware.org:url, gnu.org:url, imap1.dmz-prg2.suse.org:helo, imap1.dmz-prg2.suse.org:rdns] X-Rspamd-Action: no action X-Rspamd-Queue-Id: 0F8915D2C8 X-Rspamd-Server: rspamd1.dmz-prg2.suse.org X-Spam-Score: -4.01 X-Spam-Status: No, score=-12.3 required=5.0 tests=BAYES_00, DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, DKIM_VALID_EF, GIT_PATCH_0, KAM_SHORT, SPF_HELO_NONE, SPF_PASS, TXREP 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: gdb-patches@sourceware.org X-Mailman-Version: 2.1.30 Precedence: list List-Id: Gdb-patches mailing list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: gdb-patches-bounces+patchwork=sourceware.org@sourceware.org Make target check//% is the gdb variant of a similar gcc make target [1]. When running tests using check//%: ... $ cd build/gdb $ make check//unix/{-fPIE/-pie,-fno-PIE/-no-pie} -j2 TESTS=gdb.server/*.exp ... we get: ... $ cat build/gdb/testsuite.unix.-fPIE.-pie/cache/portnum 2427 $ cat build/gdb/testsuite.unix.-fno-PIE.-no-pie/cache/portnum 2423 ... The problem is that there are two portnum files used in parallel. Fix this by: - creating a common lockdir build/gdb/testsuite.lockdir for make target check//%, - passing this down to the runtests invocations using variable GDB_LOCK_DIR, and - using GDB_LOCK_DIR in lock_dir. Tested on aarch64-linux. PR testsuite/31632 Bug: https://sourceware.org/bugzilla/show_bug.cgi?id=31632 [1] https://gcc.gnu.org/install/test.html --- gdb/Makefile.in | 8 ++++++-- gdb/testsuite/lib/gdb-utils.exp | 5 +++++ 2 files changed, 11 insertions(+), 2 deletions(-) diff --git a/gdb/Makefile.in b/gdb/Makefile.in index 23894ea4a4d..5a63f166107 100644 --- a/gdb/Makefile.in +++ b/gdb/Makefile.in @@ -2002,6 +2002,10 @@ check-all-boards: force $(MAKE) $(TARGET_FLAGS_TO_PASS) check-all-boards; \ else true; fi +testsuite.lockdir: force + rm -rf $@ + mkdir -p $@ + # The idea is to parallelize testing of multilibs, for example: # make -j3 check//sh-hms-sim/{-m1,-m2,-m3,-m3e,-m4}/{,-nofpu} # will run 3 concurrent sessions of check, eventually testing all 10 @@ -2010,7 +2014,7 @@ check-all-boards: force # used, this rule will harmlessly fail to match. Used FORCE_PARALLEL to # prevent serialized checking due to the passed RUNTESTFLAGS. # FIXME: use config.status --config not --version, when available. -check//%: force +check//%: force testsuite.lockdir @if [ -f testsuite/config.status ]; then \ rootme=`pwd`; export rootme; \ rootsrc=`cd $(srcdir); pwd`; export rootsrc; \ @@ -2028,7 +2032,7 @@ check//%: force ); \ else :; fi && cd $$testdir && \ $(MAKE) $(TARGET_FLAGS_TO_PASS) \ - RUNTESTFLAGS="--target_board=$$variant $(RUNTESTFLAGS)" \ + RUNTESTFLAGS="GDB_LOCK_DIR=$$rootme/testsuite.lockdir --target_board=$$variant $(RUNTESTFLAGS)" \ FORCE_PARALLEL=$(if $(FORCE_PARALLEL),1,$(if $(RUNTESTFLAGS),,1)) \ "$$target"; \ else true; fi diff --git a/gdb/testsuite/lib/gdb-utils.exp b/gdb/testsuite/lib/gdb-utils.exp index 1f30d807ff0..95c53d030d8 100644 --- a/gdb/testsuite/lib/gdb-utils.exp +++ b/gdb/testsuite/lib/gdb-utils.exp @@ -180,6 +180,11 @@ proc lock_file_release {info} { # Return directory where we keep lock files. proc lock_dir {} { + if { [info exists ::GDB_LOCK_DIR] } { + # When using check//. + return $::GDB_LOCK_DIR + } + return [make_gdb_parallel_path cache] }