ported sketch with merged sketch and bootloader from legacy into inte…

…gration test
arduino · Sep 13, 2023 · 7d7a177 · 7d7a177
1 parent c8d1195
commit 7d7a177
Show file tree

Hide file tree

Showing 12 changed files with 30 additions and 212 deletions.
diff --git a/internal/integrationtest/compile_4/__debug_bin2631212859 b/internal/integrationtest/compile_4/__debug_bin2631212859
diff --git a/internal/integrationtest/compile_4/compile_test.go b/internal/integrationtest/compile_4/compile_test.go
@@ -775,7 +775,6 @@ func testBuilderSketchWithFastledsLibrary(t *testing.T, env *integrationtest.Env
 	})
 }
 
-
 type builderOutput struct {
 	CompilerOut   string `json:"compiler_out"`
 	CompilerErr   string `json:"compiler_err"`
@@ -928,3 +927,30 @@ func TestCoreCaching(t *testing.T) {
 	require.NoError(t, err)
 	require.NotEqual(t, coreStatBefore.ModTime(), coreStatAfterTouch.ModTime())
 }
+
+func TestMergeSketchWithBootloader(t *testing.T) {
+	env, cli := integrationtest.CreateArduinoCLIWithEnvironment(t)
+	defer env.CleanUp()
+
+	sketchPath, err := paths.New("testdata", "SketchWithMergedSketchAndBootloader").Abs()
+	require.NoError(t, err)
+
+	// Install Arduino AVR Boards
+	_, _, err = cli.Run("core", "install", "arduino:[email protected]")
+	require.NoError(t, err)
+
+	buildPath, err := paths.MkTempDir("", "arduino-integration-test")
+	require.NoError(t, err)
+	defer buildPath.RemoveAll()
+
+	// Build first time
+	_, _, err = cli.Run("compile", "-b", "arduino:avr:uno", "--build-path", buildPath.String(), sketchPath.String())
+	require.NoError(t, err)
+
+	bytes, err := buildPath.Join("SketchWithMergedSketchAndBootloader.ino.with_bootloader.hex").ReadFile()
+	require.NoError(t, err)
+	mergedSketchHex := string(bytes)
+
+	require.Contains(t, mergedSketchHex, ":100000000C9434000C9446000C9446000C9446006A\n")
+	require.True(t, strings.HasSuffix(mergedSketchHex, ":00000001FF\n"))
+}
diff --git a/legacy/builder/test/sketch1/sketch1.ino → ...r/SketchWithMergedSketchAndBootloader.ino b/legacy/builder/test/sketch1/sketch1.ino → ...r/SketchWithMergedSketchAndBootloader.ino
@@ -4,4 +4,4 @@ void setup() {
 
 void loop() {
 
-}
+}
diff --git a/legacy/builder/test/sketch1/doc.txt → ...etchWithMergedSketchAndBootloader/doc.txt b/legacy/builder/test/sketch1/doc.txt → ...etchWithMergedSketchAndBootloader/doc.txt
diff --git a/internal/integrationtest/compile_4/testdata/SketchWithMergedSketchAndBootloader/header.h b/internal/integrationtest/compile_4/testdata/SketchWithMergedSketchAndBootloader/header.h
@@ -0,0 +1 @@
+#define TRUE FALSE
diff --git a/...cy/builder/test/sketch1/merged_sketch.txt → ...rgedSketchAndBootloader/merged_sketch.txt b/...cy/builder/test/sketch1/merged_sketch.txt → ...rgedSketchAndBootloader/merged_sketch.txt
diff --git a/legacy/builder/test/sketch1/old.pde → ...etchWithMergedSketchAndBootloader/old.pde b/legacy/builder/test/sketch1/old.pde → ...etchWithMergedSketchAndBootloader/old.pde
diff --git a/legacy/builder/test/sketch1/other.ino → ...chWithMergedSketchAndBootloader/other.ino b/legacy/builder/test/sketch1/other.ino → ...chWithMergedSketchAndBootloader/other.ino
@@ -1,3 +1,3 @@
 String hello() {
   return "world";
-}
+}
diff --git a/legacy/builder/test/sketch1/s_file.S → ...tchWithMergedSketchAndBootloader/s_file.S b/legacy/builder/test/sketch1/s_file.S → ...tchWithMergedSketchAndBootloader/s_file.S
diff --git a/legacy/builder/test/sketch1/src/helper.h → ...ithMergedSketchAndBootloader/src/helper.h b/legacy/builder/test/sketch1/src/helper.h → ...ithMergedSketchAndBootloader/src/helper.h
diff --git a/legacy/builder/test/merge_sketch_with_bootloader_test.go b/legacy/builder/test/merge_sketch_with_bootloader_test.go
diff --git a/legacy/builder/test/sketch1/header.h b/legacy/builder/test/sketch1/header.h