From patchwork Sat Dec 16 04:01:33 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sam James X-Patchwork-Id: 82289 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 7F49C3882076 for ; Sat, 16 Dec 2023 04:04:16 +0000 (GMT) X-Original-To: binutils@sourceware.org Delivered-To: binutils@sourceware.org Received: from smtp.gentoo.org (mail.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) by sourceware.org (Postfix) with ESMTP id 8A2FF38449EB for ; Sat, 16 Dec 2023 04:03:02 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org 8A2FF38449EB Authentication-Results: sourceware.org; dmarc=pass (p=none dis=none) header.from=gentoo.org Authentication-Results: sourceware.org; spf=pass smtp.mailfrom=gentoo.org ARC-Filter: OpenARC Filter v1.0.0 sourceware.org 8A2FF38449EB Authentication-Results: server2.sourceware.org; arc=none smtp.remote-ip=2001:470:ea4a:1:5054:ff:fec7:86e4 ARC-Seal: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1702699384; cv=none; b=v8heFILcTe+HprtUQxs2i3hQAwKZdL+3lIbD90kCJFPYXPYsklfMGli5fffgu64um7xULmAtH15FaZ4qC/77AjfT+L+L9R7pwDKq7U4ffAogbtE/PFSR0nlZEf3Ad4WAdskTRARjdS5meOtd+SddpriB0tV94HOwiNjoKg9/pqU= ARC-Message-Signature: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1702699384; c=relaxed/simple; bh=rv0lBZYkBMSCxy6iQBB8eRZeOUvP9GhPMOnNyhMexX0=; h=From:To:Subject:Date:Message-ID:MIME-Version; b=juRO1RkD/R/W90lejPMrg5aQRNihEkhNQvY4FaVfPkLzIIAqWaxdDctI3QCV8O4R2XfyCISfb/2zzuLifiE9ANELTlWqAT9uBNS20Dai/wGwmurvBWV2idcPhwDjtBXV5z1t3CVfF9WJSEu0v8maISN3i4xu5J/5KEqwWkI3DCg= ARC-Authentication-Results: i=1; server2.sourceware.org From: Sam James To: binutils@sourceware.org Cc: nickc@redhat.com, Vladimir Mezentsev Subject: [2.41 PATCH 10/10] Fix 30808 gprofng tests failed Date: Sat, 16 Dec 2023 04:01:33 +0000 Message-ID: <20231216040239.1981071-11-sam@gentoo.org> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20231216040239.1981071-1-sam@gentoo.org> References: <20231216040239.1981071-1-sam@gentoo.org> MIME-Version: 1.0 X-Spam-Status: No, score=-10.1 required=5.0 tests=BAYES_00, GIT_PATCH_0, JMQ_SPF_NEUTRAL, KAM_DMARC_STATUS, SPF_HELO_PASS, 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: binutils@sourceware.org X-Mailman-Version: 2.1.30 Precedence: list List-Id: Binutils mailing list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: binutils-bounces+patchwork=sourceware.org@sourceware.org From: Vladimir Mezentsev In gprofng testing, we need a tempory gprofng installation to resolve run-time dependencies on libraries (libgprofng, libopcodes, libbfd, etc). We set LD_LIBRARY_PATH and GPROFNG_SYSCONFDIR to find our libraries and configuration file. These variables must be set for all gprofng tests. Tested on aarch64 and x86_64 with and without --enable-shared and --target=<>. gprofng/ChangeLog 2023-08-31 Vladimir Mezentsev PR gprofng/30808 * testsuite/config/default.exp: Make a temporary install dir. Set LD_LIBRARY_PATH, GPROFNG_SYSCONFDIR. * testsuite/lib/Makefile.skel: Move LD_LIBRARY_PATH and GPROFNG_SYSCONFDIR setting in testsuite/config/default.exp. (cherry picked from commit a13e4c5c10d1a13d9128d033c9525810e876ac14) --- gprofng/testsuite/config/default.exp | 20 ++++++++++++++------ gprofng/testsuite/lib/Makefile.skel | 5 ----- 2 files changed, 14 insertions(+), 11 deletions(-) diff --git a/gprofng/testsuite/config/default.exp b/gprofng/testsuite/config/default.exp index 1c862d54592..c4a6588bb64 100644 --- a/gprofng/testsuite/config/default.exp +++ b/gprofng/testsuite/config/default.exp @@ -32,17 +32,25 @@ if {![info exists CFLAGS]} { set CFLAGS "-g -O2" } +remote_exec host "sh -c \"rm -rf tmpdir; mkdir -p tmpdir\"" if { "$CHECK_TARGET" == "check-install" } { set ::env(GPROFNG) "$PREFIX/bin/gprofng" } else { - set ::env(GPROFNG) "$BUILDDIR/src/gprofng" + # Make a temporary install dir to run gprofng from, and point at it + remote_exec host "sh -c \"$MAKE -C .. install-gprofng MAKEFLAGS=program_transform_name= DESTDIR=$BUILDDIR/tmpdir/root\"" + set ::env(GPROFNG) [exec find $BUILDDIR/tmpdir -type f -name gprofng -perm -u+x | head -1] + + set x [exec find $BUILDDIR/tmpdir -type d -name gprofng | head -1] + set ::env(LD_LIBRARY_PATH) "$x:$x/.." + + set x [exec find $BUILDDIR/tmpdir -type f -name gprofng.rc | head -1] + set ::env(GPROFNG_SYSCONFDIR) [exec dirname $x] + + puts "### LD_LIBRARY_PATH: $env(LD_LIBRARY_PATH)" + puts "### GPROFNG_SYSCONFDIR: $env(GPROFNG_SYSCONFDIR)" } +puts "### GPROFNG: $env(GPROFNG)" set TEST_TIMEOUT 300 -# Create directories where gprofng can find libraries and binaries: -remote_exec host "sh -c \"rm -rf tmpdir; mkdir -p tmpdir\"" -remote_exec host "sh -c \"mkdir -p lib; rm -f lib/gprofng; ln -s ../libcollector/.libs lib/gprofng\"" -remote_exec host "sh -c \"rm -f bin; ln -s src bin\"" - load_lib display-lib.exp diff --git a/gprofng/testsuite/lib/Makefile.skel b/gprofng/testsuite/lib/Makefile.skel index 5a30966c1cd..9ccc0340c10 100644 --- a/gprofng/testsuite/lib/Makefile.skel +++ b/gprofng/testsuite/lib/Makefile.skel @@ -39,11 +39,6 @@ DISPLAY = $(GPROFNG) display text EXPERIMENT = test.er DISPLAY_LOG = display.log -export LD_LIBRARY_PATH := $(BUILDDIR)/src - -# Set GPROFNG_SYSCONFDIR to find out gprofng.rc: -export GPROFNG_SYSCONFDIR := $(srcdir)/../../../src - .PHONY: all collect compare clobber clean all: compare