diff options
| author | Som Snytt <som.snytt@gmail.com> | 2013-08-19 07:22:28 -0700 |
|---|---|---|
| committer | Som Snytt <som.snytt@gmail.com> | 2013-08-19 07:22:28 -0700 |
| commit | 48d14aaaced95ef2577bf8bc799c4a74788e4663 (patch) | |
| tree | 1c50d0bfa62ba89e2ab7848ab335dc3fbeda0725 /test | |
| parent | 5084b74048f7f21f38fdf45ebfa8e634b863bb01 (diff) | |
| download | scala-48d14aaaced95ef2577bf8bc799c4a74788e4663.tar.gz scala-48d14aaaced95ef2577bf8bc799c4a74788e4663.tar.bz2 scala-48d14aaaced95ef2577bf8bc799c4a74788e4663.zip | |
SI-7729 Fix broken windows build
Fixing #ifdiff uncovered a latent bug in partest when it detects
paths to normalize in test log output. It would not normalize
file separators for test names with non-word characters.
This commit normalizes the test name to the ticket number as a
workaround until the next partest version is picked up.
It also fixes partest in this repo in case we've not yet switched
over to the new repo. A separate PR will be submitted to the new
repo as necessary.
Diffstat (limited to 'test')
| -rw-r--r-- | test/files/neg/javac-error.check | 10 | ||||
| -rw-r--r-- | test/files/neg/t6289.check | 10 | ||||
| -rw-r--r-- | test/files/neg/t6289.flags (renamed from test/files/neg/javac-error.flags) | 0 | ||||
| -rw-r--r-- | test/files/neg/t6289/J.java (renamed from test/files/neg/javac-error/J.java) | 0 | ||||
| -rw-r--r-- | test/files/neg/t6289/SUT_5.scala (renamed from test/files/neg/javac-error/SUT_5.scala) | 0 |
5 files changed, 10 insertions, 10 deletions
diff --git a/test/files/neg/javac-error.check b/test/files/neg/javac-error.check deleted file mode 100644 index e7d1ccc1a1..0000000000 --- a/test/files/neg/javac-error.check +++ /dev/null @@ -1,10 +0,0 @@ -#partest java6 -javac-error/J.java:2: method does not override or implement a method from a supertype - @Override public void foo() { } - ^ -1 error -#partest java7 -javac-error/J.java:2: error: method does not override or implement a method from a supertype - @Override public void foo() { } - ^ -1 error diff --git a/test/files/neg/t6289.check b/test/files/neg/t6289.check new file mode 100644 index 0000000000..f6f43cabd3 --- /dev/null +++ b/test/files/neg/t6289.check @@ -0,0 +1,10 @@ +#partest java6 +t6289/J.java:2: method does not override or implement a method from a supertype + @Override public void foo() { } + ^ +1 error +#partest java7 +t6289/J.java:2: error: method does not override or implement a method from a supertype + @Override public void foo() { } + ^ +1 error diff --git a/test/files/neg/javac-error.flags b/test/files/neg/t6289.flags index 85d8eb2ba2..85d8eb2ba2 100644 --- a/test/files/neg/javac-error.flags +++ b/test/files/neg/t6289.flags diff --git a/test/files/neg/javac-error/J.java b/test/files/neg/t6289/J.java index 83f50c9ae2..83f50c9ae2 100644 --- a/test/files/neg/javac-error/J.java +++ b/test/files/neg/t6289/J.java diff --git a/test/files/neg/javac-error/SUT_5.scala b/test/files/neg/t6289/SUT_5.scala index 0a996352c0..0a996352c0 100644 --- a/test/files/neg/javac-error/SUT_5.scala +++ b/test/files/neg/t6289/SUT_5.scala |