Permalink
Browse files

Revert "2010-03-06 Zoltan Varga <vargaz@gmail.com>"

This reverts commit 4166ce286e8133828521b62d654d8d08ca62e6aa.

Revert this too as the corresponding fix was reverted.

svn path=/trunk/mono/; revision=153256
  • Loading branch information...
1 parent ccb6dff commit 46b2a88aa0f48af658abcfc31d51cd6a58a47e05 @vargaz vargaz committed Mar 8, 2010
Showing with 2 additions and 27 deletions.
  1. +0 −4 mono/tests/ChangeLog
  2. +2 −23 mono/tests/synchronized.cs
@@ -1,7 +1,3 @@
-2010-03-06 Zoltan Varga <vargaz@gmail.com>
-
- * synchronized.cs: Add tests for not locked monitors.
-
2010-03-05 Robert Jordan <robertj@gmx.net>
* remoting4.cs: Add test for bug #504886.
@@ -68,7 +68,7 @@ class Tests {
b.test_exception ();
}
catch (SynchronizationLockException ex) {
- // OK, this exception is thrown by the synchronized finalizer
+ return 1;
}
catch (Exception ex) {
// OK
@@ -105,35 +105,14 @@ class Tests {
d ();
}
catch (SynchronizationLockException ex) {
- // OK, this exception is thrown by the synchronized finalizer
+ return 2;
}
catch (Exception ex) {
// OK
}
if (is_synchronized (b))
return 1;
- // Monitor tests
-
- // Never locked
- try {
- Monitor.Exit (locker);
- return 3;
- } catch (SynchronizationLockException) {
- }
-
- // Not locked
- Monitor.Enter (locker2);
- Monitor.Exit (locker2);
- try {
- Monitor.Exit (locker2);
- return 4;
- } catch (SynchronizationLockException) {
- }
-
return 0;
}
-
- static object locker = new object ();
- static object locker2 = new object ();
}

0 comments on commit 46b2a88

Please sign in to comment.