diff options
author | Iulian Dragos <jaguarul@gmail.com> | 2014-10-03 18:52:09 +0200 |
---|---|---|
committer | Iulian Dragos <jaguarul@gmail.com> | 2014-10-03 18:52:09 +0200 |
commit | 1122e9e55aad915c1ecb90e6d1e11d2faba58dab (patch) | |
tree | bd2c0daee3b067588c4eba780eb93500de10da12 /test/files/presentation/doc/src/p | |
parent | 192d65f718ab042cb57090d580c83e15a0509964 (diff) | |
download | scala-1122e9e55aad915c1ecb90e6d1e11d2faba58dab.tar.gz scala-1122e9e55aad915c1ecb90e6d1e11d2faba58dab.tar.bz2 scala-1122e9e55aad915c1ecb90e6d1e11d2faba58dab.zip |
Revert "Disable flaky presentation compiler test."
This reverts commit 8986ee4fd56c53d563165d992185c6c532f35790.
Scaladoc seems to work reliably for 2.11.x. We are using it in the IDE builds and haven't noticed any
flakiness, so we'd like to get reinstate this test.
Diffstat (limited to 'test/files/presentation/doc/src/p')
-rwxr-xr-x | test/files/presentation/doc/src/p/Base.scala | 11 | ||||
-rwxr-xr-x | test/files/presentation/doc/src/p/Derived.scala | 9 |
2 files changed, 20 insertions, 0 deletions
diff --git a/test/files/presentation/doc/src/p/Base.scala b/test/files/presentation/doc/src/p/Base.scala new file mode 100755 index 0000000000..d91632b6f6 --- /dev/null +++ b/test/files/presentation/doc/src/p/Base.scala @@ -0,0 +1,11 @@ +package p + +/** + * @define BaseComment This is $BaseVar comment. + */ +trait Base { + /** + * Base method has documentation. + */ + def foo: String +} diff --git a/test/files/presentation/doc/src/p/Derived.scala b/test/files/presentation/doc/src/p/Derived.scala new file mode 100755 index 0000000000..1a9c9a26d1 --- /dev/null +++ b/test/files/presentation/doc/src/p/Derived.scala @@ -0,0 +1,9 @@ +package p + +/** + * $BaseComment + * @define BaseVar Derived + */ +class Derived extends Base { + def foo = "" +} |