diff options
author | Adriaan Moors <adriaan.moors@typesafe.com> | 2013-08-19 11:13:34 -0700 |
---|---|---|
committer | Adriaan Moors <adriaan.moors@typesafe.com> | 2013-08-19 11:13:34 -0700 |
commit | 30373989771e0be8c0e690210da1c8b7e24942a1 (patch) | |
tree | 9ad9ca3ce8cd8bb38cfdee64c791a177875a0d9a /test | |
parent | b6ba7ea9f0499335feba6838da80f4333e2d366f (diff) | |
parent | 48d14aaaced95ef2577bf8bc799c4a74788e4663 (diff) | |
download | scala-30373989771e0be8c0e690210da1c8b7e24942a1.tar.gz scala-30373989771e0be8c0e690210da1c8b7e24942a1.tar.bz2 scala-30373989771e0be8c0e690210da1c8b7e24942a1.zip |
Merge pull request #2854 from som-snytt/issue/7729-slash
SI-7729 Fix broken windows build
Diffstat (limited to 'test')
-rw-r--r-- | test/files/neg/javac-error.check | 10 | ||||
-rw-r--r-- | test/files/neg/t6289.check | 10 | ||||
-rw-r--r-- | test/files/neg/t6289.flags (renamed from test/files/neg/javac-error.flags) | 0 | ||||
-rw-r--r-- | test/files/neg/t6289/J.java (renamed from test/files/neg/javac-error/J.java) | 0 | ||||
-rw-r--r-- | test/files/neg/t6289/SUT_5.scala (renamed from test/files/neg/javac-error/SUT_5.scala) | 0 |
5 files changed, 10 insertions, 10 deletions
diff --git a/test/files/neg/javac-error.check b/test/files/neg/javac-error.check deleted file mode 100644 index e7d1ccc1a1..0000000000 --- a/test/files/neg/javac-error.check +++ /dev/null @@ -1,10 +0,0 @@ -#partest java6 -javac-error/J.java:2: method does not override or implement a method from a supertype - @Override public void foo() { } - ^ -1 error -#partest java7 -javac-error/J.java:2: error: method does not override or implement a method from a supertype - @Override public void foo() { } - ^ -1 error diff --git a/test/files/neg/t6289.check b/test/files/neg/t6289.check new file mode 100644 index 0000000000..f6f43cabd3 --- /dev/null +++ b/test/files/neg/t6289.check @@ -0,0 +1,10 @@ +#partest java6 +t6289/J.java:2: method does not override or implement a method from a supertype + @Override public void foo() { } + ^ +1 error +#partest java7 +t6289/J.java:2: error: method does not override or implement a method from a supertype + @Override public void foo() { } + ^ +1 error diff --git a/test/files/neg/javac-error.flags b/test/files/neg/t6289.flags index 85d8eb2ba2..85d8eb2ba2 100644 --- a/test/files/neg/javac-error.flags +++ b/test/files/neg/t6289.flags diff --git a/test/files/neg/javac-error/J.java b/test/files/neg/t6289/J.java index 83f50c9ae2..83f50c9ae2 100644 --- a/test/files/neg/javac-error/J.java +++ b/test/files/neg/t6289/J.java diff --git a/test/files/neg/javac-error/SUT_5.scala b/test/files/neg/t6289/SUT_5.scala index 0a996352c0..0a996352c0 100644 --- a/test/files/neg/javac-error/SUT_5.scala +++ b/test/files/neg/t6289/SUT_5.scala |