summaryrefslogtreecommitdiff
path: root/mono
diff options
context:
space:
mode:
authorJo Shields <directhex@apebox.org>2014-01-08 14:01:06 +0000
committerJo Shields <directhex@apebox.org>2014-01-08 14:01:06 +0000
commit0e219a06c8b5d6ae6bed2bec792695f8c7a59d13 (patch)
treea22ce32bdf0820674189ec3d49dbb0d3964116b2 /mono
parentaa9c78d92f2c935530367879ee430bb493c24d8a (diff)
parent5872e81ddeb186852aef3e194393f07b7fe70ca3 (diff)
downloadmono-0e219a06c8b5d6ae6bed2bec792695f8c7a59d13.tar.gz
Merge branch 'master-experimental-patches/disable_monitor_test' into master-experimental
Diffstat (limited to 'mono')
-rw-r--r--mono/tests/Makefile.am1
1 files changed, 0 insertions, 1 deletions
diff --git a/mono/tests/Makefile.am b/mono/tests/Makefile.am
index ceacaffa09..5da2e30d63 100644
--- a/mono/tests/Makefile.am
+++ b/mono/tests/Makefile.am
@@ -368,7 +368,6 @@ BASE_TEST_CS_SRC= \
bug-575941.cs \
bug-599469.cs \
bug-389886-3.cs \
- monitor.cs \
dynamic-method-resurrection.cs \
bug-666008.cs \
bug-685908.cs \