mirror/binutils-gdb
2
0
Fork 0
mirror of https://sourceware.org/git/binutils-gdb.git synced 2025-02-17 13:10:12 +08:00
Code Issues Packages Projects Releases Wiki Activity

gprofng/testsuite: skip Java test without JDK

Browse Source 
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.
This commit is contained in:
Jan Beulich 2022-12-19 09:36:21 +01:00
parent f8b6a781fb
commit b1fb503404
3 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
gprofng/Makefile.am
View File

@ -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)" \

1
gprofng/Makefile.in
View File

@ -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)" \

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

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