From 5236c98902ecdcdc043ccaa7ead08e85e478fd65 Mon Sep 17 00:00:00 2001
From: Vladimir Mezentsev <vladimir.mezentsev@oracle.com>
Date: Thu, 7 Jul 2022 13:20:39 -0700
Subject: gprofng: fix regression in testing for not yet installed version

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(-)

(limited to 'gprofng')

diff --git a/gprofng/src/Settings.cc b/gprofng/src/Settings.cc
index 39cb806..572997f 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 dfb383e..8ba0393 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 7810ba7..157f6f6 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
-- 
cgit v1.1