diff options
author | Lukas Rytz <lukas.rytz@typesafe.com> | 2014-10-06 14:06:00 +0200 |
---|---|---|
committer | Lukas Rytz <lukas.rytz@typesafe.com> | 2014-10-06 14:06:00 +0200 |
commit | 9c39386f566f97656f687417efff4def07730691 (patch) | |
tree | f14d97f123ba0ce61e9ab253a50cd588b7d684f8 | |
parent | f09f4858c05fada45973712a5c2010b99642de22 (diff) | |
parent | 1122e9e55aad915c1ecb90e6d1e11d2faba58dab (diff) | |
download | scala-9c39386f566f97656f687417efff4def07730691.tar.gz scala-9c39386f566f97656f687417efff4def07730691.tar.bz2 scala-9c39386f566f97656f687417efff4def07730691.zip |
Merge pull request #4027 from dragos/doc/reinstate-test
Revert "Disable flaky presentation compiler test."
-rw-r--r-- | test/files/presentation/doc.check (renamed from test/disabled/presentation/doc.check) | 0 | ||||
-rwxr-xr-x | test/files/presentation/doc/doc.scala (renamed from test/disabled/presentation/doc/doc.scala) | 0 | ||||
-rwxr-xr-x | test/files/presentation/doc/src/Class.scala (renamed from test/disabled/presentation/doc/src/Class.scala) | 0 | ||||
-rwxr-xr-x | test/files/presentation/doc/src/p/Base.scala (renamed from test/disabled/presentation/doc/src/p/Base.scala) | 0 | ||||
-rwxr-xr-x | test/files/presentation/doc/src/p/Derived.scala (renamed from test/disabled/presentation/doc/src/p/Derived.scala) | 0 |
5 files changed, 0 insertions, 0 deletions
diff --git a/test/disabled/presentation/doc.check b/test/files/presentation/doc.check index 5a3ff13151..5a3ff13151 100644 --- a/test/disabled/presentation/doc.check +++ b/test/files/presentation/doc.check diff --git a/test/disabled/presentation/doc/doc.scala b/test/files/presentation/doc/doc.scala index f2233f1828..f2233f1828 100755 --- a/test/disabled/presentation/doc/doc.scala +++ b/test/files/presentation/doc/doc.scala diff --git a/test/disabled/presentation/doc/src/Class.scala b/test/files/presentation/doc/src/Class.scala index a974bd6f5c..a974bd6f5c 100755 --- a/test/disabled/presentation/doc/src/Class.scala +++ b/test/files/presentation/doc/src/Class.scala diff --git a/test/disabled/presentation/doc/src/p/Base.scala b/test/files/presentation/doc/src/p/Base.scala index d91632b6f6..d91632b6f6 100755 --- a/test/disabled/presentation/doc/src/p/Base.scala +++ b/test/files/presentation/doc/src/p/Base.scala diff --git a/test/disabled/presentation/doc/src/p/Derived.scala b/test/files/presentation/doc/src/p/Derived.scala index 1a9c9a26d1..1a9c9a26d1 100755 --- a/test/disabled/presentation/doc/src/p/Derived.scala +++ b/test/files/presentation/doc/src/p/Derived.scala |