Skip to content

Commit

Permalink
Don't archive preexisting archives if commandline is too long (#1140)
Browse files Browse the repository at this point in the history
* Don't archive preexisting archives if commandline is too long

Fixes https://github.com/arduino-libraries/ArduinoIoTCloud/runs/1693000682?check_suite_focus=true#step:7:277
Should revert arduino-libraries/ArduinoIoTCloud#222

* Added test

Co-authored-by: Cristian Maglie <c.maglie@arduino.cc>
  • Loading branch information
facchinm and cmaglie committed Jan 15, 2021
1 parent 618a30f commit fc0f60e
Show file tree
Hide file tree
Showing 2 changed files with 26 additions and 0 deletions.
4 changes: 4 additions & 0 deletions legacy/builder/phases/linker.go
Original file line number Diff line number Diff line change
Expand Up @@ -78,6 +78,10 @@ func link(ctx *types.Context, objectFiles paths.PathList, coreDotARelPath *paths
properties := buildProperties.Clone()
archives := paths.NewPathList()
for _, object := range objectFiles {
if object.HasSuffix(".a") {
archives.Add(object)
continue
}
archive := object.Parent().Join("objs.a")
if !archives.Contains(archive) {
archives.Add(archive)
Expand Down
22 changes: 22 additions & 0 deletions test/test_compile.py
Original file line number Diff line number Diff line change
Expand Up @@ -594,3 +594,25 @@ def test_compile_with_custom_libraries(run_command, copy_sketch):
# This compile command has been taken from this issue:
# https://github.com/arduino/arduino-cli/issues/973
assert run_command(f"compile --libraries {first_lib},{second_lib} -b {fqbn} {sketch_path}")


def test_compile_with_archives_and_long_paths(run_command):
# Creates config with additional URL to install necessary core
url = "http://arduino.esp8266.com/stable/package_esp8266com_index.json"
assert run_command(f"config init --dest-dir . --additional-urls {url}")

# Init the environment explicitly
assert run_command("update")

# Install core to compile
assert run_command("core install esp8266:esp8266")

# Install test library
assert run_command("lib install ArduinoIoTCloud")

result = run_command("lib examples ArduinoIoTCloud --format json")
assert result.ok
lib_output = json.loads(result.stdout)
sketch_path = Path(lib_output[0]["library"]["install_dir"], "examples", "ArduinoIoTCloud-Advanced")

assert run_command(f"compile -b esp8266:esp8266:huzzah {sketch_path}")

0 comments on commit fc0f60e

Please sign in to comment.