When collecting sketch files, .ino files are valid only if located in the same

folder of main .ino file. Fixes #31

Signed-off-by: Federico Fissore <[email protected]>

Author: Federico Fissore

Diff for: src/arduino.cc/builder/sketch_loader.go

@@ -75,6 +75,9 @@ func (s *SketchLoader) Run(context map[string]interface{}) error {
 
 	logger := context[constants.CTX_LOGGER].(i18n.Logger)
 	sketch, err := makeSketch(sketchLocation, allSketchFilePaths, logger)
+	if err != nil {
+		return utils.WrapError(err)
+	}
 
 	context[constants.CTX_SKETCH_LOCATION] = sketchLocation
 	context[constants.CTX_SKETCH] = sketch
@@ -107,10 +110,13 @@ func makeSketch(sketchLocation string, allSketchFilePaths []string, logger i18n.
 
 	additionalFiles := []types.SketchFile{}
 	otherSketchFiles := []types.SketchFile{}
+	mainFileDir := filepath.Dir(mainFile.Name)
 	for _, sketchFile := range sketchFilesMap {
 		ext := strings.ToLower(filepath.Ext(sketchFile.Name))
 		if MAIN_FILE_VALID_EXTENSIONS[ext] {
-			otherSketchFiles = append(otherSketchFiles, sketchFile)
+			if filepath.Dir(sketchFile.Name) == mainFileDir {
+				otherSketchFiles = append(otherSketchFiles, sketchFile)
+			}
 		} else if ADDITIONAL_FILE_VALID_EXTENSIONS[ext] {
 			additionalFiles = append(additionalFiles, sketchFile)
 		} else {

Diff for: src/arduino.cc/builder/test/builder_test.go

@@ -265,6 +265,26 @@ func TestBuilderSketchNoFunctions(t *testing.T) {
 	require.Error(t, err)
 }
 
+func TestBuilderSketchWithBackup(t *testing.T) {
+	DownloadCoresAndToolsAndLibraries(t)
+
+	context := make(map[string]interface{})
+
+	buildPath := SetupBuildPath(t, context)
+	defer os.RemoveAll(buildPath)
+
+	context[constants.CTX_HARDWARE_FOLDERS] = []string{filepath.Join("..", "hardware"), "hardware", "downloaded_hardware", "downloaded_board_manager_stuff"}
+	context[constants.CTX_TOOLS_FOLDERS] = []string{"downloaded_tools", "downloaded_board_manager_stuff"}
+	context[constants.CTX_FQBN] = "arduino:avr:uno"
+	context[constants.CTX_SKETCH_LOCATION] = filepath.Join("sketch_with_backup_files", "sketch.ino")
+	context[constants.CTX_LIBRARIES_FOLDERS] = []string{"libraries", "downloaded_libraries"}
+	context[constants.CTX_BUILD_PROPERTIES_RUNTIME_IDE_VERSION] = "10600"
+
+	command := builder.Builder{}
+	err := command.Run(context)
+	NoError(t, err)
+}
+
 /*
 func TestBuilderALinkage(t *testing.T) {
 	DownloadCoresAndToolsAndLibraries(t)

Diff for: src/arduino.cc/builder/test/sketch_loader_test.go

@@ -77,13 +77,15 @@ func TestLoadSketch(t *testing.T) {
 	context := make(map[string]interface{})
 	context[constants.CTX_SKETCH_LOCATION] = filepath.Join("sketch1", "sketch.ino")
 
-	loggerCommand := builder.SetupHumanLoggerIfMissing{}
-	err := loggerCommand.Run(context)
-	NoError(t, err)
+	commands := []types.Command{
+		&builder.SetupHumanLoggerIfMissing{},
+		&builder.SketchLoader{},
+	}
 
-	loader := builder.SketchLoader{}
-	err = loader.Run(context)
-	NoError(t, err)
+	for _, command := range commands {
+		err := command.Run(context)
+		NoError(t, err)
+	}
 
 	sketch := context[constants.CTX_SKETCH].(*types.Sketch)
 	require.NotNil(t, sketch)
@@ -119,13 +121,15 @@ func TestLoadSketchFromFolder(t *testing.T) {
 	context := make(map[string]interface{})
 	context[constants.CTX_SKETCH_LOCATION] = "sketch_with_subfolders"
 
-	loggerCommand := builder.SetupHumanLoggerIfMissing{}
-	err := loggerCommand.Run(context)
-	NoError(t, err)
+	commands := []types.Command{
+		&builder.SetupHumanLoggerIfMissing{},
+		&builder.SketchLoader{},
+	}
 
-	loader := builder.SketchLoader{}
-	err = loader.Run(context)
-	NoError(t, err)
+	for _, command := range commands {
+		err := command.Run(context)
+		NoError(t, err)
+	}
 
 	sketch := context[constants.CTX_SKETCH].(*types.Sketch)
 	require.NotNil(t, sketch)
@@ -135,3 +139,26 @@ func TestLoadSketchFromFolder(t *testing.T) {
 	require.Equal(t, 1, len(sketch.AdditionalFiles))
 	require.True(t, strings.Index(sketch.AdditionalFiles[0].Name, "other.cpp") != -1)
 }
+
+func TestLoadSketchWithBackup(t *testing.T) {
+	context := make(map[string]interface{})
+	context[constants.CTX_SKETCH_LOCATION] = filepath.Join("sketch_with_backup_files", "sketch.ino")
+
+	commands := []types.Command{
+		&builder.SetupHumanLoggerIfMissing{},
+		&builder.SketchLoader{},
+	}
+
+	for _, command := range commands {
+		err := command.Run(context)
+		NoError(t, err)
+	}
+
+	sketch := context[constants.CTX_SKETCH].(*types.Sketch)
+	require.NotNil(t, sketch)
+
+	require.True(t, strings.Index(sketch.MainFile.Name, "sketch.ino") != -1)
+
+	require.Equal(t, 0, len(sketch.AdditionalFiles))
+	require.Equal(t, 0, len(sketch.OtherSketchFiles))
+}

Diff for: src/arduino.cc/builder/test/sketch_with_backup_files/backup/sketch.ino

@@ -0,0 +1,7 @@
+void setup() {
+
+}
+
+void loop() {
+
+broken

Diff for: src/arduino.cc/builder/test/sketch_with_backup_files/sketch.ino

@@ -0,0 +1,7 @@
+void setup() {
+
+}
+
+void loop() {
+
+}

Diff for: src/arduino.cc/builder/test/sketch_with_function_pointer/sketch.ino

@@ -0,0 +1,9 @@
+void setup(){
+  func()();
+}
+
+void loop(){}
+
+void (*func())(){
+  return setup;
+}