summaryrefslogtreecommitdiff
path: root/src/test
diff options
context:
space:
mode:
authorMark Donszelmann <Mark.Donszelmann@gmail.com>2009-11-06 16:01:09 +0100
committerMark Donszelmann <Mark.Donszelmann@gmail.com>2009-11-06 16:01:09 +0100
commit0a125329abe4ea413fdc987b331df129aaa2569b (patch)
tree9fce51cfd468e4dc05a8471b1d719f780b5ede71 /src/test
parentfa6eb468613603bfa2571f2e456468878bfe0b95 (diff)
downloadcpptasks-parallel-0a125329abe4ea413fdc987b331df129aaa2569b.tar.gz
cpptasks-parallel-0a125329abe4ea413fdc987b331df129aaa2569b.tar.bz2
cpptasks-parallel-0a125329abe4ea413fdc987b331df129aaa2569b.tar.xz
cpptasks-parallel-0a125329abe4ea413fdc987b331df129aaa2569b.zip
Fixed tests on platforms other than MacOSX
Diffstat (limited to 'src/test')
-rw-r--r--src/test/java/net/sf/antcontrib/cpptasks/gcc/TestAbstractLdLinker.java25
1 files changed, 13 insertions, 12 deletions
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() {