8000 Revert "Improved lib detection: check for matching name in library.properties (#1276)" by silvanocerza · Pull Request #1290 · arduino/arduino-cli · GitHub
[go: up one dir, main page]
Skip to content

Revert "Improved lib detection: check for matching name in library.properties (#1276)" #1290

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
May 14, 2021
Merged

Revert "Improved lib detection: check for matching name in library.properties (#1276)" #1290

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Revert "Improved lib detection: check for matching name in library.pr… 
…operties (#1276)"

This reverts commit 15e81ed.
  • Loading branch information
@silvanocerza
silvanocerza committed May 14, 2021
commit 5a1e3bc7140ce0e97015030d5cff321dfa7a18b3
13 changes: 5 additions & 8 deletions arduino/libraries/librariesresolver/cpp.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -121,7 +121,6 @@ func computePriority(lib *libraries.Library, header, arch string) int {
header = strings.TrimSuffix(header, filepath.Ext(header))
header = simplify(header)
name := simplify(lib.Name)
realName := simplify(lib.RealName)

priority := 0

Expand All @@ -138,17 +137,15 @@ func computePriority(lib *libraries.Library, header, arch string) int {
priority += 0
}

if realName == header && name == header {
priority += 600
} else if realName == header || name == header {
if name == header {
priority += 500
} else if realName == header+"-master" || name == header+"-master" {
} else if name == header+"-master" {
priority += 400
} else if strings.HasPrefix(realName, header) || strings.HasPrefix(name, header) {
} else if strings.HasPrefix(name, header) {
priority += 300
} else if strings.HasSuffix(realName, header) || strings.HasSuffix(name, header) {
} else if strings.HasSuffix(name, header) {
priority += 200
} else if strings.Contains(realName, header) || strings.Contains(name, header) {
} else if strings.Contains(name, header) {
priority += 100
}

Expand Down
15 changes: 0 additions & 15 deletions arduino/libraries/librariesresolver/cpp_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -143,18 +143,3 @@ func TestCppHeaderResolver(t *testing.T) {
require.Equal(t, "Calculus Unified Lib", resolve("calculus_lib.h", l6, l7))
require.Equal(t, "Calculus Unified Lib", resolve("calculus_lib.h", l7, l6))
}

func TestCppHeaderResolverWithLibrariesInStrangeDirectoryNames(t *testing.T) {
resolver := NewCppResolver()
librarylist := libraries.List{}
librarylist.Add(&libraries.Library{Name: "onewire_2_3_4", RealName: "OneWire", Architectures: []string{"*"}})
librarylist.Add(&libraries.Library{Name: "onewireng_2_3_4", RealName: "OneWireNg", Architectures: []string{"avr"}})
resolver.headers["OneWire.h"] = librarylist
require.Equal(t, "onewire_2_3_4", resolver.ResolveFor("OneWire.h", "avr").Name)

librarylist2 := libraries.List{}
librarylist2.Add(&libraries.Library{Name: "OneWire", RealName: "OneWire", Architectures: []string{"*"}})
librarylist2.Add(&libraries.Library{Name: "onewire_2_3_4", RealName: "OneWire", Architectures: []string{"avr"}})
resolver.headers["OneWire.h"] = librarylist2
require.Equal(t, "OneWire", resolver.ResolveFor("OneWire.h", "avr").Name)
}
25 changes: 0 additions & 25 deletions test/test_compile.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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:avr@1.8.3")

# 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"])
97CC
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")

Expand Down
7 changes: 0 additions & 7 deletions ...a/sketch_with_conflicting_libraries_include/sketch_with_conflicting_libraries_include.ino
View file
Open in desktop

This file was deleted.

0