Skip to content

Include platform bundled libs when -b flag is used #2000

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 2 commits into from
Dec 21, 2022
+16 −6
Merged

Include platform bundled libs when -b flag is used #2000

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
ea9c2e9
Show bundled libs when `-b` flag is used
MatteoPologruto Nov 30, 2022
2695871
Modify test_lib.go to test the changes
MatteoPologruto Dec 5, 2022
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
5 changes: 4 additions & 1 deletion commands/lib/list.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,8 +48,9 @@ func LibraryList(ctx context.Context, req *rpc.LibraryListRequest) (*rpc.Library

nameFilter := strings.ToLower(req.GetName())

allLibs := listLibraries(lm, req.GetUpdatable(), req.GetAll())
var allLibs []*installedLib
if f := req.GetFqbn(); f != "" {
allLibs = listLibraries(lm, req.GetUpdatable(), true)
fqbn, err := cores.ParseFQBN(req.GetFqbn())
if err != nil {
return nil, &arduino.InvalidFQBNError{Cause: err}
Expand Down Expand Up @@ -93,6 +94,8 @@ func LibraryList(ctx context.Context, req *rpc.LibraryListRequest) (*rpc.Library
for _, lib := range filteredRes {
allLibs = append(allLibs, lib)
}
} else {
allLibs = listLibraries(lm, req.GetUpdatable(), req.GetAll())
}

installedLibs := []*rpc.InstalledLibrary{}
Expand Down
17 changes: 12 additions & 5 deletions internal/integrationtest/lib/lib_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -421,7 +421,7 @@ func TestListWithFqbn(t *testing.T) {
require.NoError(t, err)

// Install core
_, _, err = cli.Run("core", "install", "arduino:avr")
_, _, err = cli.Run("core", "install", "arduino:avr@1.8.6")
require.NoError(t, err)

// Look at the plain text output
Expand All @@ -434,8 +434,12 @@ func TestListWithFqbn(t *testing.T) {
stdout, stderr, err := cli.Run("lib", "list", "-b", "arduino:avr:uno")
require.NoError(t, err)
require.Empty(t, stderr)
// Check if output contains bundled libraries
require.Contains(t, string(stdout), "ArduinoJson")
require.Contains(t, string(stdout), "EEPROM")
require.Contains(t, string(stdout), "HID")
lines := strings.Split(strings.TrimSpace(string(stdout)), "\n")
require.Len(t, lines, 2)
require.Len(t, lines, 7)

// Verifies library is compatible
lines[1] = strings.Join(strings.Fields(lines[1]), " ")
Expand All @@ -447,11 +451,14 @@ func TestListWithFqbn(t *testing.T) {
stdout, stderr, err = cli.Run("lib", "list", "-b", "arduino:avr:uno", "--format", "json")
require.NoError(t, err)
require.Empty(t, stderr)
requirejson.Len(t, stdout, 1)
requirejson.Len(t, stdout, 6)

// Verifies library is compatible
requirejson.Query(t, stdout, `.[0] | .library | .name`, `"ArduinoJson"`)
requirejson.Query(t, stdout, `.[0] | .library | .compatible_with | ."arduino:avr:uno"`, `true`)
requirejson.Query(t, stdout, `sort_by(.library | .name) | .[0] | .library | .name`, `"ArduinoJson"`)
requirejson.Query(t, stdout, `sort_by(.library | .name) | .[0] | .library | .compatible_with | ."arduino:avr:uno"`, `true`)

// Verifies bundled libs are shown if -b flag is used
requirejson.Parse(t, stdout).Query(`.[] | .library | select(.container_platform=="arduino:[email protected]")`).MustNotBeEmpty()
}

func TestListProvidesIncludesFallback(t *testing.T) {
Expand Down