Skip to content

Commit b8512df

Browse files
cmagliecmaglie
committed
Changed field name *Folder->*Dir
1 parent 2f39b70 commit b8512df

23 files changed

+439
-439
lines changed

‎arduino-builder/main.go

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -259,34 +259,34 @@ func main() {
259259
if hardwareFolders, err := toSliceOfUnquoted(hardwareFoldersFlag); err != nil {
260260
printCompleteError(err)
261261
} else if len(hardwareFolders) > 0 {
262-
ctx.HardwareFolders = paths.NewPathList(hardwareFolders...)
262+
ctx.HardwareDirs = paths.NewPathList(hardwareFolders...)
263263
}
264-
if len(ctx.HardwareFolders) == 0 {
264+
if len(ctx.HardwareDirs) == 0 {
265265
printErrorMessageAndFlagUsage(errors.New("Parameter '" + FLAG_HARDWARE + "' is mandatory"))
266266
}
267267

268268
// FLAG_TOOLS
269269
if toolsFolders, err := toSliceOfUnquoted(toolsFoldersFlag); err != nil {
270270
printCompleteError(err)
271271
} else if len(toolsFolders) > 0 {
272-
ctx.ToolsFolders = paths.NewPathList(toolsFolders...)
272+
ctx.ToolsDirs = paths.NewPathList(toolsFolders...)
273273
}
274-
if len(ctx.ToolsFolders) == 0 {
274+
if len(ctx.ToolsDirs) == 0 {
275275
printErrorMessageAndFlagUsage(errors.New("Parameter '" + FLAG_TOOLS + "' is mandatory"))
276276
}
277277

278278
// FLAG_LIBRARIES
279279
if librariesFolders, err := toSliceOfUnquoted(librariesFoldersFlag); err != nil {
280280
printCompleteError(err)
281281
} else if len(librariesFolders) > 0 {
282-
ctx.OtherLibrariesFolders = paths.NewPathList(librariesFolders...)
282+
ctx.OtherLibrariesDirs = paths.NewPathList(librariesFolders...)
283283
}
284284

285285
// FLAG_BUILT_IN_LIBRARIES
286286
if librariesBuiltInFolders, err := toSliceOfUnquoted(librariesBuiltInFoldersFlag); err != nil {
287287
printCompleteError(err)
288288
} else if len(librariesBuiltInFolders) > 0 {
289-
ctx.BuiltInLibrariesFolders = paths.NewPathList(librariesBuiltInFolders...)
289+
ctx.BuiltInLibrariesDirs = paths.NewPathList(librariesBuiltInFolders...)
290290
}
291291

292292
// FLAG_PREFS

‎grpc/rpc.go

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,7 @@ type builderServer struct {
5757
}
5858

5959
func (s *builderServer) watch() {
60-
folders := []paths.PathList{s.ctx.HardwareFolders, s.ctx.ToolsFolders, s.ctx.BuiltInLibrariesFolders, s.ctx.OtherLibrariesFolders}
60+
folders := []paths.PathList{s.ctx.HardwareDirs, s.ctx.ToolsDirs, s.ctx.BuiltInLibrariesDirs, s.ctx.OtherLibrariesDirs}
6161

6262
for _, category := range folders {
6363
for _, folder := range category {
@@ -83,10 +83,10 @@ func (s *builderServer) DropCache(ctx context.Context, args *pb.VerboseParams) (
8383
// GetFeature returns the feature at the given point.
8484
func (s *builderServer) Autocomplete(ctx context.Context, args *pb.BuildParams) (*pb.Response, error) {
8585

86-
s.ctx.HardwareFolders = paths.NewPathList(strings.Split(args.HardwareFolders, ",")...)
87-
s.ctx.ToolsFolders = paths.NewPathList(strings.Split(args.ToolsFolders, ",")...)
88-
s.ctx.BuiltInLibrariesFolders = paths.NewPathList(strings.Split(args.BuiltInLibrariesFolders, ",")...)
89-
s.ctx.OtherLibrariesFolders = paths.NewPathList(strings.Split(args.OtherLibrariesFolders, ",")...)
86+
s.ctx.HardwareDirs = paths.NewPathList(strings.Split(args.HardwareFolders, ",")...)
87+
s.ctx.ToolsDirs = paths.NewPathList(strings.Split(args.ToolsFolders, ",")...)
88+
s.ctx.BuiltInLibrariesDirs = paths.NewPathList(strings.Split(args.BuiltInLibrariesFolders, ",")...)
89+
s.ctx.OtherLibrariesDirs = paths.NewPathList(strings.Split(args.OtherLibrariesFolders, ",")...)
9090
s.ctx.SketchLocation = paths.New(args.SketchLocation)
9191
s.ctx.CustomBuildProperties = strings.Split(args.CustomBuildProperties, ",")
9292
s.ctx.ArduinoAPIVersion = args.ArduinoAPIVersion
@@ -127,10 +127,10 @@ func (s *builderServer) Autocomplete(ctx context.Context, args *pb.BuildParams)
127127
// GetFeature returns the feature at the given point.
128128
func (s *builderServer) Build(args *pb.BuildParams, stream pb.Builder_BuildServer) error {
129129

130-
s.ctx.HardwareFolders = paths.NewPathList(strings.Split(args.HardwareFolders, ",")...)
131-
s.ctx.ToolsFolders = paths.NewPathList(strings.Split(args.ToolsFolders, ",")...)
132-
s.ctx.BuiltInLibrariesFolders = paths.NewPathList(strings.Split(args.BuiltInLibrariesFolders, ",")...)
133-
s.ctx.OtherLibrariesFolders = paths.NewPathList(strings.Split(args.OtherLibrariesFolders, ",")...)
130+
s.ctx.HardwareDirs = paths.NewPathList(strings.Split(args.HardwareFolders, ",")...)
131+
s.ctx.ToolsDirs = paths.NewPathList(strings.Split(args.ToolsFolders, ",")...)
132+
s.ctx.BuiltInLibrariesDirs = paths.NewPathList(strings.Split(args.BuiltInLibrariesFolders, ",")...)
133+
s.ctx.OtherLibrariesDirs = paths.NewPathList(strings.Split(args.OtherLibrariesFolders, ",")...)
134134
s.ctx.SketchLocation = paths.New(args.SketchLocation)
135135
s.ctx.CustomBuildProperties = strings.Split(args.CustomBuildProperties, ",")
136136
s.ctx.ArduinoAPIVersion = args.ArduinoAPIVersion

‎hardware_loader.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ type HardwareLoader struct{}
3939

4040
func (s *HardwareLoader) Run(ctx *types.Context) error {
4141
pm := packagemanager.NewPackageManager(nil, nil, nil, nil)
42-
if err := pm.LoadHardwareFromDirectories(ctx.HardwareFolders); err != nil {
42+
if err := pm.LoadHardwareFromDirectories(ctx.HardwareDirs); err != nil {
4343
return i18n.WrapError(err)
4444
}
4545
ctx.PackageManager = pm

‎libraries_loader.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@ func (s *LibrariesLoader) Run(ctx *types.Context) error {
4646
lm := librariesmanager.NewLibraryManager(nil, nil)
4747
ctx.LibrariesManager = lm
4848

49-
builtInLibrariesFolders := ctx.BuiltInLibrariesFolders
49+
builtInLibrariesFolders := ctx.BuiltInLibrariesDirs
5050
if err := builtInLibrariesFolders.ToAbs(); err != nil {
5151
return i18n.WrapError(err)
5252
}
@@ -64,7 +64,7 @@ func (s *LibrariesLoader) Run(ctx *types.Context) error {
6464
}
6565
lm.AddPlatformReleaseLibrariesDir(platform, libraries.PlatformBuiltIn)
6666

67-
librariesFolders := ctx.OtherLibrariesFolders
67+
librariesFolders := ctx.OtherLibrariesDirs
6868
if err := librariesFolders.ToAbs(); err != nil {
6969
return i18n.WrapError(err)
7070
}

‎platform_keys_rewrite_loader.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@ import (
4545
type PlatformKeysRewriteLoader struct{}
4646

4747
func (s *PlatformKeysRewriteLoader) Run(ctx *types.Context) error {
48-
folders := ctx.HardwareFolders
48+
folders := ctx.HardwareDirs
4949

5050
platformKeysRewriteTxtPath, err := findPlatformKeysRewriteTxt(folders)
5151
if err != nil {

‎test/add_build_board_property_if_missing_test.go

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -52,8 +52,8 @@ func TestAddBuildBoardPropertyIfMissing(t *testing.T) {
5252
DownloadCoresAndToolsAndLibraries(t)
5353

5454
ctx := &types.Context{
55-
HardwareFolders: paths.NewPathList(filepath.Join("..", "hardware"), "hardware", "downloaded_hardware", "user_hardware"),
56-
FQBN: parseFQBN(t, "my_avr_platform:avr:mymega"),
55+
HardwareDirs: paths.NewPathList(filepath.Join("..", "hardware"), "hardware", "downloaded_hardware", "user_hardware"),
56+
FQBN: parseFQBN(t, "my_avr_platform:avr:mymega"),
5757
}
5858

5959
commands := []types.Command{
@@ -83,8 +83,8 @@ func TestAddBuildBoardPropertyIfMissingNotMissing(t *testing.T) {
8383
DownloadCoresAndToolsAndLibraries(t)
8484

8585
ctx := &types.Context{
86-
HardwareFolders: paths.NewPathList(filepath.Join("..", "hardware"), "hardware", "downloaded_hardware", "user_hardware"),
87-
FQBN: parseFQBN(t, "my_avr_platform:avr:mymega:cpu=atmega2560"),
86+
HardwareDirs: paths.NewPathList(filepath.Join("..", "hardware"), "hardware", "downloaded_hardware", "user_hardware"),
87+
FQBN: parseFQBN(t, "my_avr_platform:avr:mymega:cpu=atmega2560"),
8888
}
8989

9090
commands := []types.Command{

‎test/builder_test.go

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -46,14 +46,14 @@ import (
4646

4747
func prepareBuilderTestContext(t *testing.T, sketchPath *paths.Path, fqbn string) *types.Context {
4848
return &types.Context{
49-
SketchLocation: sketchPath,
50-
FQBN: parseFQBN(t, fqbn),
51-
HardwareFolders: paths.NewPathList(filepath.Join("..", "hardware"), "hardware", "downloaded_hardware"),
52-
BuiltInToolsFolders: paths.NewPathList("downloaded_tools"),
53-
BuiltInLibrariesFolders: paths.NewPathList("downloaded_libraries"),
54-
OtherLibrariesFolders: paths.NewPathList("libraries"),
55-
ArduinoAPIVersion: "10600",
56-
Verbose: false,
49+
SketchLocation: sketchPath,
50+
FQBN: parseFQBN(t, fqbn),
51+
HardwareDirs: paths.NewPathList(filepath.Join("..", "hardware"), "hardware", "downloaded_hardware"),
52+
BuiltInToolsDirs: paths.NewPathList("downloaded_tools"),
53+
BuiltInLibrariesDirs: paths.NewPathList("downloaded_libraries"),
54+
OtherLibrariesDirs: paths.NewPathList("libraries"),
55+
ArduinoAPIVersion: "10600",
56+
Verbose: false,
5757
}
5858
}
5959

@@ -241,8 +241,8 @@ func TestBuilderBridgeRedBearLab(t *testing.T) {
241241
DownloadCoresAndToolsAndLibraries(t)
242242

243243
ctx := prepareBuilderTestContext(t, paths.New("downloaded_libraries", "Bridge", "examples", "Bridge", "Bridge.ino"), "RedBearLab:avr:blend")
244-
ctx.HardwareFolders = append(ctx.HardwareFolders, paths.New("downloaded_board_manager_stuff"))
245-
ctx.ToolsFolders = append(ctx.ToolsFolders, paths.New("downloaded_board_manager_stuff"))
244+
ctx.HardwareDirs = append(ctx.HardwareDirs, paths.New("downloaded_board_manager_stuff"))
245+
ctx.ToolsDirs = append(ctx.ToolsDirs, paths.New("downloaded_board_manager_stuff"))
246246

247247
buildPath := SetupBuildPath(t, ctx)
248248
defer buildPath.RemoveAll()
@@ -276,8 +276,8 @@ func TestBuilderSketchNoFunctions(t *testing.T) {
276276
DownloadCoresAndToolsAndLibraries(t)
277277

278278
ctx := prepareBuilderTestContext(t, paths.New("sketch_no_functions", "main.ino"), "RedBearLab:avr:blend")
279-
ctx.HardwareFolders = append(ctx.HardwareFolders, paths.New("downloaded_board_manager_stuff"))
280-
ctx.ToolsFolders = append(ctx.ToolsFolders, paths.New("downloaded_board_manager_stuff"))
279+
ctx.HardwareDirs = append(ctx.HardwareDirs, paths.New("downloaded_board_manager_stuff"))
280+
ctx.ToolsDirs = append(ctx.ToolsDirs, paths.New("downloaded_board_manager_stuff"))
281281

282282
buildPath := SetupBuildPath(t, ctx)
283283
defer buildPath.RemoveAll()
@@ -292,8 +292,8 @@ func TestBuilderSketchWithBackup(t *testing.T) {
292292
DownloadCoresAndToolsAndLibraries(t)
293293

294294
ctx := prepareBuilderTestContext(t, paths.New("sketch_with_backup_files", "sketch.ino"), "arduino:avr:uno")
295-
ctx.HardwareFolders = append(ctx.HardwareFolders, paths.New("downloaded_board_manager_stuff"))
296-
ctx.ToolsFolders = append(ctx.ToolsFolders, paths.New("downloaded_board_manager_stuff"))
295+
ctx.HardwareDirs = append(ctx.HardwareDirs, paths.New("downloaded_board_manager_stuff"))
296+
ctx.ToolsDirs = append(ctx.ToolsDirs, paths.New("downloaded_board_manager_stuff"))
297297

298298
buildPath := SetupBuildPath(t, ctx)
299299
defer buildPath.RemoveAll()

‎test/create_build_options_map_test.go

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -40,15 +40,15 @@ import (
4040

4141
func TestCreateBuildOptionsMap(t *testing.T) {
4242
ctx := &types.Context{
43-
HardwareFolders: paths.NewPathList("hardware", "hardware2"),
44-
ToolsFolders: paths.NewPathList("tools"),
45-
OtherLibrariesFolders: paths.NewPathList("libraries"),
46-
SketchLocation: paths.New("sketchLocation"),
47-
FQBN: parseFQBN(t, "my:nice:fqbn"),
48-
ArduinoAPIVersion: "ideVersion",
49-
Verbose: true,
50-
BuildPath: paths.New("buildPath"),
51-
DebugLevel: 5,
43+
HardwareDirs: paths.NewPathList("hardware", "hardware2"),
44+
ToolsDirs: paths.NewPathList("tools"),
45+
OtherLibrariesDirs: paths.NewPathList("libraries"),
46+
SketchLocation: paths.New("sketchLocation"),
47+
FQBN: parseFQBN(t, "my:nice:fqbn"),
48+
ArduinoAPIVersion: "ideVersion",
49+
Verbose: true,
50+
BuildPath: paths.New("buildPath"),
51+
DebugLevel: 5,
5252
}
5353

5454
create := builder.CreateBuildOptionsMap{}

‎test/ctags_runner_test.go

Lines changed: 40 additions & 40 deletions
Original file line numberDiff line numberDiff line change
@@ -46,14 +46,14 @@ func TestCTagsRunner(t *testing.T) {
4646
sketchLocation := Abs(t, paths.New("downloaded_libraries", "Bridge", "examples", "Bridge", "Bridge.ino"))
4747

4848
ctx := &types.Context{
49-
HardwareFolders: paths.NewPathList(filepath.Join("..", "hardware"), "hardware", "downloaded_hardware"),
50-
BuiltInToolsFolders: paths.NewPathList("downloaded_tools"),
51-
BuiltInLibrariesFolders: paths.NewPathList("downloaded_libraries"),
52-
OtherLibrariesFolders: paths.NewPathList("libraries"),
53-
SketchLocation: sketchLocation,
54-
FQBN: parseFQBN(t, "arduino:avr:leonardo"),
55-
ArduinoAPIVersion: "10600",
56-
Verbose: true,
49+
HardwareDirs: paths.NewPathList(filepath.Join("..", "hardware"), "hardware", "downloaded_hardware"),
50+
BuiltInToolsDirs: paths.NewPathList("downloaded_tools"),
51+
BuiltInLibrariesDirs: paths.NewPathList("downloaded_libraries"),
52+
OtherLibrariesDirs: paths.NewPathList("libraries"),
53+
SketchLocation: sketchLocation,
54+
FQBN: parseFQBN(t, "arduino:avr:leonardo"),
55+
ArduinoAPIVersion: "10600",
56+
Verbose: true,
5757
}
5858

5959
buildPath := SetupBuildPath(t, ctx)
@@ -96,14 +96,14 @@ func TestCTagsRunnerSketchWithClass(t *testing.T) {
9696
sketchLocation := Abs(t, paths.New("sketch_with_class", "sketch.ino"))
9797

9898
ctx := &types.Context{
99-
HardwareFolders: paths.NewPathList(filepath.Join("..", "hardware"), "hardware", "downloaded_hardware"),
100-
BuiltInToolsFolders: paths.NewPathList("downloaded_tools"),
101-
BuiltInLibrariesFolders: paths.NewPathList("downloaded_libraries"),
102-
OtherLibrariesFolders: paths.NewPathList("libraries"),
103-
SketchLocation: sketchLocation,
104-
FQBN: parseFQBN(t, "arduino:avr:leonardo"),
105-
ArduinoAPIVersion: "10600",
106-
Verbose: true,
99+
HardwareDirs: paths.NewPathList(filepath.Join("..", "hardware"), "hardware", "downloaded_hardware"),
100+
BuiltInToolsDirs: paths.NewPathList("downloaded_tools"),
101+
BuiltInLibrariesDirs: paths.NewPathList("downloaded_libraries"),
102+
OtherLibrariesDirs: paths.NewPathList("libraries"),
103+
SketchLocation: sketchLocation,
104+
FQBN: parseFQBN(t, "arduino:avr:leonardo"),
105+
ArduinoAPIVersion: "10600",
106+
Verbose: true,
107107
}
108108

109109
buildPath := SetupBuildPath(t, ctx)
@@ -144,14 +144,14 @@ func TestCTagsRunnerSketchWithTypename(t *testing.T) {
144144
sketchLocation := Abs(t, paths.New("sketch_with_typename", "sketch.ino"))
145145

146146
ctx := &types.Context{
147-
HardwareFolders: paths.NewPathList(filepath.Join("..", "hardware"), "hardware", "downloaded_hardware"),
148-
BuiltInToolsFolders: paths.NewPathList("downloaded_tools"),
149-
BuiltInLibrariesFolders: paths.NewPathList("downloaded_libraries"),
150-
OtherLibrariesFolders: paths.NewPathList("libraries"),
151-
SketchLocation: sketchLocation,
152-
FQBN: parseFQBN(t, "arduino:avr:leonardo"),
153-
ArduinoAPIVersion: "10600",
154-
Verbose: true,
147+
HardwareDirs: paths.NewPathList(filepath.Join("..", "hardware"), "hardware", "downloaded_hardware"),
148+
BuiltInToolsDirs: paths.NewPathList("downloaded_tools"),
149+
BuiltInLibrariesDirs: paths.NewPathList("downloaded_libraries"),
150+
OtherLibrariesDirs: paths.NewPathList("libraries"),
151+
SketchLocation: sketchLocation,
152+
FQBN: parseFQBN(t, "arduino:avr:leonardo"),
153+
ArduinoAPIVersion: "10600",
154+
Verbose: true,
155155
}
156156

157157
buildPath := SetupBuildPath(t, ctx)
@@ -191,14 +191,14 @@ func TestCTagsRunnerSketchWithNamespace(t *testing.T) {
191191
sketchLocation := Abs(t, paths.New("sketch_with_namespace", "sketch.ino"))
192192

193193
ctx := &types.Context{
194-
HardwareFolders: paths.NewPathList(filepath.Join("..", "hardware"), "hardware", "downloaded_hardware"),
195-
BuiltInToolsFolders: paths.NewPathList("downloaded_tools"),
196-
BuiltInLibrariesFolders: paths.NewPathList("downloaded_libraries"),
197-
OtherLibrariesFolders: paths.NewPathList("libraries"),
198-
SketchLocation: sketchLocation,
199-
FQBN: parseFQBN(t, "arduino:avr:leonardo"),
200-
ArduinoAPIVersion: "10600",
201-
Verbose: true,
194+
HardwareDirs: paths.NewPathList(filepath.Join("..", "hardware"), "hardware", "downloaded_hardware"),
195+
BuiltInToolsDirs: paths.NewPathList("downloaded_tools"),
196+
BuiltInLibrariesDirs: paths.NewPathList("downloaded_libraries"),
197+
OtherLibrariesDirs: paths.NewPathList("libraries"),
198+
SketchLocation: sketchLocation,
199+
FQBN: parseFQBN(t, "arduino:avr:leonardo"),
200+
ArduinoAPIVersion: "10600",
201+
Verbose: true,
202202
}
203203

204204
buildPath := SetupBuildPath(t, ctx)
@@ -237,14 +237,14 @@ func TestCTagsRunnerSketchWithTemplates(t *testing.T) {
237237
sketchLocation := Abs(t, paths.New("sketch_with_templates_and_shift", "template_and_shift.cpp"))
238238

239239
ctx := &types.Context{
240-
HardwareFolders: paths.NewPathList(filepath.Join("..", "hardware"), "hardware", "downloaded_hardware"),
241-
BuiltInToolsFolders: paths.NewPathList("downloaded_tools"),
242-
BuiltInLibrariesFolders: paths.NewPathList("downloaded_libraries"),
243-
OtherLibrariesFolders: paths.NewPathList("libraries"),
244-
SketchLocation: sketchLocation,
245-
FQBN: parseFQBN(t, "arduino:avr:leonardo"),
246-
ArduinoAPIVersion: "10600",
247-
Verbose: true,
240+
HardwareDirs: paths.NewPathList(filepath.Join("..", "hardware"), "hardware", "downloaded_hardware"),
241+
BuiltInToolsDirs: paths.NewPathList("downloaded_tools"),
242+
BuiltInLibrariesDirs: paths.NewPathList("downloaded_libraries"),
243+
OtherLibrariesDirs: paths.NewPathList("libraries"),
244+
SketchLocation: sketchLocation,
245+
FQBN: parseFQBN(t, "arduino:avr:leonardo"),
246+
ArduinoAPIVersion: "10600",
247+
Verbose: true,
248248
}
249249

250250
buildPath := SetupBuildPath(t, ctx)

‎test/hardware_loader_test.go

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@ import (
4343

4444
func TestLoadHardware(t *testing.T) {
4545
ctx := &types.Context{
46-
HardwareFolders: paths.NewPathList("downloaded_hardware", filepath.Join("..", "hardware"), "hardware"),
46+
HardwareDirs: paths.NewPathList("downloaded_hardware", filepath.Join("..", "hardware"), "hardware"),
4747
}
4848

4949
commands := []types.Command{
@@ -87,7 +87,7 @@ func TestLoadHardware(t *testing.T) {
8787

8888
func TestLoadHardwareMixingUserHardwareFolder(t *testing.T) {
8989
ctx := &types.Context{
90-
HardwareFolders: paths.NewPathList("downloaded_hardware", filepath.Join("..", "hardware"), "hardware", "user_hardware"),
90+
HardwareDirs: paths.NewPathList("downloaded_hardware", filepath.Join("..", "hardware"), "hardware", "user_hardware"),
9191
}
9292

9393
commands := []types.Command{
@@ -157,7 +157,7 @@ func TestLoadHardwareMixingUserHardwareFolder(t *testing.T) {
157157

158158
func TestLoadHardwareWithBoardManagerFolderStructure(t *testing.T) {
159159
ctx := &types.Context{
160-
HardwareFolders: paths.NewPathList("downloaded_board_manager_stuff"),
160+
HardwareDirs: paths.NewPathList("downloaded_board_manager_stuff"),
161161
}
162162

163163
commands := []types.Command{
@@ -205,7 +205,7 @@ func TestLoadHardwareWithBoardManagerFolderStructure(t *testing.T) {
205205

206206
func TestLoadLotsOfHardware(t *testing.T) {
207207
ctx := &types.Context{
208-
HardwareFolders: paths.NewPathList("downloaded_board_manager_stuff", "downloaded_hardware", filepath.Join("..", "hardware"), "hardware", "user_hardware"),
208+
HardwareDirs: paths.NewPathList("downloaded_board_manager_stuff", "downloaded_hardware", filepath.Join("..", "hardware"), "hardware", "user_hardware"),
209209
}
210210

211211
commands := []types.Command{

0 commit comments

Comments
 (0)