From patchwork Thu Jan 23 21:33:28 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Joseph Myers X-Patchwork-Id: 1228568 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=sourceware.org (client-ip=209.132.180.131; helo=sourceware.org; envelope-from=libc-alpha-return-108934-incoming=patchwork.ozlabs.org@sourceware.org; receiver=) Authentication-Results: ozlabs.org; dmarc=none (p=none dis=none) header.from=codesourcery.com Authentication-Results: ozlabs.org; dkim=pass (1024-bit key; secure) header.d=sourceware.org header.i=@sourceware.org header.a=rsa-sha1 header.s=default header.b=U0vVthXQ; dkim-atps=neutral Received: from sourceware.org (server1.sourceware.org [209.132.180.131]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 483b9z1Hghz9sPJ for ; Fri, 24 Jan 2020 08:33:42 +1100 (AEDT) DomainKey-Signature: a=rsa-sha1; c=nofws; d=sourceware.org; h=list-id :list-unsubscribe:list-subscribe:list-archive:list-post :list-help:sender:date:from:to:cc:subject:message-id :mime-version:content-type; q=dns; s=default; b=mIXYvyWkPKeqUaN7 Z9/sRgBibJY16cCCwEJhibJGKXtP0RJ31sTtIwQ89cBWo/nin8s0m1Wp+w56ZlBh JdAeljS4UJpBku4NjTfsttAqf2piBgzew10tN7GhO65LlsYHnZWBtKaLvPO5bFM2 dczuOfUfMuPM7cYQ2zFZSKh1TO0= DKIM-Signature: v=1; a=rsa-sha1; c=relaxed; d=sourceware.org; h=list-id :list-unsubscribe:list-subscribe:list-archive:list-post :list-help:sender:date:from:to:cc:subject:message-id :mime-version:content-type; s=default; bh=nNu1tx+W7uGYL1alC21Ndn 7azGk=; b=U0vVthXQxD8nbEWHZvQLoyK8c+YgADDVmBcmG29cdYV3gtojnDtx3+ Tjt/3ApR5Fi8+EcLi4aYgtuMUjlPu58nXE0k5R1RvZ2xB+gCrxsj7JGv9RGD+O5+ /iluNgvrLSd7894e4K5LmnDt0KJb4JVWYjbKaXEfOAtyNgD4Ty5g0= Received: (qmail 14051 invoked by alias); 23 Jan 2020 21:33:36 -0000 Mailing-List: contact libc-alpha-help@sourceware.org; run by ezmlm Precedence: bulk List-Id: List-Unsubscribe: List-Subscribe: List-Archive: List-Post: List-Help: , Sender: libc-alpha-owner@sourceware.org Delivered-To: mailing list libc-alpha@sourceware.org Received: (qmail 14037 invoked by uid 89); 23 Jan 2020 21:33:36 -0000 Authentication-Results: sourceware.org; auth=none X-Spam-SWARE-Status: No, score=-15.2 required=5.0 tests=AWL, BAYES_00, GIT_PATCH_0, GIT_PATCH_1, GIT_PATCH_2, GIT_PATCH_3 autolearn=ham version=3.3.1 spammy= X-HELO: esa1.mentor.iphmx.com IronPort-SDR: OhBhtgJrtl5IWUOYgU6aTg0A41VOg6hwgJA6YAlAcBkJR58zkAqKQAFidwR9+NrXYxYG46CRZg 4gFhuFrgdmCNuUVTY1ytEy7eude531bPF38rKFgAcoyS1bgNqgwIBP0qK68vBC7IBWs8k4sjTR lPIpJwn/iMI+d1N5XGQlUWZh5/+WN6iIZPhRTgfrd7harJJ5ZCUEBvvHTzY96YwbBz8APw4ErK T8C7fcvJGbWdx45sZp+kck5IAv2m9/or4VZd6JbfYN5pztN9Eby9eMgC9IFk8TWrGzaaxefR4Q J1g= IronPort-SDR: L3NkeRJ06DIqt6sf43oVg9Rh8EuuA1h9RhoySxET91qCpNKG65t41F4oV6BnoLDg8DrF0dmgd6 OfM29rfhUwWQ== Date: Thu, 23 Jan 2020 21:33:28 +0000 From: Joseph Myers To: CC: Subject: Fix elf/tst-rtld-preload cross-testing Message-ID: User-Agent: Alpine 2.21 (DEB 202 2017-01-01) MIME-Version: 1.0 As noted in , elf/tst-rtld-preload fails when cross-testing because it attempts to run the test wrapper with itself. Unfortunately, that thread never resulted in a complete and correct patch for that test. This patch addresses the issues with that test more thoroughly. The test is changed not to use the wrapper twice, including updating the message it prints about the command it runs to be more complete and accurate after the change; the Makefile is changed not to pass the redundant '$(test-wrapper)' argument. Tested for Arm that this fixes the failure seen for that test in cross-testing. Reviewed-by: Carlos O'Donell diff --git a/elf/Makefile b/elf/Makefile index 0c6bd926a1..632a4d8b0f 100644 --- a/elf/Makefile +++ b/elf/Makefile @@ -931,7 +931,7 @@ $(objpfx)tst-rtld-preload.out: tst-rtld-preload.sh $(objpfx)ld.so \ $(objpfx)preloadtest \ $(preloadtest-preloads:%=$(objpfx)%.so) $(SHELL) $< $(objpfx)ld.so $(objpfx)preloadtest \ - '$(test-wrapper)' '$(test-wrapper-env)' '$(run_program_env)' \ + '$(test-wrapper-env)' '$(run_program_env)' \ '$(rpath-link)' '$(tst-rtld-preload-OBJS)' > $@; \ $(evaluate-test) diff --git a/elf/tst-rtld-preload.sh b/elf/tst-rtld-preload.sh index 02fe4a5a06..190d35c2ea 100755 --- a/elf/tst-rtld-preload.sh +++ b/elf/tst-rtld-preload.sh @@ -21,17 +21,16 @@ set -e rtld=$1 test_program=$2 -test_wrapper=$3 -test_wrapper_env=$4 -run_program_env=$5 -library_path=$6 -preload=$7 +test_wrapper_env=$3 +run_program_env=$4 +library_path=$5 +preload=$6 -echo "# [${test_wrapper}] [$rtld] [--library-path] [$library_path]" \ - "[--preload] [$preload] [$test_program]" +echo "# [${test_wrapper_env}] [${run_program_env}] [$rtld] [--library-path]" \ + "[$library_path] [--preload] [$preload] [$test_program]" ${test_wrapper_env} \ ${run_program_env} \ -${test_wrapper} $rtld --library-path "$library_path" \ +$rtld --library-path "$library_path" \ --preload "$preload" $test_program 2>&1 && rc=0 || rc=$? echo "# exit status $rc"