diff options
Diffstat (limited to 'src/test')
8 files changed, 71 insertions, 39 deletions
diff --git a/src/test/java/net/sf/antcontrib/cpptasks/TestCompilerDef.java b/src/test/java/net/sf/antcontrib/cpptasks/TestCompilerDef.java index 12e1967..017dc02 100644 --- a/src/test/java/net/sf/antcontrib/cpptasks/TestCompilerDef.java +++ b/src/test/java/net/sf/antcontrib/cpptasks/TestCompilerDef.java @@ -225,7 +225,8 @@ public final class TestCompilerDef CompilerDef extendedLinker = (CompilerDef) createExtendedProcessorDef( baseLinker); String[] preArgs = getPreArguments(extendedLinker); - assertEquals(2, preArgs.length); + // FREEHEP, passes extra option + assertEquals(3, preArgs.length); assertEquals("/base", preArgs[0]); } @@ -244,8 +245,10 @@ public final class TestCompilerDef CompilerDef extendedCompiler = (CompilerDef) createExtendedProcessorDef( baseCompiler); String[] preArgs = getPreArguments(extendedCompiler); - assertEquals(2, preArgs.length); - assertEquals("-Dfoo=bar", preArgs[1]); + // BEGINFREEHEP, passes extra option + assertEquals(3, preArgs.length); + assertEquals("-Dfoo=bar", preArgs[2]); + // ENDFREEHEP } /** @@ -259,8 +262,10 @@ public final class TestCompilerDef IncludePath path = baseCompiler.createIncludePath(); path.setPath("/tmp"); String[] preArgs = getPreArguments(extendedCompiler); - assertEquals(2, preArgs.length); - assertEquals("-I", preArgs[1].substring(0, 2)); + // BEGINFREEHEP, passes extra option + assertEquals(3, preArgs.length); + assertEquals("-I", preArgs[2].substring(0, 2)); + // ENDFREEHEP } /** @@ -274,8 +279,10 @@ public final class TestCompilerDef SystemIncludePath path = baseCompiler.createSysIncludePath(); path.setPath("/tmp"); String[] preArgs = getPreArguments(extendedCompiler); - assertEquals(2, preArgs.length); - assertEquals("-I", preArgs[1].substring(0, 2)); + // BEGINFREEHEP, passes extra option + assertEquals(3, preArgs.length); + assertEquals("-I", preArgs[2].substring(0, 2)); + // ENDFREEHEP } /** diff --git a/src/test/java/net/sf/antcontrib/cpptasks/TestLinkerDef.java b/src/test/java/net/sf/antcontrib/cpptasks/TestLinkerDef.java index 994b068..e35c5e6 100644 --- a/src/test/java/net/sf/antcontrib/cpptasks/TestLinkerDef.java +++ b/src/test/java/net/sf/antcontrib/cpptasks/TestLinkerDef.java @@ -243,7 +243,8 @@ public final class TestLinkerDef setLinkerName(extendedLinker, "msvc"); String[] preArgs = getPreArguments(extendedLinker); assertEquals("/NOLOGO", preArgs[0]); - assertEquals("/SUBSYSTEM:WINDOWS", preArgs[1]); + // FREEHEP changed from WINDOWS into CONSOLE + assertEquals("/SUBSYSTEM:CONSOLE", preArgs[1]); assertEquals("/INCREMENTAL:NO", preArgs[2]); assertEquals("/BASE:0x2710", preArgs[3]); } @@ -260,7 +261,8 @@ public final class TestLinkerDef setLinkerName(extendedLinker, "msvc"); String[] preArgs = getPreArguments(extendedLinker); assertEquals("/NOLOGO", preArgs[0]); - assertEquals("/SUBSYSTEM:WINDOWS", preArgs[1]); + // FREEHEP changed from WINDOWS into CONSOLE + assertEquals("/SUBSYSTEM:CONSOLE", preArgs[1]); assertEquals("/INCREMENTAL:NO", preArgs[2]); assertEquals("/STACK:0x2710", preArgs[3]); } @@ -291,7 +293,8 @@ public final class TestLinkerDef setLinkerName(extendedLinker, "msvc"); String[] preArgs = getPreArguments(extendedLinker); assertEquals("/NOLOGO", preArgs[0]); - assertEquals("/SUBSYSTEM:WINDOWS", preArgs[1]); + // FREEHEP changed from WINDOWS into CONSOLE + assertEquals("/SUBSYSTEM:CONSOLE", preArgs[1]); assertEquals("/INCREMENTAL:NO", preArgs[2]); assertEquals("/FIXED", preArgs[3]); } @@ -308,7 +311,8 @@ public final class TestLinkerDef setLinkerName(extendedLinker, "msvc"); String[] preArgs = getPreArguments(extendedLinker); assertEquals("/NOLOGO", preArgs[0]); - assertEquals("/SUBSYSTEM:WINDOWS", preArgs[1]); + // FREEHEP changed from WINDOWS into CONSOLE + assertEquals("/SUBSYSTEM:CONSOLE", preArgs[1]); assertEquals("/INCREMENTAL:YES", preArgs[2]); } @@ -324,7 +328,8 @@ public final class TestLinkerDef setLinkerName(extendedLinker, "msvc"); String[] preArgs = getPreArguments(extendedLinker); assertEquals("/NOLOGO", preArgs[0]); - assertEquals("/SUBSYSTEM:WINDOWS", preArgs[1]); + // FREEHEP changed from WINDOWS into CONSOLE + assertEquals("/SUBSYSTEM:CONSOLE", preArgs[1]); assertEquals("/INCREMENTAL:NO", preArgs[2]); assertEquals("/MAP", preArgs[3]); } @@ -349,7 +354,8 @@ public final class TestLinkerDef extendedLinker.setBase(new FlexLong("10000")); String[] preArgs = getPreArguments(extendedLinker); assertEquals("/NOLOGO", preArgs[0]); - assertEquals("/SUBSYSTEM:WINDOWS", preArgs[1]); + // FREEHEP changed from WINDOWS into CONSOLE + assertEquals("/SUBSYSTEM:CONSOLE", preArgs[1]); assertEquals("/INCREMENTAL:NO", preArgs[2]); assertEquals("/BASE:0x2710", preArgs[3]); } @@ -367,7 +373,8 @@ public final class TestLinkerDef extendedLinker.setBase(new FlexLong("10000")); String[] preArgs = getPreArguments(extendedLinker); assertEquals("/NOLOGO", preArgs[0]); - assertEquals("/SUBSYSTEM:WINDOWS", preArgs[1]); + // FREEHEP changed from WINDOWS into CONSOLE + assertEquals("/SUBSYSTEM:CONSOLE", preArgs[1]); assertEquals("/INCREMENTAL:NO", preArgs[2]); assertEquals("/BASE:0x2710", preArgs[3]); } diff --git a/src/test/java/net/sf/antcontrib/cpptasks/TestProcessorDef.java b/src/test/java/net/sf/antcontrib/cpptasks/TestProcessorDef.java index c4e2905..8bce7ec 100644 --- a/src/test/java/net/sf/antcontrib/cpptasks/TestProcessorDef.java +++ b/src/test/java/net/sf/antcontrib/cpptasks/TestProcessorDef.java @@ -257,7 +257,8 @@ public abstract class TestProcessorDef baseLinker.setDebug(true); ProcessorDef extendedLinker = createExtendedProcessorDef(baseLinker); String[] preArgs = getPreArguments(extendedLinker); - assertEquals("-g", preArgs[preArgs.length - 1]); + // FREEHEP, passes (sometimes) extra option + assertEquals("-g", preArgs[Math.max(preArgs.length - 2, 0)]); } /** diff --git a/src/test/java/net/sf/antcontrib/cpptasks/devstudio/TestDevStudio2005CCompiler.java b/src/test/java/net/sf/antcontrib/cpptasks/devstudio/TestDevStudio2005CCompiler.java index dccb986..8f6903e 100644 --- a/src/test/java/net/sf/antcontrib/cpptasks/devstudio/TestDevStudio2005CCompiler.java +++ b/src/test/java/net/sf/antcontrib/cpptasks/devstudio/TestDevStudio2005CCompiler.java @@ -18,8 +18,6 @@ package net.sf.antcontrib.cpptasks.devstudio; import java.util.Vector; import junit.framework.TestCase; - -import net.sf.antcontrib.cpptasks.compiler.AbstractProcessor; /** * Test Microsoft C/C++ compiler adapter * diff --git a/src/test/java/net/sf/antcontrib/cpptasks/devstudio/TestDevStudioCCompiler.java b/src/test/java/net/sf/antcontrib/cpptasks/devstudio/TestDevStudioCCompiler.java index eeeec14..0e546e9 100644 --- a/src/test/java/net/sf/antcontrib/cpptasks/devstudio/TestDevStudioCCompiler.java +++ b/src/test/java/net/sf/antcontrib/cpptasks/devstudio/TestDevStudioCCompiler.java @@ -18,8 +18,6 @@ package net.sf.antcontrib.cpptasks.devstudio; import java.util.Vector; import junit.framework.TestCase; - -import net.sf.antcontrib.cpptasks.compiler.AbstractProcessor; /** * Test Microsoft C/C++ compiler adapter * 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(); diff --git a/src/test/java/net/sf/antcontrib/cpptasks/hp/TestaCCCompiler.java b/src/test/java/net/sf/antcontrib/cpptasks/hp/TestaCCCompiler.java index 073463e..6c3a8b5 100644 --- a/src/test/java/net/sf/antcontrib/cpptasks/hp/TestaCCCompiler.java +++ b/src/test/java/net/sf/antcontrib/cpptasks/hp/TestaCCCompiler.java @@ -15,10 +15,7 @@ * limitations under the License. */ package net.sf.antcontrib.cpptasks.hp; -import java.util.Vector; - import junit.framework.TestCase; - import net.sf.antcontrib.cpptasks.compiler.AbstractProcessor; /** * Test HP aCC compiler adapter diff --git a/src/test/java/net/sf/antcontrib/cpptasks/ibm/TestVisualAgeCCompiler.java b/src/test/java/net/sf/antcontrib/cpptasks/ibm/TestVisualAgeCCompiler.java index 62a513e..87e7020 100644 --- a/src/test/java/net/sf/antcontrib/cpptasks/ibm/TestVisualAgeCCompiler.java +++ b/src/test/java/net/sf/antcontrib/cpptasks/ibm/TestVisualAgeCCompiler.java @@ -15,10 +15,7 @@ * limitations under the License. */ package net.sf.antcontrib.cpptasks.ibm; -import java.util.Vector; - import junit.framework.TestCase; - import net.sf.antcontrib.cpptasks.compiler.AbstractProcessor; /** * Test IBM Visual Age compiler adapter |