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

1 files changed, 2 insertions, 1 deletions

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
   }