summaryrefslogtreecommitdiff
path: root/test/files
diff options
context:
space:
mode:
authorAdriaan Moors <adriaan.moors@typesafe.com>2013-08-12 16:15:00 -0700
committerAdriaan Moors <adriaan.moors@typesafe.com>2013-08-12 16:15:00 -0700
commit8659c2f51b007a701a27084f160ecc41fe30829a (patch)
tree40e1526a823757fc9dc4c24a1e42565938ec0981 /test/files
parent651e1988fa1e0f8efeb4eeca9e83d833c1895da3 (diff)
parent593024d9b31e9d693de2303f41ceb4783a56abc9 (diff)
downloadscala-8659c2f51b007a701a27084f160ecc41fe30829a.tar.gz
scala-8659c2f51b007a701a27084f160ecc41fe30829a.tar.bz2
scala-8659c2f51b007a701a27084f160ecc41fe30829a.zip
Merge pull request #2807 from som-snytt/issue/partest-dir
SI-7729 Does Par-Test work? Absolutely!
Diffstat (limited to 'test/files')
-rw-r--r--test/files/run/repl-javap-app.check9
-rw-r--r--test/files/run/stream_length.check1
-rw-r--r--test/files/run/tailcalls.check3
3 files changed, 5 insertions, 8 deletions
diff --git a/test/files/run/repl-javap-app.check b/test/files/run/repl-javap-app.check
index db1f09b977..490860585c 100644
--- a/test/files/run/repl-javap-app.check
+++ b/test/files/run/repl-javap-app.check
@@ -6,14 +6,13 @@ scala> :javap -app MyApp$
public final void delayedEndpoint$MyApp$1();
Code:
Stack=2, Locals=1, Args_size=1
- 0: getstatic #61; //Field scala/Console$.MODULE$:Lscala/Console$;
- 3: ldc #63; //String Hello, delayed world.
- 5: invokevirtual #67; //Method scala/Console$.println:(Ljava/lang/Object;)V
- 8: return
+ 0: getstatic #61; //Field scala/Console$.MODULE$:Lscala/Console$;
+ 3: ldc #63; //String Hello, delayed world.
+ 5: invokevirtual #67; //Method scala/Console$.println:(Ljava/lang/Object;)V
+ 8: return
LocalVariableTable:
Start Length Slot Name Signature
0 9 0 this LMyApp$;
-}
scala>
#partest !java6
diff --git a/test/files/run/stream_length.check b/test/files/run/stream_length.check
index d1068f3247..e4350aa741 100644
--- a/test/files/run/stream_length.check
+++ b/test/files/run/stream_length.check
@@ -1,6 +1,5 @@
#partest !avian
Length: 970299
-
#partest avian
!!!TEST SKIPPED!!!
See SI-7600 for further information.
diff --git a/test/files/run/tailcalls.check b/test/files/run/tailcalls.check
index 10384ac46e..ab54d528ab 100644
--- a/test/files/run/tailcalls.check
+++ b/test/files/run/tailcalls.check
@@ -52,7 +52,6 @@ test TailCall.b2 was successful
test FancyTailCalls.tcTryLocal was successful
test FancyTailCalls.differentInstance was successful
test PolyObject.tramp was successful
-
#partest avian
test Object .f was successful
test Final .f was successful
@@ -106,4 +105,4 @@ test TailCall.b1 was successful
test TailCall.b2 was successful
test FancyTailCalls.tcTryLocal was successful
test FancyTailCalls.differentInstance was successful
-test PolyObject.tramp was successful \ No newline at end of file
+test PolyObject.tramp was successful