diff options
author | Jo Shields <jo.shields@xamarin.com> | 2015-11-18 16:01:22 +0000 |
---|---|---|
committer | Jo Shields <jo.shields@xamarin.com> | 2015-11-18 16:01:22 +0000 |
commit | 2f1982b58ee0a8ef667815b87833ece4955eba60 (patch) | |
tree | 585025187e6caa3d8ab82bf95175c46ecc57936b /mono | |
parent | e0d4aca9ee0736e5ef7a4dc29d3114e8f98fd554 (diff) | |
parent | 3efc50edb022d2fa8081574f93295b49d357b051 (diff) | |
download | mono-2f1982b58ee0a8ef667815b87833ece4955eba60.tar.gz |
Merge branch 'master-experimental-patches/disable_monitor_test' into merge/4.2.1.102+dfsg
Diffstat (limited to 'mono')
-rw-r--r-- | mono/tests/Makefile.am | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/mono/tests/Makefile.am b/mono/tests/Makefile.am index 23c9d1075d..8cb35547d5 100644 --- a/mono/tests/Makefile.am +++ b/mono/tests/Makefile.am @@ -387,8 +387,6 @@ BASE_TEST_CS_SRC= \ bug-575941.cs \ bug-599469.cs \ bug-389886-3.cs \ - monitor.cs \ - monitor-resurrection.cs \ dynamic-method-resurrection.cs \ bug-666008.cs \ bug-685908.cs \ |