diff options
| author | Jason Zaugg <jzaugg@gmail.com> | 2016-01-18 16:52:09 +1000 |
|---|---|---|
| committer | Jason Zaugg <jzaugg@gmail.com> | 2016-01-18 16:52:09 +1000 |
| commit | bf599bc72a1fff4aa812e6d8962b2cabe14725ab (patch) | |
| tree | cae6133d511a15e2871c2d4e86ecc952f7ef0d35 | |
| parent | 364a98ee3aee02827e67e53f54f1311d59961dad (diff) | |
| parent | 8e52acdc1bdc74375cf6a23e9ff929690317c3c7 (diff) | |
| download | scala-bf599bc72a1fff4aa812e6d8962b2cabe14725ab.tar.gz scala-bf599bc72a1fff4aa812e6d8962b2cabe14725ab.tar.bz2 scala-bf599bc72a1fff4aa812e6d8962b2cabe14725ab.zip | |
Merge pull request #4905 from SethTisue/disable-flaky-prezzy-test-on-windows
disable flaky presentation compiler test on Windows
| -rw-r--r-- | test/files/presentation/doc/doc.scala | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/test/files/presentation/doc/doc.scala b/test/files/presentation/doc/doc.scala index f2233f1828..ce431910ee 100644 --- a/test/files/presentation/doc/doc.scala +++ b/test/files/presentation/doc/doc.scala @@ -118,6 +118,12 @@ object Test extends InteractiveTest { } } + // The remainder of this test has been found to fail intermittently on Windows + // only. The problem is difficult to isolate and reproduce; see + // https://github.com/scala/scala-dev/issues/72 for details. + // So if we're on Windows, let's just bail out here. + if (scala.util.Properties.isWin) return + // Check inter-classes documentation one-time retrieved ok. val baseSource = findSource("Base.scala") val derivedSource = findSource("Derived.scala") |