Commit ca1b0ef3 authored by Silvano Cerza's avatar Silvano Cerza Committed by Silvano Cerza

[skip changelog] Fix integration tests on OS X (#1426)

* [skip changelog] Skip boards without FQBN in tests

* [skip changelog] Fix esp32 integration test on darwin
parent 4d5a472f
...@@ -204,7 +204,9 @@ def detected_boards(run_command): ...@@ -204,7 +204,9 @@ def detected_boards(run_command):
detected_boards = [] detected_boards = []
for port in json.loads(result.stdout): for port in json.loads(result.stdout):
for board in port.get("boards", []): for board in port.get("boards", []):
fqbn = board.get("fqbn") fqbn = board.get("FQBN")
if not fqbn:
continue
package, architecture, _id = fqbn.split(":") package, architecture, _id = fqbn.split(":")
detected_boards.append( detected_boards.append(
Board( Board(
......
...@@ -1066,7 +1066,7 @@ def test_compile_with_esp32_bundled_libraries(run_command, data_dir, copy_sketch ...@@ -1066,7 +1066,7 @@ def test_compile_with_esp32_bundled_libraries(run_command, data_dir, copy_sketch
assert run_command("update") assert run_command("update")
# Update index with esp32 core and install it # Update index with esp32 core and install it
url = "https://dl.espressif.com/dl/package_esp32_index.json" url = "https://raw.githubusercontent.com/espressif/arduino-esp32/gh-pages/package_esp32_index.json"
core_version = "1.0.6" core_version = "1.0.6"
assert run_command(f"core update-index --additional-urls={url}") assert run_command(f"core update-index --additional-urls={url}")
assert run_command(f"core install esp32:esp32@{core_version} --additional-urls={url}") assert run_command(f"core install esp32:esp32@{core_version} --additional-urls={url}")
......
...@@ -210,10 +210,10 @@ def test_core_install_without_updateindex(run_command): ...@@ -210,10 +210,10 @@ def test_core_install_without_updateindex(run_command):
) )
def test_core_install_esp32(run_command, data_dir): def test_core_install_esp32(run_command, data_dir):
# update index # update index
url = "https://dl.espressif.com/dl/package_esp32_index.json" url = "https://raw.githubusercontent.com/espressif/arduino-esp32/gh-pages/package_esp32_index.json"
assert run_command(f"core update-index --additional-urls={url}") assert run_command(f"core update-index --additional-urls={url}")
# install 3rd-party core # install 3rd-party core
assert run_command(f"core install esp32:esp32@1.0.4 --additional-urls={url}") assert run_command(f"core install esp32:esp32@2.0.0 --additional-urls={url}")
# create a sketch and compile to double check the core was successfully installed # create a sketch and compile to double check the core was successfully installed
sketch_name = "test_core_install_esp32" sketch_name = "test_core_install_esp32"
sketch_path = os.path.join(data_dir, sketch_name) sketch_path = os.path.join(data_dir, sketch_name)
......
...@@ -29,7 +29,7 @@ def generate_build_dir(sketch_path): ...@@ -29,7 +29,7 @@ def generate_build_dir(sketch_path):
indexes = [ indexes = [
"https://adafruit.github.io/arduino-board-index/package_adafruit_index.json", "https://adafruit.github.io/arduino-board-index/package_adafruit_index.json",
"https://dl.espressif.com/dl/package_esp32_index.json", "https://raw.githubusercontent.com/espressif/arduino-esp32/gh-pages/package_esp32_index.json",
"http://arduino.esp8266.com/stable/package_esp8266com_index.json", "http://arduino.esp8266.com/stable/package_esp8266com_index.json",
"https://github.com/sonydevworld/spresense-arduino-compatible/releases/download/generic/package_spresense_index.json", "https://github.com/sonydevworld/spresense-arduino-compatible/releases/download/generic/package_spresense_index.json",
] ]
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment