Fix include resolution for older compilers

the regexp was only handling the #include line

Signed-off-by: Martino Facchin <[email protected]>

Author: facchinm

src/arduino.cc/builder/includes_finder_with_regexp.go

@@ -51,6 +51,13 @@ func (s *IncludesFinderWithRegExp) Run(context map[string]interface{}) error {
 		includes = append(includes, strings.TrimSpace(match[1]))
 	}
 
+	if len(includes) == 0 {
+		include := findIncludesForOldCompilers(source)
+		if include != "" {
+			includes = append(includes, include)
+		}
+	}
+
 	context[constants.CTX_INCLUDES_JUST_FOUND] = includes
 
 	if !utils.MapHas(context, constants.CTX_INCLUDES) {
@@ -62,3 +69,14 @@ func (s *IncludesFinderWithRegExp) Run(context map[string]interface{}) error {
 
 	return nil
 }
+
+func findIncludesForOldCompilers(source string) string {
+	firstLine := strings.Split(source, "\n")[0]
+	splittedLine := strings.Split(firstLine, ":")
+	for i, _ := range splittedLine {
+		if strings.Contains(splittedLine[i], "fatal error") {
+			return strings.TrimSpace(splittedLine[i+1])
+		}
+	}
+	return ""
+}

src/arduino.cc/builder/test/includes_finder_with_regexp_test.go

@@ -182,3 +182,24 @@ func TestIncludesFinderWithRegExpPaddedIncludes2(t *testing.T) {
 	sort.Strings(includes)
 	require.Equal(t, "Wire.h", includes[0])
 }
+
+func TestIncludesFinderWithRegExpPaddedIncludes3(t *testing.T) {
+	context := make(map[string]interface{})
+
+	context[constants.CTX_INCLUDES] = []string{}
+
+	output := "/some/path/sketch.ino:1:33: fatal error: SPI.h: No such file or directory\n" +
+		"compilation terminated.\n"
+
+	context["source"] = output
+
+	parser := builder.IncludesFinderWithRegExp{ContextField: "source"}
+	err := parser.Run(context)
+	NoError(t, err)
+
+	require.NotNil(t, context[constants.CTX_INCLUDES])
+	includes := context[constants.CTX_INCLUDES].([]string)
+	require.Equal(t, 1, len(includes))
+	sort.Strings(includes)
+	require.Equal(t, "SPI.h", includes[0])
+}