diff options
| author | Philipp Haller <hallerp@gmail.com> | 2008-02-29 22:23:50 +0000 |
|---|---|---|
| committer | Philipp Haller <hallerp@gmail.com> | 2008-02-29 22:23:50 +0000 |
| commit | ca2cc573acac4d97fa16cefea1cf72bf9ac0aaf4 (patch) | |
| tree | 8eaaf2c2330464489d1162a51c1c46fd6993738f /test/files/res | |
| parent | 6473f2d85174e7dff2ecff350dc31c84b0dfb137 (diff) | |
| download | scala-ca2cc573acac4d97fa16cefea1cf72bf9ac0aaf4.tar.gz scala-ca2cc573acac4d97fa16cefea1cf72bf9ac0aaf4.tar.bz2 scala-ca2cc573acac4d97fa16cefea1cf72bf9ac0aaf4.zip | |
Fixed commit test (which breaks partest res tes...
Fixed commit test (which breaks partest res tests again)
Diffstat (limited to 'test/files/res')
| -rw-r--r-- | test/files/res/bug597.res | 4 | ||||
| -rw-r--r-- | test/files/res/bug687.check | 2 | ||||
| -rw-r--r-- | test/files/res/bug687.res | 6 | ||||
| -rw-r--r-- | test/files/res/bug722.res | 4 | ||||
| -rw-r--r-- | test/files/res/bug735.res | 4 | ||||
| -rw-r--r-- | test/files/res/bug743.res | 4 | ||||
| -rw-r--r-- | test/files/res/bug785.res | 4 | ||||
| -rw-r--r-- | test/files/res/bug831.res | 4 |
8 files changed, 16 insertions, 16 deletions
diff --git a/test/files/res/bug597.res b/test/files/res/bug597.res index 1314e7b40b..0db355cd0f 100644 --- a/test/files/res/bug597.res +++ b/test/files/res/bug597.res @@ -1,2 +1,2 @@ -files/res/bug597/Test.scala -files/res/bug597/Main.scala +bug597/Test.scala +bug597/Main.scala diff --git a/test/files/res/bug687.check b/test/files/res/bug687.check index 8d3d3178cd..92e5e4e75d 100644 --- a/test/files/res/bug687.check +++ b/test/files/res/bug687.check @@ -1,6 +1,6 @@ nsc> -nsc> files/res/bug687/QueryB.scala:3: error: name clash between defined and inherited member: +nsc> bug687/QueryB.scala:3: error: name clash between defined and inherited member: method equals:(java.lang.Object)Boolean and method equals:(Any)Boolean in class Any have same type after erasure: (java.lang.Object)Boolean diff --git a/test/files/res/bug687.res b/test/files/res/bug687.res index 4421977bdc..ba8ba76995 100644 --- a/test/files/res/bug687.res +++ b/test/files/res/bug687.res @@ -1,3 +1,3 @@ -files/res/bug687/QueryA.scala -files/res/bug687/QueryB.scala -files/res/bug687/QueryA.scala +bug687/QueryA.scala +bug687/QueryB.scala +bug687/QueryA.scala diff --git a/test/files/res/bug722.res b/test/files/res/bug722.res index bc72066285..dbc785c171 100644 --- a/test/files/res/bug722.res +++ b/test/files/res/bug722.res @@ -1,2 +1,2 @@ -files/res/bug722/Parser.scala files/res/bug722/IfElse.scala -files/res/bug722/Parser.scala files/res/bug722/IfElse.scala +bug722/Parser.scala bug722/IfElse.scala +bug722/Parser.scala bug722/IfElse.scala diff --git a/test/files/res/bug735.res b/test/files/res/bug735.res index fa544ad080..d477e6fd47 100644 --- a/test/files/res/bug735.res +++ b/test/files/res/bug735.res @@ -1,2 +1,2 @@ -files/res/bug735/ScalaTyper.scala -files/res/bug735/ScalaTyper.scala +bug735/ScalaTyper.scala +bug735/ScalaTyper.scala diff --git a/test/files/res/bug743.res b/test/files/res/bug743.res index c8312a69bd..f1dd2462e4 100644 --- a/test/files/res/bug743.res +++ b/test/files/res/bug743.res @@ -1,2 +1,2 @@ -files/res/bug743/ParserXXX.scala -files/res/bug743/BracesXXX.scala +bug743/ParserXXX.scala +bug743/BracesXXX.scala diff --git a/test/files/res/bug785.res b/test/files/res/bug785.res index 6abf7ed236..7e5da1c453 100644 --- a/test/files/res/bug785.res +++ b/test/files/res/bug785.res @@ -1,2 +1,2 @@ -files/res/bug785/ScalaTrees.scala -files/res/bug785/ScalaTrees.scala +bug785/ScalaTrees.scala +bug785/ScalaTrees.scala diff --git a/test/files/res/bug831.res b/test/files/res/bug831.res index 807455d7da..0cc6c398ab 100644 --- a/test/files/res/bug831.res +++ b/test/files/res/bug831.res @@ -1,2 +1,2 @@ -files/res/bug831/NewScalaTestXXX.scala -files/res/bug831/NewScalaTestXXX.scala +bug831/NewScalaTestXXX.scala +bug831/NewScalaTestXXX.scala |