From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: by sourceware.org (Postfix, from userid 2191) id 91B443858298; Thu, 22 Dec 2022 16:09:07 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 91B443858298 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sourceware.org; s=default; t=1671725347; bh=pPAT+jicbrZ+aIIOt/P1usRsokYbA6V34wKzWPLaG1w=; h=From:To:Subject:Date:From; b=pUC+K6yD88ZTkXCYGxxyc+bbe1+tE4cxETsv2rYkR4aHvQYvmbYxcbdDHlR3u5pE9 Wt119n66SG3xNrLhAMgoXhnsI9kMgLkZ0DsisJRICMKPHdCd6mu24p3Ki13QkjIg3Z 4aKfTsd1+agfpBs36VrbKqMnHMQV3fNkT1gn0vuE= Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: Carlos O'Donell To: glibc-cvs@sourceware.org Subject: [glibc] Simplify scripts/cross-test-ssh.sh configuration. X-Act-Checkin: glibc X-Git-Author: Carlos O'Donell X-Git-Refname: refs/heads/master X-Git-Oldrev: 81a94a2ae34bac9c3d907bbe0468ba56914accb0 X-Git-Newrev: 9ffeabdf2e5078d8e8a4158e9b6be2ac2c616220 Message-Id: <20221222160907.91B443858298@sourceware.org> Date: Thu, 22 Dec 2022 16:09:07 +0000 (GMT) List-Id: https://sourceware.org/git/gitweb.cgi?p=glibc.git;h=9ffeabdf2e5078d8e8a4158e9b6be2ac2c616220 commit 9ffeabdf2e5078d8e8a4158e9b6be2ac2c616220 Author: Carlos O'Donell Date: Wed Dec 21 17:21:05 2022 -0500 Simplify scripts/cross-test-ssh.sh configuration. 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 Diff: --- 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:"