diff options
Diffstat (limited to 'src/test/java/net/sf/antcontrib/cpptasks/TestLinkerDef.java')
-rw-r--r-- | src/test/java/net/sf/antcontrib/cpptasks/TestLinkerDef.java | 21 |
1 files changed, 14 insertions, 7 deletions
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]); } |