summaryrefslogtreecommitdiff
path: root/test/files/neg
diff options
context:
space:
mode:
authorAdriaan Moors <adriaan.moors@typesafe.com>2015-05-26 22:01:03 -0700
committerAdriaan Moors <adriaan.moors@typesafe.com>2015-05-26 22:01:03 -0700
commit73f40564a6b19e8b15f0908c3e24f1a8fe405605 (patch)
tree7eb0868cbdde147d6ad0df41ab8a3666ab11819a /test/files/neg
parent7b224c57c2712994c043c749028cb2589155358f (diff)
parent8d2d3c702d2010d40ed6facb771add48999216c1 (diff)
downloadscala-73f40564a6b19e8b15f0908c3e24f1a8fe405605.tar.gz
scala-73f40564a6b19e8b15f0908c3e24f1a8fe405605.tar.bz2
scala-73f40564a6b19e8b15f0908c3e24f1a8fe405605.zip
Merge pull request #4526 from adriaanm/rework-4523
Require and target Java 8
Diffstat (limited to 'test/files/neg')
-rw-r--r--test/files/neg/deprecated-target.check4
-rw-r--r--test/files/neg/deprecated-target.flags1
-rw-r--r--test/files/neg/deprecated-target.scala1
-rw-r--r--test/files/neg/t6289.check6
4 files changed, 6 insertions, 6 deletions
diff --git a/test/files/neg/deprecated-target.check b/test/files/neg/deprecated-target.check
new file mode 100644
index 0000000000..307d3d25ab
--- /dev/null
+++ b/test/files/neg/deprecated-target.check
@@ -0,0 +1,4 @@
+warning: -target is deprecated: -target:jvm-1.7 is deprecated, forcing use of jvm-1.8
+error: No warnings can be incurred under -Xfatal-warnings.
+one warning found
+one error found
diff --git a/test/files/neg/deprecated-target.flags b/test/files/neg/deprecated-target.flags
new file mode 100644
index 0000000000..458ded8123
--- /dev/null
+++ b/test/files/neg/deprecated-target.flags
@@ -0,0 +1 @@
+-target:jvm-1.7 -deprecation -Xfatal-warnings
diff --git a/test/files/neg/deprecated-target.scala b/test/files/neg/deprecated-target.scala
new file mode 100644
index 0000000000..9dccdd5e59
--- /dev/null
+++ b/test/files/neg/deprecated-target.scala
@@ -0,0 +1 @@
+class C \ No newline at end of file
diff --git a/test/files/neg/t6289.check b/test/files/neg/t6289.check
index 989932750f..7b2b4b2d32 100644
--- a/test/files/neg/t6289.check
+++ b/test/files/neg/t6289.check
@@ -1,9 +1,3 @@
-#partest java6
-t6289/J.java:2: method does not override or implement a method from a supertype
- @Override public void foo() { }
- ^
-1 error
-#partest !java6
t6289/J.java:2: error: method does not override or implement a method from a supertype
@Override public void foo() { }
^