mirror/binutils-gdb
2
0
Fork 0
mirror of https://sourceware.org/git/binutils-gdb.git synced 2024-11-27 03:51:15 +08:00
Code Issues Packages Projects Releases Wiki Activity

gprofng: fix regression in testing for not yet installed version

Browse Source 
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.
This commit is contained in:
Vladimir Mezentsev 2022-07-07 13:20:39 -07:00
parent c0abbd96b4
commit 5236c98902
3 changed files with 11 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
gprofng/src/Settings.cc
View File

@ -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;

22
gprofng/testsuite/gprofng.display/display.exp
View File

@ -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" "" ""}
}

3
gprofng/testsuite/lib/Makefile.skel
View File

@ -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