forked from arduino/arduino-cli
-
Notifications
You must be signed in to change notification settings - Fork 0
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Revert "Improved lib detection: check for matching name in library.pr…
…operties (arduino#1276)" (arduino#1290) This reverts commit 15e81ed.
- Loading branch information
1 parent
b1764d1
commit 382ebf1
Showing
4 changed files
with
5 additions
and
55 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -998,31 +998,6 @@ def test_recompile_with_different_library(run_command, data_dir): | |
assert f"Using previously compiled file: {obj_path}" not in res.stdout | ||
|
||
|
||
def test_compile_with_conflicting_libraries_include(run_command, data_dir, copy_sketch): | ||
assert run_command("update") | ||
|
||
assert run_command("core install arduino:[email protected]") | ||
|
||
# Install conflicting libraries | ||
git_url = "https://github.com/pstolarz/OneWireNg.git" | ||
one_wire_ng_lib_path = Path(data_dir, "libraries", "onewireng_0_8_1") | ||
assert Repo.clone_from(git_url, one_wire_ng_lib_path, multi_options=["-b 0.8.1"]) | ||
|
||
git_url = "https://github.com/PaulStoffregen/OneWire.git" | ||
one_wire_lib_path = Path(data_dir, "libraries", "onewire_2_3_5") | ||
assert Repo.clone_from(git_url, one_wire_lib_path, multi_options=["-b v2.3.5"]) | ||
|
||
sketch_path = copy_sketch("sketch_with_conflicting_libraries_include") | ||
fqbn = "arduino:avr:uno" | ||
|
||
res = run_command(f"compile -b {fqbn} {sketch_path} --verbose") | ||
assert res.ok | ||
lines = [l.strip() for l in res.stdout.splitlines()] | ||
assert 'Multiple libraries were found for "OneWire.h"' in lines | ||
assert f"Used: {one_wire_lib_path}" in lines | ||
assert f"Not used: {one_wire_ng_lib_path}" in lines | ||
|
||
|
||
def test_compile_with_invalid_build_options_json(run_command, data_dir): | ||
assert run_command("update") | ||
|
||
|
7 changes: 0 additions & 7 deletions
7
...a/sketch_with_conflicting_libraries_include/sketch_with_conflicting_libraries_include.ino
This file was deleted.
Oops, something went wrong.