diff options
| author | Simon Ochsenreither <simon@ochsenreither.de> | 2013-06-21 21:36:20 +0200 |
|---|---|---|
| committer | Simon Ochsenreither <simon@ochsenreither.de> | 2013-06-21 21:36:20 +0200 |
| commit | 48bcc1845a010a74b7fc47a2e68c6d8518c30608 (patch) | |
| tree | 185ce48d9f621764eb92af478e81fb589075310f | |
| parent | 0ebdc586ca347b2ced5a26bd0f91203228859b01 (diff) | |
| download | scala-48bcc1845a010a74b7fc47a2e68c6d8518c30608.tar.gz scala-48bcc1845a010a74b7fc47a2e68c6d8518c30608.tar.bz2 scala-48bcc1845a010a74b7fc47a2e68c6d8518c30608.zip | |
SI-7292 Fixes test failures by updating *.check files
Looks like partest's confusion about / vs. \ was fixed between
the original Jenkins run of the fix for SI-7292 and its merge.
| -rw-r--r-- | test/files/neg/t7292-deprecation.check | 12 | ||||
| -rw-r--r-- | test/files/neg/t7292-removal.check | 12 | ||||
| -rw-r--r-- | test/files/run/literals.check | 2 | ||||
| -rw-r--r-- | test/files/run/richs.check | 1 |
4 files changed, 14 insertions, 13 deletions
diff --git a/test/files/neg/t7292-deprecation.check b/test/files/neg/t7292-deprecation.check index c7e6111962..17f010dfdf 100644 --- a/test/files/neg/t7292-deprecation.check +++ b/test/files/neg/t7292-deprecation.check @@ -1,11 +1,11 @@ -t7292-deprecation.scala:2: warning: Octal escape literals are deprecated, use /u0000 instead. - val chr1 = '/0' +t7292-deprecation.scala:2: warning: Octal escape literals are deprecated, use \u0000 instead. + val chr1 = '\0' ^ -t7292-deprecation.scala:3: warning: Octal escape literals are deprecated, use /u0053 instead. - val str1 = "abc/123456" +t7292-deprecation.scala:3: warning: Octal escape literals are deprecated, use \u0053 instead. + val str1 = "abc\123456" ^ -t7292-deprecation.scala:4: warning: Octal escape literals are deprecated, use /n instead. - val lf = '/012' +t7292-deprecation.scala:4: warning: Octal escape literals are deprecated, use \n instead. + val lf = '\012' ^ error: No warnings can be incurred under -Xfatal-warnings. three warnings found diff --git a/test/files/neg/t7292-removal.check b/test/files/neg/t7292-removal.check index fffd0a1104..1cd59b0992 100644 --- a/test/files/neg/t7292-removal.check +++ b/test/files/neg/t7292-removal.check @@ -1,10 +1,10 @@ -t7292-removal.scala:2: error: Octal escape literals are unsupported, use /u0000 instead. - val chr1 = '/0' +t7292-removal.scala:2: error: Octal escape literals are unsupported, use \u0000 instead. + val chr1 = '\0' ^ -t7292-removal.scala:3: error: Octal escape literals are unsupported, use /u0053 instead. - val str1 = "abc/123456" +t7292-removal.scala:3: error: Octal escape literals are unsupported, use \u0053 instead. + val str1 = "abc\123456" ^ -t7292-removal.scala:4: error: Octal escape literals are unsupported, use /n instead. - val lf = '/012' +t7292-removal.scala:4: error: Octal escape literals are unsupported, use \n instead. + val lf = '\012' ^ three errors found diff --git a/test/files/run/literals.check b/test/files/run/literals.check index 6be5137994..5f948762b7 100644 --- a/test/files/run/literals.check +++ b/test/files/run/literals.check @@ -1,4 +1,4 @@ -warning: there were 13 deprecation warning(s); re-run with -deprecation for details +warning: there were 18 deprecation warning(s); re-run with -deprecation for details test '\u0024' == '$' was successful test '\u005f' == '_' was successful test 65.asInstanceOf[Char] == 'A' was successful diff --git a/test/files/run/richs.check b/test/files/run/richs.check index a970a814b1..02a98b376d 100644 --- a/test/files/run/richs.check +++ b/test/files/run/richs.check @@ -1,3 +1,4 @@ +warning: there were 2 deprecation warning(s); re-run with -deprecation for details RichCharTest1: true |