Skip to content

Commit ca7730f

Browse files
committed
Fixed compile regression
1 parent 14c8500 commit ca7730f

File tree

2 files changed

+19
-2
lines changed

2 files changed

+19
-2
lines changed

Diff for: legacy/builder/hardware_loader.go

+1-2
Original file line numberDiff line numberDiff line change
@@ -50,11 +50,10 @@ func (s *HardwareLoader) Run(ctx *types.Context) error {
5050

5151
pm := pmb.Build()
5252
pme, _ /* never release... */ := pm.NewExplorer()
53-
54-
ctx.AllTools = pme.GetAllInstalledToolsReleases()
5553
ctx.PackageManager = pme
5654
}
5755

56+
ctx.AllTools = ctx.PackageManager.GetAllInstalledToolsReleases()
5857
ctx.Hardware = ctx.PackageManager.GetPackages()
5958
return nil
6059
}

Diff for: legacy/builder/test/tools_loader_test.go

+18
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,7 @@ import (
2020
"testing"
2121

2222
"github.com/arduino/arduino-cli/arduino/cores"
23+
"github.com/arduino/arduino-cli/arduino/cores/packagemanager"
2324
"github.com/arduino/arduino-cli/legacy/builder"
2425
"github.com/arduino/arduino-cli/legacy/builder/types"
2526
paths "github.com/arduino/go-paths-helper"
@@ -179,3 +180,20 @@ func TestLoadLotsOfTools(t *testing.T) {
179180
require.Equal(t, "arduino:[email protected]", tools[idx].String())
180181
requireEquivalentPaths(t, tools[idx].InstallDir.String(), "downloaded_board_manager_stuff/arduino/tools/openocd/0.9.0-arduino")
181182
}
183+
184+
func TestAllToolsContextIsPopulated(t *testing.T) {
185+
pmb := packagemanager.NewBuilder(nil, nil, nil, nil, "")
186+
pmb.LoadHardwareFromDirectories(paths.NewPathList("downloaded_board_manager_stuff"))
187+
pmb.LoadToolsFromBundleDirectory(paths.New("downloaded_tools", "tools_builtin"))
188+
pm := pmb.Build()
189+
pme, release := pm.NewExplorer()
190+
defer release()
191+
192+
ctx := &types.Context{
193+
PackageManager: pme,
194+
}
195+
196+
hl := &builder.HardwareLoader{}
197+
require.NoError(t, hl.Run(ctx))
198+
require.NotEmpty(t, ctx.AllTools)
199+
}

0 commit comments

Comments
 (0)