changeset 8262:daa5092b07a7 jdk7u80-b15

Merge
author asaha
date Fri, 10 Apr 2015 09:12:54 -0700
parents 731bd7202310 da10411a1681
children a942e0b52477
files .hgtags test/Makefile
diffstat 2 files changed, 3 insertions(+), 2 deletions(-) [+]
line wrap: on
line diff
--- a/.hgtags	Thu Apr 09 22:10:53 2015 -0700
+++ b/.hgtags	Fri Apr 10 09:12:54 2015 -0700
@@ -570,6 +570,7 @@
 efc8369247fc9ace2ce2008192349e1e49949e7d jdk7u79-b13
 2471c1dfff367fd75654eaeff608f0c32caa8171 jdk7u79-b14
 da34e5f77e9e922844e7eb8d1e165d25245a8b40 jdk7u79-b30
+ea77b684d424c40f983d1aff2c9f4ef6a9c572b0 jdk7u79-b15
 f33e6ea5f4832468dd86a8d48ef50479ce91111e jdk7u80-b06
 feb04280659bf05b567dc725ff53e2a2077bdbb7 jdk7u80-b07
 f1334857fa99e6472870986b6071f9405c29ced4 jdk7u80-b08
--- a/test/Makefile	Thu Apr 09 22:10:53 2015 -0700
+++ b/test/Makefile	Fri Apr 10 09:12:54 2015 -0700
@@ -636,8 +636,8 @@
 
 # ------------------------------------------------------------------
 
-# Default JTREG to run (win32 script works for everybody)
-JTREG = $(JT_HOME)/win32/bin/jtreg
+# Default JTREG to run
+JTREG = $(JT_HOME)/bin/jtreg
 # Add any extra options (agentvm etc.)
 JTREG_BASIC_OPTIONS += $(EXTRA_JTREG_OPTIONS)
 # Only run automatic tests