diff options
| author | Som Snytt <som.snytt@gmail.com> | 2013-07-25 11:48:30 -0700 |
|---|---|---|
| committer | Som Snytt <som.snytt@gmail.com> | 2013-08-08 11:40:02 -0700 |
| commit | 3dd0dd480e7464e316f283fdd84b62314e47db68 (patch) | |
| tree | dbe244d4807cd5adc7227f8b1997d1dbedc076da /test/files/run | |
| parent | 4c62f7db6f3913eedd92d85daf8f631149cc97b2 (diff) | |
| download | scala-3dd0dd480e7464e316f283fdd84b62314e47db68.tar.gz scala-3dd0dd480e7464e316f283fdd84b62314e47db68.tar.bz2 scala-3dd0dd480e7464e316f283fdd84b62314e47db68.zip | |
Par-Test split checks work again
Check files split into conditional blocks with partest flags
have been broken since the new diff regime.
For some reason, no one noticed.
The clever scheme to "filter the diff" instead of just filtering
the check file is abandoned as futile and unnecessary.
Fix java6 checkfile for ifdiff fix.
Diffstat (limited to 'test/files/run')
| -rw-r--r-- | test/files/run/repl-javap-app.check | 9 | ||||
| -rw-r--r-- | test/files/run/stream_length.check | 1 | ||||
| -rw-r--r-- | test/files/run/tailcalls.check | 3 |
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 |