Skip to content

Commit 52bd9f1

Browse files
author
Federico Fissore
committed
Converting windows path in ctags output to normal paths, when looking for the
sketch path in gcc -E output (Windows is always a bit harder) Signed-off-by: Federico Fissore <[email protected]>
1 parent b2e0586 commit 52bd9f1

File tree

2 files changed

+3
-2
lines changed

2 files changed

+3
-2
lines changed

src/arduino.cc/builder/collect_ctags_from_sketch_files.go

+2-1
Original file line numberDiff line numberDiff line change
@@ -33,6 +33,7 @@ import (
3333
"arduino.cc/builder/constants"
3434
"arduino.cc/builder/types"
3535
"arduino.cc/builder/utils"
36+
"strings"
3637
)
3738

3839
type CollectCTagsFromSketchFiles struct{}
@@ -44,7 +45,7 @@ func (s *CollectCTagsFromSketchFiles) Run(context map[string]interface{}) error
4445
ctags := context[constants.CTX_CTAGS_OF_PREPROC_SOURCE].([]map[string]string)
4546
ctagsOfSketch := []map[string]string{}
4647
for _, ctag := range ctags {
47-
if utils.SliceContains(sketchFileNames, ctag[FIELD_FILENAME]) {
48+
if utils.SliceContains(sketchFileNames, strings.Replace(ctag[FIELD_FILENAME], "\\\\", "\\", -1)) {
4849
ctagsOfSketch = append(ctagsOfSketch, ctag)
4950
}
5051
}

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

+1-1
Original file line numberDiff line numberDiff line change
@@ -35,8 +35,8 @@ import (
3535
"arduino.cc/builder/utils"
3636
"github.com/stretchr/testify/require"
3737
"io/ioutil"
38-
"testing"
3938
"os"
39+
"testing"
4040
)
4141

4242
func TestReadFileAndStoreInContext(t *testing.T) {

0 commit comments

Comments
 (0)