From 0a125329abe4ea413fdc987b331df129aaa2569b Mon Sep 17 00:00:00 2001
From: Mark Donszelmann <Mark.Donszelmann@gmail.com>
Date: Fri, 6 Nov 2009 16:01:09 +0100
Subject: Fixed tests on platforms other than MacOSX

---
 .../cpptasks/gcc/TestAbstractLdLinker.java         | 25 +++++++++++-----------
 1 file changed, 13 insertions(+), 12 deletions(-)

(limited to 'src')

diff --git a/src/test/java/net/sf/antcontrib/cpptasks/gcc/TestAbstractLdLinker.java b/src/test/java/net/sf/antcontrib/cpptasks/gcc/TestAbstractLdLinker.java
index 958f93b..27ffea0 100644
--- a/src/test/java/net/sf/antcontrib/cpptasks/gcc/TestAbstractLdLinker.java
+++ b/src/test/java/net/sf/antcontrib/cpptasks/gcc/TestAbstractLdLinker.java
@@ -238,18 +238,19 @@ public class TestAbstractLdLinker extends TestCase {
         for (int i=0; i<endargs.size(); i++) System.err.println(endargs.get( i ));
 // NAR-103
 // BEGINFREEHEP
-        /*
-        assertEquals("-lbart", (String) endargs.elementAt(0));
-        assertEquals("-Bstatic", (String) endargs.elementAt(1));
-        assertEquals("-lcart", (String) endargs.elementAt(2));
-        assertEquals("-Bdynamic", (String) endargs.elementAt(3));
-        assertEquals("-ldart", (String) endargs.elementAt(4));
-        assertEquals(endargs.size(), 5);
-        */
-        assertEquals("-lbart", (String) endargs.elementAt(0));
-        assertEquals("-lcart", (String) endargs.elementAt(1));
-        assertEquals("-ldart", (String) endargs.elementAt(2));
-        assertEquals(endargs.size(), 3);
+        if (System.getProperty("os.name").equals("Mac OS X")) {
+            assertEquals("-lbart", (String) endargs.elementAt(0));
+            assertEquals("-lcart", (String) endargs.elementAt(1));
+            assertEquals("-ldart", (String) endargs.elementAt(2));
+            assertEquals(endargs.size(), 3);
+        } else {
+            assertEquals("-lbart", (String) endargs.elementAt(0));
+            assertEquals("-Bstatic", (String) endargs.elementAt(1));
+            assertEquals("-lcart", (String) endargs.elementAt(2));
+            assertEquals("-Bdynamic", (String) endargs.elementAt(3));
+            assertEquals("-ldart", (String) endargs.elementAt(4));
+            assertEquals(endargs.size(), 5);
+        }
 // ENDFREEHEP
     }
     public void testLibReturnValue() {
-- 
cgit v1.2.3