From patchwork Fri Feb 9 13:17:54 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "H.J. Lu" X-Patchwork-Id: 85517 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 DB54B385841F for ; Fri, 9 Feb 2024 13:18:19 +0000 (GMT) X-Original-To: libc-alpha@sourceware.org Delivered-To: libc-alpha@sourceware.org Received: from mail-pl1-x62c.google.com (mail-pl1-x62c.google.com [IPv6:2607:f8b0:4864:20::62c]) by sourceware.org (Postfix) with ESMTPS id B29673858C35 for ; Fri, 9 Feb 2024 13:17:57 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org B29673858C35 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 B29673858C35 Authentication-Results: server2.sourceware.org; arc=none smtp.remote-ip=2607:f8b0:4864:20::62c ARC-Seal: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1707484679; cv=none; b=POzLGdQsLNYGKcb6c4UyT0tU3JxG+oczH/bX5Bh+uvggg5+lNUb3eOPyTTXKXz9yLtkaNETSuob/Bs120TYQBG8ZnAxSpAWIcq5GDA565VjQ7DtcpLYDSekntB2zVwtmotG2/Fi1/aO4subk3NTaHzdkV/n4JiIn0e24dz5zcS4= ARC-Message-Signature: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1707484679; c=relaxed/simple; bh=egAIb293Pz+32oIrQS+7XlQDvhM+Ku02Bm27V/MLZcs=; h=DKIM-Signature:From:To:Subject:Date:Message-ID:MIME-Version; b=peB++tGMw7REvM72GvIQ9KRi4qApq/UUO1wHn1cty0EJDF4dqXDiM6L01nWoXWwZBWPJvb9L/GOZIpOaMSSOMbehPCWNyFyi5yG7mMxITEIcaqNF9c6UHLR81hVOxmPoUqFJzJdMLbmO97LBLzP4nFEeimLNjvj5BoijWnkh2nY= ARC-Authentication-Results: i=1; server2.sourceware.org Received: by mail-pl1-x62c.google.com with SMTP id d9443c01a7336-1d8aadc624dso7890455ad.0 for ; Fri, 09 Feb 2024 05:17:57 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1707484676; x=1708089476; 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=VhcfmDq3haYBoCY32JMiloVO3fQTZQvi3F6wA2fm3Vw=; b=I7L6KoJScl6A5hxDukTA6wBVu4IFqhkgEtIJfGNOjQW7y0S05xnFTTC3im+JczZhIy djHcyDla1MTtZOSjyRO8Y4qoBX0SnTJ46dJMnCAnLtXK6QTt8I2xCcciUv3fkwngmIHk I87u3soNEfzEnbS0iUax8z1b9igZ+ltzeavcARIavEWB8g+wXDs1vKVZiigteEHi3OCH ABm+FlvkYDy6D2gU4tTwDtRcGZLO7UdD2QvENtCW9DtT7sxNFzm62Y0pgGbXb8VLUiqv QYyLI38SdjOl9dz/c8k0a/8L6U6l/eWpR9PPDPFfcZFkDGDd7RP7zNnxwHJNd1eFOnYo wy5g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1707484676; x=1708089476; 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=VhcfmDq3haYBoCY32JMiloVO3fQTZQvi3F6wA2fm3Vw=; b=JQ/2oRLCGL1nfjyaq3i61mzHCG0FJxpB9PehxWYjxsi18gCxaWYSqy9PoTEjHNcFE4 LhJ6W2JMCTEYo4YBtG4lhJ/l6CYlZsOzTLoYXmEto+cfoQhf6pxaYTgPqyBHx7zrJnew o5446c8rlFefEVl787SjzWo7XO/F2VKs3RlsyXj4s8xB2cJ+A/cf+t0NtIxQb6Mkkqtq ktGnWE6j1dBONwU/q5UPhiY1R+PHMjEm3sCHnamiqbyyi6FUTnhKhfN+SbMXEzU1blj0 DFuAvP5Cr05YqwMFjL1aBajjgRhRymAy2bQEZe4dobzf/wEIyaVG8g/yGWquWsTME6mO TMhw== X-Gm-Message-State: AOJu0YxbdLFTyHrWvAO1lcwDxCmOfjKAKV3f9iI86OFUr/suBjm27DiU uoJSzHyTqUTRE9y5PA69HLFUDpmjJPt+7Bg3MCATs+r58J0nevnp X-Google-Smtp-Source: AGHT+IEhoO/tDxjIoAHwEt+0ORf0piWBuE05bLUN0rqw1VXgYho/iyGiOhEfh+MNCcz9ma/cJo+oGg== X-Received: by 2002:a17:902:d584:b0:1d9:373a:6129 with SMTP id k4-20020a170902d58400b001d9373a6129mr1655595plh.35.1707484676543; Fri, 09 Feb 2024 05:17:56 -0800 (PST) Received: from gnu-cfl-3.localdomain ([172.56.168.224]) by smtp.gmail.com with ESMTPSA id c12-20020a170903234c00b001d9773a198esm1464226plh.201.2024.02.09.05.17.55 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 09 Feb 2024 05:17:56 -0800 (PST) Received: from gnu-cfl-3.. (localhost [IPv6:::1]) by gnu-cfl-3.localdomain (Postfix) with ESMTP id C29947400A0; Fri, 9 Feb 2024 05:17:54 -0800 (PST) From: "H.J. Lu" To: libc-alpha@sourceware.org Cc: fweimer@redhat.com Subject: [PATCH v2] elf: Properly remove the initial 'env' command Date: Fri, 9 Feb 2024 05:17:54 -0800 Message-ID: <20240209131754.2353321-1-hjl.tools@gmail.com> X-Mailer: git-send-email 2.43.0 MIME-Version: 1.0 X-Spam-Status: No, score=-3023.8 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 tst-rtld-list-diagnostics.py is called by "$(test-wrapper-env) $(objpfx)$(rtld-installed-name) --list-diagnostics" and $(test-wrapper-env) is set to "$(test-wrapper) env". When there is a test wrapper, it is incorrect to use: # Remove the initial 'env' command. parse_diagnostics(opts.command.split()[1:]) to remove 'env'. Change tst-rtld-list-diagnostics.py to explicitly remove 'env' instead. This fixes [BZ #31357]. --- elf/tst-rtld-list-diagnostics.py | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/elf/tst-rtld-list-diagnostics.py b/elf/tst-rtld-list-diagnostics.py index 9e70e74bf8..c59b04d49a 100644 --- a/elf/tst-rtld-list-diagnostics.py +++ b/elf/tst-rtld-list-diagnostics.py @@ -294,7 +294,9 @@ def main(argv): check_consistency_with_manual(opts.manual) # Remove the initial 'env' command. - parse_diagnostics(opts.command.split()[1:]) + options = opts.command.split()[:] + options.remove('env') + parse_diagnostics(options) if errors: sys.exit(1)