summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJason Zaugg <jzaugg@gmail.com>2013-10-17 10:10:01 -0700
committerJason Zaugg <jzaugg@gmail.com>2013-10-17 10:10:01 -0700
commit371bad2fe657d7fd065a47dc38fa5ae1fea882a7 (patch)
treea2c6b5bf2cf46dea5c23dbb9ccb28a99f00cdd09
parente20f9e9f1fcf2a25603b2b75528e4d9395557411 (diff)
parent7b560213cb3c41dfd9e78c13070ea6123514b23b (diff)
downloadscala-371bad2fe657d7fd065a47dc38fa5ae1fea882a7.tar.gz
scala-371bad2fe657d7fd065a47dc38fa5ae1fea882a7.tar.bz2
scala-371bad2fe657d7fd065a47dc38fa5ae1fea882a7.zip
Merge pull request #3043 from retronym/topic/flaky
Disable flaky tests
-rw-r--r--test/disabled/presentation/doc.check (renamed from test/files/presentation/doc.check)0
-rwxr-xr-xtest/disabled/presentation/doc/doc.scala (renamed from test/files/presentation/doc/doc.scala)0
-rwxr-xr-xtest/disabled/presentation/doc/src/Class.scala (renamed from test/files/presentation/doc/src/Class.scala)0
-rwxr-xr-xtest/disabled/presentation/doc/src/p/Base.scala (renamed from test/files/presentation/doc/src/p/Base.scala)0
-rwxr-xr-xtest/disabled/presentation/doc/src/p/Derived.scala (renamed from test/files/presentation/doc/src/p/Derived.scala)0
-rw-r--r--test/files/disabled/t7020.check (renamed from test/files/neg/t7020.check)0
-rw-r--r--test/files/disabled/t7020.flags (renamed from test/files/neg/t7020.flags)0
-rw-r--r--test/files/disabled/t7020.scala (renamed from test/files/neg/t7020.scala)0
8 files changed, 0 insertions, 0 deletions
diff --git a/test/files/presentation/doc.check b/test/disabled/presentation/doc.check
index 5a3ff13151..5a3ff13151 100644
--- a/test/files/presentation/doc.check
+++ b/test/disabled/presentation/doc.check
diff --git a/test/files/presentation/doc/doc.scala b/test/disabled/presentation/doc/doc.scala
index 371b825026..371b825026 100755
--- a/test/files/presentation/doc/doc.scala
+++ b/test/disabled/presentation/doc/doc.scala
diff --git a/test/files/presentation/doc/src/Class.scala b/test/disabled/presentation/doc/src/Class.scala
index a974bd6f5c..a974bd6f5c 100755
--- a/test/files/presentation/doc/src/Class.scala
+++ b/test/disabled/presentation/doc/src/Class.scala
diff --git a/test/files/presentation/doc/src/p/Base.scala b/test/disabled/presentation/doc/src/p/Base.scala
index 9031de3e3e..9031de3e3e 100755
--- a/test/files/presentation/doc/src/p/Base.scala
+++ b/test/disabled/presentation/doc/src/p/Base.scala
diff --git a/test/files/presentation/doc/src/p/Derived.scala b/test/disabled/presentation/doc/src/p/Derived.scala
index 1a9c9a26d1..1a9c9a26d1 100755
--- a/test/files/presentation/doc/src/p/Derived.scala
+++ b/test/disabled/presentation/doc/src/p/Derived.scala
diff --git a/test/files/neg/t7020.check b/test/files/disabled/t7020.check
index a869b12363..a869b12363 100644
--- a/test/files/neg/t7020.check
+++ b/test/files/disabled/t7020.check
diff --git a/test/files/neg/t7020.flags b/test/files/disabled/t7020.flags
index e8fb65d50c..e8fb65d50c 100644
--- a/test/files/neg/t7020.flags
+++ b/test/files/disabled/t7020.flags
diff --git a/test/files/neg/t7020.scala b/test/files/disabled/t7020.scala
index cc5421bab1..cc5421bab1 100644
--- a/test/files/neg/t7020.scala
+++ b/test/files/disabled/t7020.scala