Fix compile and upload with custom build path

Author: silvanocerza

cli/compile/compile.go

@@ -141,7 +141,7 @@ func run(cmd *cobra.Command, args []string) {
 			Port:       port,
 			Verbose:    verbose,
 			Verify:     verify,
-			ImportDir:  exportDir,
+			ImportDir:  buildPath,
 			Programmer: programmer,
 		}, os.Stdout, os.Stderr)
 

test/test_compile.py

@@ -299,3 +299,44 @@ def test_compile_with_export_binaries_flag(run_command, data_dir):
     assert (sketch_path / "build" / fqbn.replace(":", ".") / f"{sketch_name}.ino.hex").exists()
     assert (sketch_path / "build" / fqbn.replace(":", ".") / f"{sketch_name}.ino.with_bootloader.bin").exists()
     assert (sketch_path / "build" / fqbn.replace(":", ".") / f"{sketch_name}.ino.with_bootloader.hex").exists()
+
+
+def test_compile_with_custom_build_path(run_command, data_dir):
+    # Init the environment explicitly
+    run_command("core update-index")
+
+    # Download latest AVR
+    run_command("core install arduino:avr")
+
+    sketch_name = "CompileWithBuildPath"
+    sketch_path = Path(data_dir, sketch_name)
+    fqbn = "arduino:avr:uno"
+
+    # Create a test sketch
+    result = run_command(f"sketch new {sketch_path}")
+    assert result.ok
+    assert f"Sketch created in: {sketch_path}" in result.stdout
+
+    # Test the --build-path flag with absolute path
+    build_path = Path(data_dir, "test_dir", "build_dir")
+    result = run_command(f"compile -b {fqbn} {sketch_path} --build-path {build_path}")
+    print(result.stderr)
+    assert result.ok
+
+    # Verifies expected binaries have been built to build_path
+    assert build_path.exists()
+    assert build_path.is_dir()
+    assert (build_path / f"{sketch_name}.ino.eep").exists()
+    assert (build_path / f"{sketch_name}.ino.elf").exists()
+    assert (build_path / f"{sketch_name}.ino.hex").exists()
+    assert (build_path / f"{sketch_name}.ino.with_bootloader.bin").exists()
+    assert (build_path / f"{sketch_name}.ino.with_bootloader.hex").exists()
+
+    # Verifies there are no binaries in temp directory
+    sketch_path_md5 = hashlib.md5(bytes(sketch_path)).hexdigest().upper()
+    build_dir = Path(tempfile.gettempdir(), f"arduino-sketch-{sketch_path_md5}")
+    assert not (build_dir / f"{sketch_name}.ino.eep").exists()
+    assert not (build_dir / f"{sketch_name}.ino.elf").exists()
+    assert not (build_dir / f"{sketch_name}.ino.hex").exists()
+    assert not (build_dir / f"{sketch_name}.ino.with_bootloader.bin").exists()
+    assert not (build_dir / f"{sketch_name}.ino.with_bootloader.hex").exists()

test/test_upload.py

@@ -156,3 +156,42 @@ def run_test(s):
 
         run_test(sketch_path)
         run_test(sketch_main_file)
+
+
+def test_compile_and_upload_combo_with_custom_build_path(run_command, data_dir, detected_boards, wait_for_board):
+    # Init the environment explicitly
+    run_command("core update-index")
+
+    # Install required core(s)
+    run_command("core install arduino:avr@1.8.3")
+    run_command("core install arduino:samd@1.8.6")
+
+    sketch_name = "CompileAndUploadCustomBuildPathIntegrationTest"
+    sketch_path = Path(data_dir, sketch_name)
+    assert run_command(f"sketch new {sketch_path}")
+
+    for board in detected_boards:
+        fqbn_normalized = board.fqbn.replace(":", "-")
+        log_file_name = f"{fqbn_normalized}-compile.log"
+        log_file = Path(data_dir, log_file_name)
+        command_log_flags = f"--log-format json --log-file {log_file} --log-level trace"
+
+        wait_for_board()
+
+        build_path = Path(data_dir, "test_dir", fqbn_normalized, "build_dir")
+        result = run_command(
+            f"compile -b {board.fqbn} "
+            + f"--upload -p {board.address} "
+            + f"--build-path {build_path} "
+            + f"{sketch_path} {command_log_flags}"
+        )
+        print(result.stderr)
+        assert result.ok
+
+        # check from the logs if the bin file were uploaded on the current board
+        log_json = open(log_file, "r")
+        traces = parse_json_traces(log_json.readlines())
+        assert f"Compile {sketch_path} for {board.fqbn} started" in traces
+        assert f"Compile {sketch_name} for {board.fqbn} successful" in traces
+        assert f"Upload {sketch_path} on {board.fqbn} started" in traces
+        assert "Upload successful" in traces