Mercurial > hg > openjdk > jigsaw > hotspot

changeset 4576:bc63dd2539a4

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Merge
author kvn
date Fri, 12 Apr 2013 20:37:18 -0400
parents 393fd4ef89c4 (diff) f36e073d56a4 (current diff)
children 886d1fd67dc3
files make/bsd/makefiles/debug.make make/bsd/makefiles/jvmg.make make/bsd/makefiles/profiled.make make/linux/makefiles/debug.make make/linux/makefiles/jvmg.make make/linux/makefiles/profiled.make make/solaris/makefiles/debug.make make/solaris/makefiles/jvmg.make make/solaris/makefiles/profiled.make
diffstat 1 files changed, 3 insertions(+), 1 deletions(-) [+]
line wrap: on
line diff
--- a/test/Makefile	Fri Apr 12 15:53:30 2013 -0700
+++ b/test/Makefile	Fri Apr 12 20:37:18 2013 -0400
@@ -162,7 +162,9 @@
 # jtreg tests
 
 # Expect JT_HOME to be set for jtreg tests. (home for jtreg)
-JT_HOME = $(SLASH_JAVA)/re/jtreg/4.0/promoted/latest/binaries/jtreg
+ifndef JT_HOME
+  JT_HOME = $(SLASH_JAVA)/re/jtreg/4.0/promoted/latest/binaries/jtreg
+endif
 ifdef JPRT_JTREG_HOME
   JT_HOME = $(JPRT_JTREG_HOME)
 endif