8200241: [TESTBUG] java/lang/String/concat/ tests should not force source/target = 9 anymore
Reviewed-by: redestad, psandoz
--- a/test/jdk/java/lang/String/concat/CompactStringsInitialCoder.java Mon Mar 26 19:27:45 2018 +0530
+++ b/test/jdk/java/lang/String/concat/CompactStringsInitialCoder.java Mon Mar 26 20:20:45 2018 +0200
@@ -26,7 +26,7 @@
* @summary StringConcatFactory MH_INLINE_SIZED_EXACT strategy does not work with -XX:-CompactStrings
* @bug 8148869
*
- * @compile -XDstringConcat=indy -source 1.9 -target 1.9 CompactStringsInitialCoder.java
+ * @compile -XDstringConcat=indy CompactStringsInitialCoder.java
*
* @run main/othervm -Xverify:all -Djava.lang.invoke.stringConcat=BC_SB -XX:+CompactStrings CompactStringsInitialCoder
* @run main/othervm -Xverify:all -Djava.lang.invoke.stringConcat=BC_SB_SIZED -XX:+CompactStrings CompactStringsInitialCoder
@@ -35,7 +35,7 @@
* @run main/othervm -Xverify:all -Djava.lang.invoke.stringConcat=MH_SB_SIZED_EXACT -XX:+CompactStrings CompactStringsInitialCoder
* @run main/othervm -Xverify:all -Djava.lang.invoke.stringConcat=MH_INLINE_SIZED_EXACT -XX:+CompactStrings CompactStringsInitialCoder
*
- * @compile -XDstringConcat=indyWithConstants -source 1.9 -target 1.9 CompactStringsInitialCoder.java
+ * @compile -XDstringConcat=indyWithConstants CompactStringsInitialCoder.java
*
* @run main/othervm -Xverify:all -Djava.lang.invoke.stringConcat=BC_SB -XX:+CompactStrings CompactStringsInitialCoder
* @run main/othervm -Xverify:all -Djava.lang.invoke.stringConcat=BC_SB_SIZED -XX:+CompactStrings CompactStringsInitialCoder
@@ -44,7 +44,7 @@
* @run main/othervm -Xverify:all -Djava.lang.invoke.stringConcat=MH_SB_SIZED_EXACT -XX:+CompactStrings CompactStringsInitialCoder
* @run main/othervm -Xverify:all -Djava.lang.invoke.stringConcat=MH_INLINE_SIZED_EXACT -XX:+CompactStrings CompactStringsInitialCoder
*
- * @compile -XDstringConcat=indy -source 1.9 -target 1.9 CompactStringsInitialCoder.java
+ * @compile -XDstringConcat=indy CompactStringsInitialCoder.java
*
* @run main/othervm -Xverify:all -Djava.lang.invoke.stringConcat=BC_SB -XX:-CompactStrings CompactStringsInitialCoder
* @run main/othervm -Xverify:all -Djava.lang.invoke.stringConcat=BC_SB_SIZED -XX:-CompactStrings CompactStringsInitialCoder
@@ -53,7 +53,7 @@
* @run main/othervm -Xverify:all -Djava.lang.invoke.stringConcat=MH_SB_SIZED_EXACT -XX:-CompactStrings CompactStringsInitialCoder
* @run main/othervm -Xverify:all -Djava.lang.invoke.stringConcat=MH_INLINE_SIZED_EXACT -XX:-CompactStrings CompactStringsInitialCoder
*
- * @compile -XDstringConcat=indyWithConstants -source 1.9 -target 1.9 CompactStringsInitialCoder.java
+ * @compile -XDstringConcat=indyWithConstants CompactStringsInitialCoder.java
*
* @run main/othervm -Xverify:all -Djava.lang.invoke.stringConcat=BC_SB -XX:-CompactStrings CompactStringsInitialCoder
* @run main/othervm -Xverify:all -Djava.lang.invoke.stringConcat=BC_SB_SIZED -XX:-CompactStrings CompactStringsInitialCoder
--- a/test/jdk/java/lang/String/concat/ImplicitStringConcat.java Mon Mar 26 19:27:45 2018 +0530
+++ b/test/jdk/java/lang/String/concat/ImplicitStringConcat.java Mon Mar 26 20:20:45 2018 +0200
@@ -31,7 +31,7 @@
* @compile -XDstringConcat=inline ImplicitStringConcat.java
* @run main/othervm -Xverify:all ImplicitStringConcat
*
- * @compile -XDstringConcat=indy -source 1.9 -target 1.9 ImplicitStringConcat.java
+ * @compile -XDstringConcat=indy ImplicitStringConcat.java
*
* @run main/othervm -Xverify:all -Djava.lang.invoke.stringConcat=BC_SB ImplicitStringConcat
* @run main/othervm -Xverify:all -Djava.lang.invoke.stringConcat=BC_SB_SIZED ImplicitStringConcat
@@ -61,7 +61,7 @@
* @run main/othervm -Xverify:all -Djava.lang.invoke.stringConcat=MH_SB_SIZED_EXACT -Djava.lang.invoke.stringConcat.debug=true -Djava.lang.invoke.stringConcat.cache=true ImplicitStringConcat
* @run main/othervm -Xverify:all -Djava.lang.invoke.stringConcat=MH_INLINE_SIZED_EXACT -Djava.lang.invoke.stringConcat.debug=true -Djava.lang.invoke.stringConcat.cache=true ImplicitStringConcat
*
- * @compile -XDstringConcat=indyWithConstants -source 1.9 -target 1.9 ImplicitStringConcat.java
+ * @compile -XDstringConcat=indyWithConstants ImplicitStringConcat.java
*
* @run main/othervm -Xverify:all -Djava.lang.invoke.stringConcat=BC_SB ImplicitStringConcat
* @run main/othervm -Xverify:all -Djava.lang.invoke.stringConcat=BC_SB_SIZED ImplicitStringConcat
--- a/test/jdk/java/lang/String/concat/ImplicitStringConcatArgCount.java Mon Mar 26 19:27:45 2018 +0530
+++ b/test/jdk/java/lang/String/concat/ImplicitStringConcatArgCount.java Mon Mar 26 20:20:45 2018 +0200
@@ -31,7 +31,7 @@
* @compile -XDallowStringFolding=false -XDstringConcat=inline ImplicitStringConcatArgCount.java
* @run main/othervm -Xverify:all ImplicitStringConcatArgCount
*
- * @compile -XDallowStringFolding=false -XDstringConcat=indy -source 1.9 -target 1.9 ImplicitStringConcatArgCount.java
+ * @compile -XDallowStringFolding=false -XDstringConcat=indy ImplicitStringConcatArgCount.java
*
* @run main/othervm -Xverify:all -Djava.lang.invoke.stringConcat=BC_SB ImplicitStringConcatArgCount
* @run main/othervm -Xverify:all -Djava.lang.invoke.stringConcat=BC_SB_SIZED ImplicitStringConcatArgCount
@@ -61,7 +61,7 @@
* @run main/othervm -Xverify:all -Djava.lang.invoke.stringConcat=MH_SB_SIZED_EXACT -Djava.lang.invoke.stringConcat.debug=true -Djava.lang.invoke.stringConcat.cache=true ImplicitStringConcatArgCount
* @run main/othervm -Xverify:all -Djava.lang.invoke.stringConcat=MH_INLINE_SIZED_EXACT -Djava.lang.invoke.stringConcat.debug=true -Djava.lang.invoke.stringConcat.cache=true ImplicitStringConcatArgCount
*
- * @compile -XDallowStringFolding=false -XDstringConcat=indyWithConstants -source 1.9 -target 1.9 ImplicitStringConcatArgCount.java
+ * @compile -XDallowStringFolding=false -XDstringConcat=indyWithConstants ImplicitStringConcatArgCount.java
*
* @run main/othervm -Xverify:all -Djava.lang.invoke.stringConcat=BC_SB ImplicitStringConcatArgCount
* @run main/othervm -Xverify:all -Djava.lang.invoke.stringConcat=BC_SB_SIZED ImplicitStringConcatArgCount
--- a/test/jdk/java/lang/String/concat/ImplicitStringConcatBoundaries.java Mon Mar 26 19:27:45 2018 +0530
+++ b/test/jdk/java/lang/String/concat/ImplicitStringConcatBoundaries.java Mon Mar 26 20:20:45 2018 +0200
@@ -31,7 +31,7 @@
* @compile -XDstringConcat=inline ImplicitStringConcatBoundaries.java
* @run main/othervm -Xverify:all ImplicitStringConcatBoundaries
*
- * @compile -XDstringConcat=indy -source 1.9 -target 1.9 ImplicitStringConcatBoundaries.java
+ * @compile -XDstringConcat=indy ImplicitStringConcatBoundaries.java
*
* @run main/othervm -Xverify:all -Djava.lang.invoke.stringConcat=BC_SB ImplicitStringConcatBoundaries
* @run main/othervm -Xverify:all -Djava.lang.invoke.stringConcat=BC_SB_SIZED ImplicitStringConcatBoundaries
@@ -61,7 +61,7 @@
* @run main/othervm -Xverify:all -Djava.lang.invoke.stringConcat=MH_SB_SIZED_EXACT -Djava.lang.invoke.stringConcat.debug=true -Djava.lang.invoke.stringConcat.cache=true ImplicitStringConcatBoundaries
* @run main/othervm -Xverify:all -Djava.lang.invoke.stringConcat=MH_INLINE_SIZED_EXACT -Djava.lang.invoke.stringConcat.debug=true -Djava.lang.invoke.stringConcat.cache=true ImplicitStringConcatBoundaries
*
- * @compile -XDstringConcat=indyWithConstants -source 1.9 -target 1.9 ImplicitStringConcatBoundaries.java
+ * @compile -XDstringConcat=indyWithConstants ImplicitStringConcatBoundaries.java
*
* @run main/othervm -Xverify:all -Djava.lang.invoke.stringConcat=BC_SB ImplicitStringConcatBoundaries
* @run main/othervm -Xverify:all -Djava.lang.invoke.stringConcat=BC_SB_SIZED ImplicitStringConcatBoundaries
--- a/test/jdk/java/lang/String/concat/ImplicitStringConcatMany.java Mon Mar 26 19:27:45 2018 +0530
+++ b/test/jdk/java/lang/String/concat/ImplicitStringConcatMany.java Mon Mar 26 20:20:45 2018 +0200
@@ -31,7 +31,7 @@
* @compile -XDstringConcat=inline ImplicitStringConcatMany.java
* @run main/othervm -Xverify:all ImplicitStringConcatMany
*
- * @compile -XDstringConcat=indy -source 1.9 -target 1.9 ImplicitStringConcatMany.java
+ * @compile -XDstringConcat=indy ImplicitStringConcatMany.java
*
* @run main/othervm -Xverify:all -Djava.lang.invoke.stringConcat=BC_SB ImplicitStringConcatMany
* @run main/othervm -Xverify:all -Djava.lang.invoke.stringConcat=BC_SB_SIZED ImplicitStringConcatMany
@@ -61,7 +61,7 @@
* @run main/othervm -Xverify:all -Djava.lang.invoke.stringConcat=MH_SB_SIZED_EXACT -Djava.lang.invoke.stringConcat.debug=true -Djava.lang.invoke.stringConcat.cache=true ImplicitStringConcatMany
* @run main/othervm -Xverify:all -Djava.lang.invoke.stringConcat=MH_INLINE_SIZED_EXACT -Djava.lang.invoke.stringConcat.debug=true -Djava.lang.invoke.stringConcat.cache=true ImplicitStringConcatMany
*
- * @compile -XDstringConcat=indyWithConstants -source 1.9 -target 1.9 ImplicitStringConcatMany.java
+ * @compile -XDstringConcat=indyWithConstants ImplicitStringConcatMany.java
*
* @run main/othervm -Xverify:all -Djava.lang.invoke.stringConcat=BC_SB ImplicitStringConcatMany
* @run main/othervm -Xverify:all -Djava.lang.invoke.stringConcat=BC_SB_SIZED ImplicitStringConcatMany
--- a/test/jdk/java/lang/String/concat/ImplicitStringConcatManyLongs.java Mon Mar 26 19:27:45 2018 +0530
+++ b/test/jdk/java/lang/String/concat/ImplicitStringConcatManyLongs.java Mon Mar 26 20:20:45 2018 +0200
@@ -31,7 +31,7 @@
* @compile -XDstringConcat=inline ImplicitStringConcatManyLongs.java
* @run main/othervm -Xverify:all ImplicitStringConcatManyLongs
*
- * @compile -XDstringConcat=indy -source 1.9 -target 1.9 ImplicitStringConcatManyLongs.java
+ * @compile -XDstringConcat=indy ImplicitStringConcatManyLongs.java
*
* @run main/othervm -Xverify:all -Djava.lang.invoke.stringConcat=BC_SB ImplicitStringConcatManyLongs
* @run main/othervm -Xverify:all -Djava.lang.invoke.stringConcat=BC_SB_SIZED ImplicitStringConcatManyLongs
@@ -61,7 +61,7 @@
* @run main/othervm -Xverify:all -Djava.lang.invoke.stringConcat=MH_SB_SIZED_EXACT -Djava.lang.invoke.stringConcat.debug=true -Djava.lang.invoke.stringConcat.cache=true ImplicitStringConcatManyLongs
* @run main/othervm -Xverify:all -Djava.lang.invoke.stringConcat=MH_INLINE_SIZED_EXACT -Djava.lang.invoke.stringConcat.debug=true -Djava.lang.invoke.stringConcat.cache=true ImplicitStringConcatManyLongs
*
- * @compile -XDstringConcat=indyWithConstants -source 1.9 -target 1.9 ImplicitStringConcatManyLongs.java
+ * @compile -XDstringConcat=indyWithConstants ImplicitStringConcatManyLongs.java
*
* @run main/othervm -Xverify:all -Djava.lang.invoke.stringConcat=BC_SB ImplicitStringConcatManyLongs
* @run main/othervm -Xverify:all -Djava.lang.invoke.stringConcat=BC_SB_SIZED ImplicitStringConcatManyLongs
--- a/test/jdk/java/lang/String/concat/ImplicitStringConcatOrder.java Mon Mar 26 19:27:45 2018 +0530
+++ b/test/jdk/java/lang/String/concat/ImplicitStringConcatOrder.java Mon Mar 26 20:20:45 2018 +0200
@@ -32,7 +32,7 @@
* @compile -XDstringConcat=inline ImplicitStringConcatOrder.java
* @run main/othervm -Xverify:all ImplicitStringConcatOrder
*
- * @compile -XDstringConcat=indy -source 1.9 -target 1.9 ImplicitStringConcatOrder.java
+ * @compile -XDstringConcat=indy ImplicitStringConcatOrder.java
*
* @run main/othervm -Xverify:all -Djava.lang.invoke.stringConcat=BC_SB ImplicitStringConcatOrder
* @run main/othervm -Xverify:all -Djava.lang.invoke.stringConcat=BC_SB_SIZED ImplicitStringConcatOrder
@@ -62,7 +62,7 @@
* @run main/othervm -Xverify:all -Djava.lang.invoke.stringConcat=MH_SB_SIZED_EXACT -Djava.lang.invoke.stringConcat.debug=true -Djava.lang.invoke.stringConcat.cache=true ImplicitStringConcatOrder
* @run main/othervm -Xverify:all -Djava.lang.invoke.stringConcat=MH_INLINE_SIZED_EXACT -Djava.lang.invoke.stringConcat.debug=true -Djava.lang.invoke.stringConcat.cache=true ImplicitStringConcatOrder
*
- * @compile -XDstringConcat=indyWithConstants -source 1.9 -target 1.9 ImplicitStringConcatOrder.java
+ * @compile -XDstringConcat=indyWithConstants ImplicitStringConcatOrder.java
*
* @run main/othervm -Xverify:all -Djava.lang.invoke.stringConcat=BC_SB ImplicitStringConcatOrder
* @run main/othervm -Xverify:all -Djava.lang.invoke.stringConcat=BC_SB_SIZED ImplicitStringConcatOrder
--- a/test/jdk/java/lang/String/concat/ImplicitStringConcatShapes-head.template Mon Mar 26 19:27:45 2018 +0530
+++ b/test/jdk/java/lang/String/concat/ImplicitStringConcatShapes-head.template Mon Mar 26 20:20:45 2018 +0200
@@ -31,7 +31,7 @@
* @compile -XDstringConcat=inline ImplicitStringConcatShapes.java
* @run main/othervm -Xverify:all ImplicitStringConcatShapes
*
- * @compile -XDstringConcat=indy -source 1.9 -target 1.9 ImplicitStringConcatShapes.java
+ * @compile -XDstringConcat=indy ImplicitStringConcatShapes.java
*
* @run main/othervm -Xverify:all -Djava.lang.invoke.stringConcat=BC_SB ImplicitStringConcatShapes
* @run main/othervm -Xverify:all -Djava.lang.invoke.stringConcat=BC_SB_SIZED ImplicitStringConcatShapes
@@ -61,7 +61,7 @@
* @run main/othervm -Xverify:all -Djava.lang.invoke.stringConcat=MH_SB_SIZED_EXACT -Djava.lang.invoke.stringConcat.debug=true -Djava.lang.invoke.stringConcat.cache=true ImplicitStringConcatShapes
* @run main/othervm -Xverify:all -Djava.lang.invoke.stringConcat=MH_INLINE_SIZED_EXACT -Djava.lang.invoke.stringConcat.debug=true -Djava.lang.invoke.stringConcat.cache=true ImplicitStringConcatShapes
*
- * @compile -XDstringConcat=indyWithConstants -source 1.9 -target 1.9 ImplicitStringConcatShapes.java
+ * @compile -XDstringConcat=indyWithConstants ImplicitStringConcatShapes.java
*
* @run main/othervm -Xverify:all -Djava.lang.invoke.stringConcat=BC_SB ImplicitStringConcatShapes
* @run main/othervm -Xverify:all -Djava.lang.invoke.stringConcat=BC_SB_SIZED ImplicitStringConcatShapes
--- a/test/jdk/java/lang/String/concat/ImplicitStringConcatShapes.java Mon Mar 26 19:27:45 2018 +0530
+++ b/test/jdk/java/lang/String/concat/ImplicitStringConcatShapes.java Mon Mar 26 20:20:45 2018 +0200
@@ -31,7 +31,7 @@
* @compile -XDstringConcat=inline ImplicitStringConcatShapes.java
* @run main/othervm -Xverify:all ImplicitStringConcatShapes
*
- * @compile -XDstringConcat=indy -source 1.9 -target 1.9 ImplicitStringConcatShapes.java
+ * @compile -XDstringConcat=indy ImplicitStringConcatShapes.java
*
* @run main/othervm -Xverify:all -Djava.lang.invoke.stringConcat=BC_SB ImplicitStringConcatShapes
* @run main/othervm -Xverify:all -Djava.lang.invoke.stringConcat=BC_SB_SIZED ImplicitStringConcatShapes
@@ -61,7 +61,7 @@
* @run main/othervm -Xverify:all -Djava.lang.invoke.stringConcat=MH_SB_SIZED_EXACT -Djava.lang.invoke.stringConcat.debug=true -Djava.lang.invoke.stringConcat.cache=true ImplicitStringConcatShapes
* @run main/othervm -Xverify:all -Djava.lang.invoke.stringConcat=MH_INLINE_SIZED_EXACT -Djava.lang.invoke.stringConcat.debug=true -Djava.lang.invoke.stringConcat.cache=true ImplicitStringConcatShapes
*
- * @compile -XDstringConcat=indyWithConstants -source 1.9 -target 1.9 ImplicitStringConcatShapes.java
+ * @compile -XDstringConcat=indyWithConstants ImplicitStringConcatShapes.java
*
* @run main/othervm -Xverify:all -Djava.lang.invoke.stringConcat=BC_SB ImplicitStringConcatShapes
* @run main/othervm -Xverify:all -Djava.lang.invoke.stringConcat=BC_SB_SIZED ImplicitStringConcatShapes