From 48961a341b29a2b7c33c06a75885fbbd2e83aa03 Mon Sep 17 00:00:00 2001 From: Martin Weber Date: Tue, 2 Jun 2020 20:33:37 +0200 Subject: [PATCH] Bug 559674: fix failing tests Change-Id: I6bf9a81dd1cbf673b2472597fc431e6bb1c75ef8 Signed-off-by: Martin Weber --- .../cmake/is/core/internal/builtins/GccOutputProcessorTest.java | 2 +- .../cmake/is/core/participant/DefaultToolCommandlineParser.java | 2 +- .../cdt/cmake/is/nvidia/builtins/NvccOutputProcessorTest.java | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/cmake/org.eclipse.cdt.cmake.is.core.tests/src/main/java/org/eclipse/cdt/cmake/is/core/internal/builtins/GccOutputProcessorTest.java b/cmake/org.eclipse.cdt.cmake.is.core.tests/src/main/java/org/eclipse/cdt/cmake/is/core/internal/builtins/GccOutputProcessorTest.java index 070af6ba4b2..5eeb55d137d 100644 --- a/cmake/org.eclipse.cdt.cmake.is.core.tests/src/main/java/org/eclipse/cdt/cmake/is/core/internal/builtins/GccOutputProcessorTest.java +++ b/cmake/org.eclipse.cdt.cmake.is.core.tests/src/main/java/org/eclipse/cdt/cmake/is/core/internal/builtins/GccOutputProcessorTest.java @@ -57,7 +57,7 @@ public class GccOutputProcessorTest { } } - assertEquals("# include paths", 5, pc.getIncludePaths().size()); + assertEquals("# include paths", 5, pc.getSystemIncludePaths().size()); assertEquals("# macros", 238, pc.getDefines().size()); // check __GNUC__ diff --git a/cmake/org.eclipse.cdt.cmake.is.core/src/main/java/org/eclipse/cdt/cmake/is/core/participant/DefaultToolCommandlineParser.java b/cmake/org.eclipse.cdt.cmake.is.core/src/main/java/org/eclipse/cdt/cmake/is/core/participant/DefaultToolCommandlineParser.java index 2edfbe78295..d94da445a77 100644 --- a/cmake/org.eclipse.cdt.cmake.is.core/src/main/java/org/eclipse/cdt/cmake/is/core/participant/DefaultToolCommandlineParser.java +++ b/cmake/org.eclipse.cdt.cmake.is.core/src/main/java/org/eclipse/cdt/cmake/is/core/participant/DefaultToolCommandlineParser.java @@ -105,6 +105,7 @@ public class DefaultToolCommandlineParser implements IToolCommandlineParser { private class ParserHandler implements IParserHandler { private final IPath cwd; + private final ParseContext result = new ParseContext(); /** * @param cwd the current working directory of the compiler at the time of its @@ -122,7 +123,6 @@ public class DefaultToolCommandlineParser implements IToolCommandlineParser { */ @SuppressWarnings("nls") private IResult parseArguments(IResponseFileArglet responseFileArglet, String args) { - ParseContext result = new ParseContext(); // eat buildOutput string argument by argument.. while (!(args = StringUtil.trimLeadingWS(args)).isEmpty()) { boolean argParsed = false; diff --git a/cmake/org.eclipse.cdt.cmake.is.nvidia.tests/src/main/java/org/eclipse/cdt/cmake/is/nvidia/builtins/NvccOutputProcessorTest.java b/cmake/org.eclipse.cdt.cmake.is.nvidia.tests/src/main/java/org/eclipse/cdt/cmake/is/nvidia/builtins/NvccOutputProcessorTest.java index e04f2acb8a3..f8be518945b 100644 --- a/cmake/org.eclipse.cdt.cmake.is.nvidia.tests/src/main/java/org/eclipse/cdt/cmake/is/nvidia/builtins/NvccOutputProcessorTest.java +++ b/cmake/org.eclipse.cdt.cmake.is.nvidia.tests/src/main/java/org/eclipse/cdt/cmake/is/nvidia/builtins/NvccOutputProcessorTest.java @@ -55,7 +55,7 @@ public class NvccOutputProcessorTest { } } - assertEquals("# include paths", 6, pc.includePaths.size()); + assertEquals("# include paths", 6, pc.systemIncludePaths.size()); assertEquals("# macros", 242, pc.defines.size()); // check __CUDACC_VER_BUILD__