diff options
| -rw-r--r-- | gprofng/Makefile.am | 1 | ||||
| -rw-r--r-- | gprofng/Makefile.in | 1 | ||||
| -rw-r--r-- | gprofng/testsuite/gprofng.display/display.exp | 4 |
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 |