summaryrefslogtreecommitdiff
path: root/test/files/jvm
diff options
context:
space:
mode:
authorLukas Rytz <lukas.rytz@gmail.com>2016-12-19 11:53:59 +0100
committerSeth Tisue <seth@tisue.net>2017-01-27 09:29:13 -0800
commit27c10db549e6f43571663d0162b58fc04fbb34bf (patch)
tree855edd6dbdae7b4b44abacf39c7e59dc95378a5b /test/files/jvm
parentb9d4089d19ead36d07c2d6cdda283c9b678d515e (diff)
downloadscala-27c10db549e6f43571663d0162b58fc04fbb34bf.tar.gz
scala-27c10db549e6f43571663d0162b58fc04fbb34bf.tar.bz2
scala-27c10db549e6f43571663d0162b58fc04fbb34bf.zip
adjust to partest 1.1.0's new mixed Java/Scala compilation
upgrades partest from 1.0.17 to 1.1.0 https://github.com/scala/scala-partest/pull/69 changed the mode for mixed compilation, which used to be 1. scalac *.java *.scala -d o 2. javac *.java -d o -cp o 3. scalac *.scala -d o -cp o Now the third step is skipped. This required some adjustments to existing tests. - t7014 is split in two groups, the fix is for separate compilation. - t7582 is also split. It tests inliner warnings when inling code that accesses Java-defined package-private code. Inlining from Java only works in separate compilation (no bytecode available in mixed compilation). - Java compiler warnings of "run" tests were not reported in the old scheme, now they are. Deprecation / unchecked warnings were removed from t6240, t8786, varargs. - t4788 required a .check file update to pass, which hints at a bug. I will re-open SI-4788 and investigate later.
Diffstat (limited to 'test/files/jvm')
-rw-r--r--test/files/jvm/t8786/B_2.java2
-rw-r--r--test/files/jvm/varargs/JavaClass.java2
2 files changed, 2 insertions, 2 deletions
diff --git a/test/files/jvm/t8786/B_2.java b/test/files/jvm/t8786/B_2.java
index dc155a290f..ab5350b136 100644
--- a/test/files/jvm/t8786/B_2.java
+++ b/test/files/jvm/t8786/B_2.java
@@ -5,7 +5,7 @@ public class B_2 {
public static void m(String a) { res += 100; }
public static void m(Object a) { res += 1000; }
- public static <T> T foo(int a, T... b) { return b[0]; }
+ @SafeVarargs public static <T> T foo(int a, T... b) { return b[0]; }
public static <T> T bar(T b[]) { return b[0]; }
diff --git a/test/files/jvm/varargs/JavaClass.java b/test/files/jvm/varargs/JavaClass.java
index 0cc3587c5e..35adcff850 100644
--- a/test/files/jvm/varargs/JavaClass.java
+++ b/test/files/jvm/varargs/JavaClass.java
@@ -1,5 +1,5 @@
public class JavaClass {
- public static <T> void varargz(int i, T... v) { }
+ @SafeVarargs public static <T> void varargz(int i, T... v) { }
public static void callSomeAnnotations() {
VaClass va = new VaClass();