summaryrefslogtreecommitdiff
path: root/test/pending
diff options
context:
space:
mode:
authorPaul Phillips <paulp@improving.org>2010-04-05 06:24:22 +0000
committerPaul Phillips <paulp@improving.org>2010-04-05 06:24:22 +0000
commite8a121e9e1ade3f283f42fceb3c18f30a8468f57 (patch)
treefc58111a69bb8940f7c5bd341fa3a8f097955403 /test/pending
parent28ed5c6b216463a6e5bd8f06986c35a2036bda3f (diff)
downloadscala-e8a121e9e1ade3f283f42fceb3c18f30a8468f57.tar.gz
scala-e8a121e9e1ade3f283f42fceb3c18f30a8468f57.tar.bz2
scala-e8a121e9e1ade3f283f42fceb3c18f30a8468f57.zip
If I work on this patch any longer without chec...
If I work on this patch any longer without checking in I will go stark raving mad. It is broken up into a couple pieces. This one is the changes to test/. It includes fixing a bunch of tests, removing deprecated constructs, moving jars used by tests to the most specific plausible location rather than having all jars on the classpath of all tests, and some filesystem layout change (continuations get their whole own srcpath.) This would be the world's most tedious review, so let's say no review. [Note: after this commit, I doubt things will build very smoothly until the rest of the partest changes follow. Which should only be seconds, but just in case.]
Diffstat (limited to 'test/pending')
-rw-r--r--test/pending/continuations-run/select-run.log20
-rw-r--r--test/pending/jvm/t1464.check1
-rw-r--r--test/pending/neg/bug1210.check7
-rw-r--r--test/pending/pos/t1380/gnujaxp.jar.desired.sha11
-rw-r--r--test/pending/pos/t1380/hallo.scala3
-rwxr-xr-xtest/pending/run/bug2365/run13
-rw-r--r--test/pending/run/subarray.check2
-rw-r--r--test/pending/script/bug2365.javaopts (renamed from test/pending/run/bug2365/bug2365.javaopts)0
-rw-r--r--test/pending/script/bug2365/Test.scala (renamed from test/pending/run/bug2365/Test.scala)6
-rwxr-xr-xtest/pending/script/bug2365/bug2365.scala9
10 files changed, 23 insertions, 39 deletions
diff --git a/test/pending/continuations-run/select-run.log b/test/pending/continuations-run/select-run.log
deleted file mode 100644
index 6faa868ce3..0000000000
--- a/test/pending/continuations-run/select-run.log
+++ /dev/null
@@ -1,20 +0,0 @@
-8
-java.lang.ClassCastException: scala.util.continuations.ControlContext cannot be cast to java.lang.Integer
- at scala.runtime.BoxesRunTime.unboxToInt(Unknown Source)
- at Test$$anonfun$main$2.apply(select.scala:18)
- at Test$$anonfun$main$2.apply(select.scala:18)
- at scala.util.continuations.ControlContext$.reset(ControlContext.scala:65)
- at Test$.main(select.scala:18)
- at Test.main(select.scala)
- at sun.reflect.NativeMethodAccessorImpl.invoke0(Native Method)
- at sun.reflect.NativeMethodAccessorImpl.invoke(NativeMethodAccessorImpl.java:39)
- at sun.reflect.DelegatingMethodAccessorImpl.invoke(DelegatingMethodAccessorImpl.java:25)
- at java.lang.reflect.Method.invoke(Method.java:597)
- at scala.tools.nsc.util.ScalaClassLoader$$anonfun$run$1.apply(ScalaClassLoader.scala:55)
- at scala.tools.nsc.util.ScalaClassLoader$class.asContext(ScalaClassLoader.scala:22)
- at scala.tools.nsc.util.ScalaClassLoader$URLClassLoader.asContext(ScalaClassLoader.scala:61)
- at scala.tools.nsc.util.ScalaClassLoader$class.run(ScalaClassLoader.scala:55)
- at scala.tools.nsc.util.ScalaClassLoader$URLClassLoader.run(ScalaClassLoader.scala:61)
- at scala.tools.nsc.ObjectRunner$.run(ObjectRunner.scala:33)
- at scala.tools.nsc.MainGenericRunner$.main(MainGenericRunner.scala:153)
- at scala.tools.nsc.MainGenericRunner.main(MainGenericRunner.scala)
diff --git a/test/pending/jvm/t1464.check b/test/pending/jvm/t1464.check
deleted file mode 100644
index c508d5366f..0000000000
--- a/test/pending/jvm/t1464.check
+++ /dev/null
@@ -1 +0,0 @@
-false
diff --git a/test/pending/neg/bug1210.check b/test/pending/neg/bug1210.check
new file mode 100644
index 0000000000..4db920556f
--- /dev/null
+++ b/test/pending/neg/bug1210.check
@@ -0,0 +1,7 @@
+bug1210.scala:13: error: illegal cyclic reference involving type Settings
+ val v: List[selfType] = f[selfType]((x: selfType) => x.v)
+ ^
+bug1210.scala:24: error: illegal cyclic reference involving type Settings
+ f[selfType](_.g)
+ ^
+two errors found
diff --git a/test/pending/pos/t1380/gnujaxp.jar.desired.sha1 b/test/pending/pos/t1380/gnujaxp.jar.desired.sha1
new file mode 100644
index 0000000000..c155c2aaa2
--- /dev/null
+++ b/test/pending/pos/t1380/gnujaxp.jar.desired.sha1
@@ -0,0 +1 @@
+ee000286d00c5209d5644462c1cfea87fc8b1342 ?gnujaxp.jar
diff --git a/test/pending/pos/t1380/hallo.scala b/test/pending/pos/t1380/hallo.scala
new file mode 100644
index 0000000000..27ecd9fb8b
--- /dev/null
+++ b/test/pending/pos/t1380/hallo.scala
@@ -0,0 +1,3 @@
+object hallo {
+ def main(args:Array[String]) = println("hallo")
+}
diff --git a/test/pending/run/bug2365/run b/test/pending/run/bug2365/run
deleted file mode 100755
index f3c44ad086..0000000000
--- a/test/pending/run/bug2365/run
+++ /dev/null
@@ -1,13 +0,0 @@
-#!/bin/sh
-#
-# This script should fail with any build of scala where #2365
-# is not fixed, and otherwise succeed. Failure means running out
-# of PermGen space.
-
-CP=.:/local/lib/java/ivy.jar
-# SCALAC=/scala/inst/28/bin/scalac
-SCALAC=scalac
-RUN_OPTS="-XX:MaxPermSize=25M -verbose:gc"
-
-$SCALAC -cp $CP *.scala
-JAVA_OPTS="${RUN_OPTS}" scala -cp $CP Test
diff --git a/test/pending/run/subarray.check b/test/pending/run/subarray.check
deleted file mode 100644
index 814f4a4229..0000000000
--- a/test/pending/run/subarray.check
+++ /dev/null
@@ -1,2 +0,0 @@
-one
-two
diff --git a/test/pending/run/bug2365/bug2365.javaopts b/test/pending/script/bug2365.javaopts
index 357e033c1c..357e033c1c 100644
--- a/test/pending/run/bug2365/bug2365.javaopts
+++ b/test/pending/script/bug2365.javaopts
diff --git a/test/pending/run/bug2365/Test.scala b/test/pending/script/bug2365/Test.scala
index 92b58f4a25..53581d256b 100644
--- a/test/pending/run/bug2365/Test.scala
+++ b/test/pending/script/bug2365/Test.scala
@@ -20,11 +20,11 @@ object Test
def test(withF0: StructF0 => Int): Int = {
// Some large jar
- val ivyJar = File("/local/lib/java/ivy.jar").toURL
+ val jar = File("../../../../lib/scalacheck.jar").toURL
// load a class in a separate loader that will be passed to A
- val loader = new java.net.URLClassLoader(Array(File(".").toURL, ivyJar))
+ val loader = new java.net.URLClassLoader(Array(File(".").toURL, jar))
// load a real class to fill perm gen space
- Class.forName("org.apache.ivy.Ivy", true, loader).newInstance
+ Class.forName("org.scalacheck.Properties", true, loader).newInstance
// create a class from another class loader with an apply: Int method
val b = Class.forName("B", true, loader).newInstance
diff --git a/test/pending/script/bug2365/bug2365.scala b/test/pending/script/bug2365/bug2365.scala
new file mode 100755
index 0000000000..b5e05325cf
--- /dev/null
+++ b/test/pending/script/bug2365/bug2365.scala
@@ -0,0 +1,9 @@
+#!/bin/sh
+#
+# This script should fail with any build of scala where #2365
+# is not fixed, and otherwise succeed. Failure means running out
+# of PermGen space.
+#
+
+scalac -cp .:/local/lib/java/ivy.jar Test.scala
+JAVA_OPTS="-XX:MaxPermSize=25M -verbose:gc" scalac -cp $CP Test