Skip to content

Commit 39383d4

Browse files
committed
Fixed unit test
1 parent 3ce0ffd commit 39383d4

File tree

2 files changed

+7
-3
lines changed

2 files changed

+7
-3
lines changed

Diff for: commands/service_debug_test.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ func TestGetCommandLine(t *testing.T) {
3737
sketchPath := paths.New("testdata", "debug", sketch)
3838
require.NoError(t, sketchPath.ToAbs())
3939

40-
pmb := packagemanager.NewBuilder(nil, nil, nil, nil, nil, "test", downloader.GetDefaultConfig())
40+
pmb := packagemanager.NewBuilder(nil, nil, customHardware, nil, nil, "test", downloader.GetDefaultConfig())
4141
pmb.LoadHardwareFromDirectory(customHardware)
4242
pmb.LoadHardwareFromDirectory(dataDir)
4343

Diff for: internal/arduino/cores/packagemanager/loader.go

+6-2
Original file line numberDiff line numberDiff line change
@@ -65,8 +65,12 @@ func (pm *Builder) LoadHardwareFromDirectory(path *paths.Path) []error {
6565
// If the hardware directory is inside, or equals, the sketchbook/hardware directory
6666
// it's not a managed package, otherwise it is.
6767
managed := true
68-
if userInstalled, err := path.IsInsideDir(pm.userPackagesDir.Parent()); err == nil && userInstalled {
69-
managed = false
68+
if pm.userPackagesDir != nil {
69+
if path.EquivalentTo(pm.userPackagesDir) {
70+
managed = false
71+
} else if userInstalled, err := path.IsInsideDir(pm.userPackagesDir); err == nil && userInstalled {
72+
managed = false
73+
}
7074
}
7175

7276
// Scan subdirs

0 commit comments

Comments
 (0)