From patchwork Wed Dec 21 22:36:01 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Carlos O'Donell X-Patchwork-Id: 62247 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 5A6CF385B521 for ; Wed, 21 Dec 2022 22:36:32 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 5A6CF385B521 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sourceware.org; s=default; t=1671662192; bh=k7QMikxDQieoiZWiPJqvxtJQXMYebMMRRuKf1GE8STk=; h=To:Cc:Subject:Date:List-Id:List-Unsubscribe:List-Archive: List-Post:List-Help:List-Subscribe:From:Reply-To:From; b=IH4gukQHoK3ITHu79ldwAvEbJAwLFpzpphhWualxBUOUW6zL/SJPZC0hCnrzM0qy7 PPQYCfVTC2d+60oMXKE1lRz+QcWppxN9Cme7IHt+BXqK3yYbHamAQ5iTmsU4EkYdcg Fc5qIUemFBX3QZ6OsTLU2Xuc6TOh0qO4Kmq0Oqew= X-Original-To: libc-alpha@sourceware.org Delivered-To: libc-alpha@sourceware.org Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.133.124]) by sourceware.org (Postfix) with ESMTPS id 228C23857B9B for ; Wed, 21 Dec 2022 22:36:08 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.1 sourceware.org 228C23857B9B Received: from mail-io1-f72.google.com (mail-io1-f72.google.com [209.85.166.72]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_128_GCM_SHA256) id us-mta-324-VvspCbboMhObXYdRGHy54g-1; Wed, 21 Dec 2022 17:36:06 -0500 X-MC-Unique: VvspCbboMhObXYdRGHy54g-1 Received: by mail-io1-f72.google.com with SMTP id l21-20020a5d9315000000b006df7697880aso79271ion.23 for ; Wed, 21 Dec 2022 14:36:06 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; 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=k7QMikxDQieoiZWiPJqvxtJQXMYebMMRRuKf1GE8STk=; b=vlBWYg/9sAewNIAbSKhbyaTtSt1ouypyB+kcYGkR7MxNBSFRTiueBo9LDEk2sZnBN0 U3K23Z/RCDYMlQgYJm9z2aR3kPDSkfROj6WmYsKZ3GYdvEX+YCGRiCWwnGKpmDd1AEYL 38yu34YgOB02ZNfgDYrXayQjEBd6IUHUjJ4CqFd0HrGONmtp0ojcqindFgN5M1NSJJ+n x89v5RG3FhzDZELcW+I+iY00aoUBffJA0FSMnIcveqDofnLDs5HowjuT2vkr8dh3rwit 7hZE02xm57z7ubI83cRJXGYhXp+YRfxRjNEgscKBCgjprQnE0zJ6WbiMni1FMv6KErk3 giTw== X-Gm-Message-State: AFqh2kqeK/i5ocssrc7DRgCC0HcvKocu7/5Jfi1s8fZ+/YzFYejp6tDA iAxahLmxg1O0n6AltJjI0RrqNyBS3a/HR+WpNvMHfG+3tzd2PEVoS6VC5p2+PCIJxE1cJiHnCCB 1Jgq3+hF7li+1u8/8p9Z3ns7z5AQziOEyrI4ciHYD4xF45/Cnw1w5T/yZwzyR1v4gxT0aGg== X-Received: by 2002:a92:c8d0:0:b0:30b:cb15:d232 with SMTP id c16-20020a92c8d0000000b0030bcb15d232mr2452342ilq.29.1671662165219; Wed, 21 Dec 2022 14:36:05 -0800 (PST) X-Google-Smtp-Source: AMrXdXv1/IR25LJVeUmBYEONS7bWnNfKhBcC1sxwypuMWJycY2bZkH6xNsf7v2ODmC6rfR/J62zkgQ== X-Received: by 2002:a92:c8d0:0:b0:30b:cb15:d232 with SMTP id c16-20020a92c8d0000000b0030bcb15d232mr2452318ilq.29.1671662164839; Wed, 21 Dec 2022 14:36:04 -0800 (PST) Received: from athas.redhat.com (192-0-145-146.cpe.teksavvy.com. [192.0.145.146]) by smtp.gmail.com with ESMTPSA id a41-20020a02942c000000b00388b6508ec8sm5788361jai.115.2022.12.21.14.36.03 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 21 Dec 2022 14:36:03 -0800 (PST) To: libc-alpha@sourceware.org, fweimer@redhat.com Cc: Carlos O'Donell Subject: [PATCH] Simplify scripts/cross-test-ssh.sh configuration. Date: Wed, 21 Dec 2022 17:36:01 -0500 Message-Id: <20221221223601.2258958-1-carlos@redhat.com> X-Mailer: git-send-email 2.38.1 MIME-Version: 1.0 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-type: text/plain; charset=UTF-8 X-Spam-Status: No, score=-12.3 required=5.0 tests=BAYES_00, DKIMWL_WL_HIGH, DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, DKIM_VALID_EF, GIT_PATCH_0, RCVD_IN_DNSWL_NONE, RCVD_IN_MSPIKE_H2, SPF_HELO_NONE, SPF_NONE, 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: libc-alpha@sourceware.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Libc-alpha mailing list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-Patchwork-Original-From: Carlos O'Donell via Libc-alpha From: Carlos O'Donell Reply-To: Carlos O'Donell Errors-To: libc-alpha-bounces+patchwork=sourceware.org@sourceware.org Sender: "Libc-alpha" With modern ssh clients and daemons it is required to use AcceptEnv and SendEnv configuration options to correctly support testing the DSO sort ordering tests. This requirement is present because scripts/dso-ordering-test.py injects GLIBC_TUNABLES to the left of the ${test_wrapper_env} and so it must both be sent by the ssh client and accepted by the ssh daemon. This requirement is removed in this change and the injected GLIBC_TUNABLES is placed after ${run_program_env} and so still correctly provides the override that the test requires. This is similar to existing tests like elf/tst-pathopt.sh, elf/tst-rtld-load-self.sh, and locale/tst-locale-locpath.sh. Tested that it fixes two failures when cross-testing on aarch64 with scripts/cross-test-ssh.sh and an ssh client and daemon that do not pass GLIBC_TUNABLES. Without this fix such a configuration will report the following failures (since the GLIBC_TUNABLES not preserved): FAIL: elf/tst-bz15311 FAIL: elf/tst-bz28937 Tested without regression on native x86_64 and aarch64 builds. Reviewed-by: Florian Weimer --- scripts/dso-ordering-test.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/dso-ordering-test.py b/scripts/dso-ordering-test.py index b87cf2f809..7c29c21632 100644 --- a/scripts/dso-ordering-test.py +++ b/scripts/dso-ordering-test.py @@ -745,7 +745,7 @@ def process_testcase(t): if tunable_env else "") # Write out fragment of shell script for this single test. test_descr.sh.write \ - ("%s${test_wrapper_env} ${run_program_env} \\\n" + ("${test_wrapper_env} ${run_program_env} %s\\\n" "${common_objpfx}support/test-run-command \\\n" "${common_objpfx}elf/ld.so \\\n" "--library-path ${common_objpfx}elf/%s:"