diff options
Diffstat (limited to 'src/test/java/net/sf/antcontrib/cpptasks/gcc/TestAbstractLdLinker.java')
-rw-r--r-- | src/test/java/net/sf/antcontrib/cpptasks/gcc/TestAbstractLdLinker.java | 55 |
1 files changed, 41 insertions, 14 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 63996c5..27ffea0 100644 --- a/src/test/java/net/sf/antcontrib/cpptasks/gcc/TestAbstractLdLinker.java +++ b/src/test/java/net/sf/antcontrib/cpptasks/gcc/TestAbstractLdLinker.java @@ -73,9 +73,11 @@ public class TestAbstractLdLinker extends TestCase { pluginOutType.setValue("shared"); pluginType.setOutputType(pluginOutType); linker.addImpliedArgs(false, pluginType, args); - assertEquals(2, args.size()); - assertEquals("-prebind", args.elementAt(0)); - assertEquals("-dynamiclib", args.elementAt(1)); + // FIXME NAR-103 + // BEGINFREEHEP + assertEquals(1, args.size()); + assertEquals("-dynamiclib", args.elementAt(0)); + // ENDFREEHEP } /** * Checks for proper arguments for plugin generation on Darwin @@ -168,11 +170,14 @@ public class TestAbstractLdLinker extends TestCase { String[] rc = linker.addLibrarySets(task, sets, preargs, midargs, endargs); assertEquals("-L", ((String) endargs.elementAt(0)).substring(0, 2)); - assertEquals("-Bdynamic", (String) endargs.elementAt(1)); - assertEquals("-lbart", (String) endargs.elementAt(2)); - assertEquals("-lcart", (String) endargs.elementAt(3)); - assertEquals("-ldart", (String) endargs.elementAt(4)); - assertEquals(endargs.size(), 5); +// FIXME NAR-103 +// BEGINFREEHEP +// assertEquals("-Bdynamic", (String) endargs.elementAt(1)); + assertEquals("-lbart", (String) endargs.elementAt(1)); + assertEquals("-lcart", (String) endargs.elementAt(2)); + assertEquals("-ldart", (String) endargs.elementAt(3)); + assertEquals(endargs.size(), 4); + // ENDFREEHEP } public void testAddLibrarySetLibFrameworkDarwin() { System.setProperty("os.name", "Mac OS X"); @@ -191,11 +196,22 @@ public class TestAbstractLdLinker extends TestCase { Vector endargs = new Vector(); String[] rc = linker.addLibrarySets(task, sets, preargs, midargs, endargs); +// FIXME NAR-103 +// BEGINFREEHEP + /* assertEquals("-F", ((String) endargs.elementAt(0)).substring(0, 2)); assertEquals("-framework bart", (String) endargs.elementAt(1)); assertEquals("-framework cart", (String) endargs.elementAt(2)); assertEquals("-framework dart", (String) endargs.elementAt(3)); assertEquals(endargs.size(), 4); + */ + assertEquals("-F", ((String) endargs.elementAt(0)).substring(0, 2)); + assertEquals("-framework", (String) endargs.elementAt(1)); + assertEquals("bart", (String) endargs.elementAt(2)); + assertEquals("cart", (String) endargs.elementAt(3)); + assertEquals("dart", (String) endargs.elementAt(4)); + assertEquals(endargs.size(), 5); +// ENDFREEHEP } public void testAddLibraryStatic() { AbstractLdLinker linker = getLinker(); @@ -219,12 +235,23 @@ public class TestAbstractLdLinker extends TestCase { Vector endargs = new Vector(); String[] rc = linker.addLibrarySets(task, sets, preargs, midargs, endargs); - 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); + for (int i=0; i<endargs.size(); i++) System.err.println(endargs.get( i )); +// NAR-103 +// BEGINFREEHEP + 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() { AbstractLdLinker linker = getLinker(); |