# HG changeset patch
# User Christos Kotselidis <christos.kotselidis@oracle.com>
# Date 1382721800 -7200
# Node ID 4995bb251e3a30f6716da4fa2c413e3a671db1f9
# Parent  86e5fc5ba6bd0e1c16d81f70027bdb2c91e534e7
Fix unit tests

diff -r 86e5fc5ba6bd -r 4995bb251e3a graal/com.oracle.graal.hotspot.test/src/com/oracle/graal/hotspot/test/WriteBarrierAdditionTest.java
--- a/graal/com.oracle.graal.hotspot.test/src/com/oracle/graal/hotspot/test/WriteBarrierAdditionTest.java	Fri Oct 25 19:23:06 2013 +0200
+++ b/graal/com.oracle.graal.hotspot.test/src/com/oracle/graal/hotspot/test/WriteBarrierAdditionTest.java	Fri Oct 25 19:23:20 2013 +0200
@@ -73,13 +73,7 @@
      */
     @Test
     public void test1() throws Exception {
-        int expectedBarriers = 0;
-        if (useG1GC()) {
-            expectedBarriers = (useDeferredInitBarriers() ? 0 : 4);
-        } else {
-            expectedBarriers = (useDeferredInitBarriers() ? 0 : 2);
-        }
-        test("test1Snippet", expectedBarriers);
+        test("test1Snippet", (useG1GC()) ? 4 : 2);
     }
 
     public static void test1Snippet() {
@@ -95,13 +89,7 @@
      */
     @Test
     public void test2() throws Exception {
-        int expectedBarriers = 0;
-        if (useG1GC()) {
-            expectedBarriers = (useDeferredInitBarriers() ? 0 : 8);
-        } else {
-            expectedBarriers = (useDeferredInitBarriers() ? 0 : 4);
-        }
-        test("test2Snippet", expectedBarriers);
+        test("test2Snippet", (useG1GC()) ? 8 : 4);
     }
 
     public static void test2Snippet(boolean test) {
@@ -147,13 +135,7 @@
      */
     @Test
     public void test4() throws Exception {
-        int expectedBarriers = 0;
-        if (useG1GC()) {
-            expectedBarriers = (useDeferredInitBarriers() ? 1 : 5);
-        } else {
-            expectedBarriers = (useDeferredInitBarriers() ? 0 : 2);
-        }
-        test("test4Snippet", expectedBarriers);
+        test("test4Snippet", (useG1GC()) ? 5 : 2);
     }
 
     public static Object test4Snippet() {