From cf6891934297c51cd12bac3278b6e59df5e42f06 Mon Sep 17 00:00:00 2001 From: Vikas Rangarajan Date: Tue, 23 Mar 2010 12:31:32 -0700 Subject: Initial merge of local changes with master, main changes : - Distinguish between system and non-system headers for compilers that support it (g++) - only recurse dependencies for direct includes of current source --- src/test/java/net/sf/antcontrib/cpptasks/TestCompilerDef.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'src/test/java/net/sf/antcontrib/cpptasks/TestCompilerDef.java') diff --git a/src/test/java/net/sf/antcontrib/cpptasks/TestCompilerDef.java b/src/test/java/net/sf/antcontrib/cpptasks/TestCompilerDef.java index 017dc02..53a64dd 100644 --- a/src/test/java/net/sf/antcontrib/cpptasks/TestCompilerDef.java +++ b/src/test/java/net/sf/antcontrib/cpptasks/TestCompilerDef.java @@ -279,9 +279,10 @@ public final class TestCompilerDef SystemIncludePath path = baseCompiler.createSysIncludePath(); path.setPath("/tmp"); String[] preArgs = getPreArguments(extendedCompiler); + System.out.println("Class: " + baseCompiler + " and: " + extendedCompiler); // BEGINFREEHEP, passes extra option assertEquals(3, preArgs.length); - assertEquals("-I", preArgs[2].substring(0, 2)); + assertEquals("-isystem", preArgs[2].substring(0, 8)); // ENDFREEHEP } -- cgit v1.2.3