aboutsummaryrefslogtreecommitdiff
path: root/gprofng
diff options
context:
space:
mode:
authorJan Beulich <jbeulich@suse.com>2022-12-19 09:36:21 +0100
committerJan Beulich <jbeulich@suse.com>2022-12-19 09:36:21 +0100
commitb1fb503404584f0e1965e06fce558b8841cb3a4d (patch)
tree0d4470813846196eadcf78337379e6c3f287315e /gprofng
parentf8b6a781fb6b7e799c95c1c2be87accc39c0b7c0 (diff)
downloadgdb-b1fb503404584f0e1965e06fce558b8841cb3a4d.zip
gdb-b1fb503404584f0e1965e06fce558b8841cb3a4d.tar.gz
gdb-b1fb503404584f0e1965e06fce558b8841cb3a4d.tar.bz2
gprofng/testsuite: skip Java test without JDK
There's no point in even trying the Java test when gprofng was built without Java support, and when the building of the constituents of the testcase also would fail. On such systems this converts the respective tests from "unresolved" to "unsupported", making the overall testsuite run no longer report failure just because of this.
Diffstat (limited to 'gprofng')
-rw-r--r--gprofng/Makefile.am1
-rw-r--r--gprofng/Makefile.in1
-rw-r--r--gprofng/testsuite/gprofng.display/display.exp4
3 files changed, 5 insertions, 1 deletions
diff --git a/gprofng/Makefile.am b/gprofng/Makefile.am
index 96f8015..b90d569 100644
--- a/gprofng/Makefile.am
+++ b/gprofng/Makefile.am
@@ -61,6 +61,7 @@ check-DEJAGNU: site.exp development.exp
runtest=$(RUNTEST); \
if $(SHELL) -c "$$runtest --version" > /dev/null 2>&1; then \
$$runtest --tool $(DEJATOOL) --srcdir $${srcroot}/testsuite \
+ JDK_INC="$(jdk_inc)" \
GPROFNG_BROKEN_JAVAC="$(GPROFNG_BROKEN_JAVAC)" \
MAKE="$(MAKE)" CC="$(CC)" CFLAGS="$(CFLAGS) $(PTHREAD_CFLAGS)" \
LDFLAGS="$(LDFLAGS)" LIBS="$(PTHREAD_LIBS) $(LIBS)" \
diff --git a/gprofng/Makefile.in b/gprofng/Makefile.in
index d660f99..93477ba 100644
--- a/gprofng/Makefile.in
+++ b/gprofng/Makefile.in
@@ -938,6 +938,7 @@ uninstall-am:
@TCL_TRY_TRUE@ runtest=$(RUNTEST); \
@TCL_TRY_TRUE@ if $(SHELL) -c "$$runtest --version" > /dev/null 2>&1; then \
@TCL_TRY_TRUE@ $$runtest --tool $(DEJATOOL) --srcdir $${srcroot}/testsuite \
+@TCL_TRY_TRUE@ JDK_INC="$(jdk_inc)" \
@TCL_TRY_TRUE@ GPROFNG_BROKEN_JAVAC="$(GPROFNG_BROKEN_JAVAC)" \
@TCL_TRY_TRUE@ MAKE="$(MAKE)" CC="$(CC)" CFLAGS="$(CFLAGS) $(PTHREAD_CFLAGS)" \
@TCL_TRY_TRUE@ LDFLAGS="$(LDFLAGS)" LIBS="$(PTHREAD_LIBS) $(LIBS)" \
diff --git a/gprofng/testsuite/gprofng.display/display.exp b/gprofng/testsuite/gprofng.display/display.exp
index 8ba0393..237d577 100644
--- a/gprofng/testsuite/gprofng.display/display.exp
+++ b/gprofng/testsuite/gprofng.display/display.exp
@@ -54,6 +54,7 @@ switch $pltf {
}
}
+global JDK_INC
global GPROFNG_BROKEN_JAVAC
foreach line $table {
@@ -63,7 +64,8 @@ foreach line $table {
verbose [file rootname $line]
verbose running display test $line
- if { $GPROFNG_BROKEN_JAVAC == "yes" && $dir == "jsynprog" } {
+ if { $dir == "jsynprog"
+ && ($JDK_INC == "" || $GPROFNG_BROKEN_JAVAC == "yes") } {
unsupported $dir
} else {
run_display_test $dir $cflags $gprofflags