From: vladimir.mezentsev@oracle.com
To: binutils@sourceware.org
Subject: [PATCH] gprofng: fix regression in testing for not yet installed version
Date: Thu, 7 Jul 2022 13:24:27 -0700 [thread overview]
Message-ID: <20220707202427.2746758-1-vladimir.mezentsev@oracle.com> (raw)
From: Vladimir Mezentsev <vladimir.mezentsev@oracle.com>
gprofng/ChangeLog
2022-07-07 Vladimir Mezentsev <vladimir.mezentsev@oracle.com>
* src/Settings.cc (Settings::read_rc): Read environment variable
GPROFNG_SYSCONFDIR.
* testsuite/lib/Makefile.skel: Export GPROFNG_SYSCONFDIR.
* testsuite/gprofng.display/display.exp: Shorten the list of tests.
---
gprofng/src/Settings.cc | 5 ++++-
gprofng/testsuite/gprofng.display/display.exp | 22 ++++---------------
gprofng/testsuite/lib/Makefile.skel | 3 +++
3 files changed, 11 insertions(+), 19 deletions(-)
diff --git a/gprofng/src/Settings.cc b/gprofng/src/Settings.cc
index 39cb806dd4e..572997f8a88 100644
--- a/gprofng/src/Settings.cc
+++ b/gprofng/src/Settings.cc
@@ -407,7 +407,10 @@ Settings::read_rc (bool ipc_or_rdt_mode)
free (rc_path);
// Read system-wide file
- rc_path = dbe_sprintf (NTXT ("%s/gprofng.rc"), SYSCONFDIR);
+ const char *sysconfdir = getenv("GPROFNG_SYSCONFDIR");
+ if (sysconfdir == NULL)
+ sysconfdir = SYSCONFDIR;
+ rc_path = dbe_sprintf (NTXT ("%s/gprofng.rc"), sysconfdir);
if (access (rc_path, R_OK | F_OK) != 0)
{
StringBuilder sb;
diff --git a/gprofng/testsuite/gprofng.display/display.exp b/gprofng/testsuite/gprofng.display/display.exp
index dfb383e9fc6..8ba03935867 100644
--- a/gprofng/testsuite/gprofng.display/display.exp
+++ b/gprofng/testsuite/gprofng.display/display.exp
@@ -30,38 +30,24 @@ switch $pltf {
# dir cflags gprofflags Others
set table {
{"jsynprog" "-g -Wall" "-p on -j on"}
- {"mttest" "" ""}
- {"mttest" "-g -Wall" "-p on"}
{"mttest" "-g -O0" "-p on"}
- {"mttest" "-g -O" "-p on"}
- {"mttest" "-g -O" "-h on"}
- {"mttest" "-g -O" "-h on"}
- {"mttest" "-g -O" "-p on -h on"}
- {"synprog" "" ""}
- {"synprog" "-g" "-p on"}
+ {"mttest" "-g -O0" "-p on -h on"}
{"synprog" "-g -O0" "-p on"}
- {"synprog" "-g -O" "-p on"}
- {"synprog" "-g" "-p on -h on"}
- {"synprog" "-g -O0" "-p on -h on"}
- {"synprog" "-g -O" "-p on -h on"}
+ {"synprog" "-g -O0" "-p on -h on"}
}
}
aarch64 {
set table {
{"jsynprog" "-g -Wall" "-p on -j on"}
- {"mttest" "" ""}
- {"mttest" "-g -Wall" "-p on"}
{"mttest" "-g -O0" "-p on"}
- {"mttest" "-g -O" "-p on"}
- {"synprog" "" ""}
- {"synprog" "-g" "-p on"}
- {"synprog" "-g -O" "-p on"}
+ {"synprog" "-g -O0" "-p on"}
}
}
default {
# Columns in the table represent:
# dir cflags gprofflags Others
set table {
+ {"jsynprog" "" ""}
{"mttest" "" ""}
{"synprog" "" ""}
}
diff --git a/gprofng/testsuite/lib/Makefile.skel b/gprofng/testsuite/lib/Makefile.skel
index 7810ba7ed7a..157f6f60c84 100644
--- a/gprofng/testsuite/lib/Makefile.skel
+++ b/gprofng/testsuite/lib/Makefile.skel
@@ -42,6 +42,9 @@ DISPLAY_LOG = display.log
gprofng_dir := $(shell dirname $$(find ../root -name libgprofng.so.0 | head -1))
export LD_LIBRARY_PATH := $(gprofng_dir):$(gprofng_dir)/..
+# Set GPROFNG_SYSCONFDIR to find out gprofng.rc:
+export GPROFNG_SYSCONFDIR := $(srcdir)/../../../src
+
.PHONY: all collect compare clobber clean
all: compare
--
2.27.0
reply other threads:[~2022-07-07 20:24 UTC|newest]
Thread overview: [no followups] expand[flat|nested] mbox.gz Atom feed
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20220707202427.2746758-1-vladimir.mezentsev@oracle.com \
--to=vladimir.mezentsev@oracle.com \
--cc=binutils@sourceware.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).