Skip to content

Commit e39c7f2

Browse files
silvanocerzasilvanocerza
committed
[skip changelog] Fix platform loading legacy tests
1 parent cc15dde commit e39c7f2

18 files changed

+101
-92
lines changed

‎docs/platform-specification.md‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -379,9 +379,9 @@ Arduino IDE.
379379

380380
## platform.local.txt
381381

382-
Introduced in Arduino IDE 1.5.7. This file can be used to override properties defined in platform.txt or define new
383-
properties without modifying platform.txt (e.g. when platform.txt is tracked by a version control system). It should be
384-
placed in the same folder as the platform.txt it supplements.
382+
Introduced in Arduino IDE 1.5.7. This file can be used to override properties defined in `platform.txt` or define new
383+
properties without modifying `platform.txt` (e.g. when `platform.txt` is tracked by a version control system). It must
384+
be placed in the same folder as the `platform.txt` it supplements.
385385

386386
## boards.txt
387387

@@ -978,8 +978,8 @@ actual Arduino CLI code, the "board platform" is called `targetPlatform`, the "c
978978

979979
## boards.local.txt
980980

981-
Introduced in Arduino IDE 1.6.6. This file can be used to override properties defined in boards.txt or define new
982-
properties without modifying boards.txt.
981+
Introduced in Arduino IDE 1.6.6. This file can be used to override properties defined in `boards.txt` or define new
982+
properties without modifying `boards.txt`. It must be placed in the same folder as the `boards.txt` it supplements.
983983

984984
## Platform bundled libraries
985985

‎legacy/builder/test/add_build_board_property_if_missing_test.go‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ func TestAddBuildBoardPropertyIfMissing(t *testing.T) {
3636
DownloadCoresAndToolsAndLibraries(t)
3737

3838
ctx := &types.Context{
39-
HardwareDirs: paths.NewPathList(filepath.Join("..", "hardware"), "hardware", "downloaded_hardware", "user_hardware"),
39+
HardwareDirs: paths.NewPathList(filepath.Join("..", "hardware"), "downloaded_hardware", "user_hardware"),
4040
FQBN: parseFQBN(t, "my_avr_platform:avr:mymega"),
4141
Verbose: true,
4242
}
@@ -68,7 +68,7 @@ func TestAddBuildBoardPropertyIfMissingNotMissing(t *testing.T) {
6868
DownloadCoresAndToolsAndLibraries(t)
6969

7070
ctx := &types.Context{
71-
HardwareDirs: paths.NewPathList(filepath.Join("..", "hardware"), "hardware", "downloaded_hardware", "user_hardware"),
71+
HardwareDirs: paths.NewPathList(filepath.Join("..", "hardware"), "downloaded_hardware", "user_hardware"),
7272
FQBN: parseFQBN(t, "my_avr_platform:avr:mymega:cpu=atmega1280"),
7373
Verbose: true,
7474
}

‎legacy/builder/test/builder_test.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ func prepareBuilderTestContext(t *testing.T, sketchPath *paths.Path, fqbn string
3434
return &types.Context{
3535
SketchLocation: sketchPath,
3636
FQBN: parseFQBN(t, fqbn),
37-
HardwareDirs: paths.NewPathList(filepath.Join("..", "hardware"), "hardware", "downloaded_hardware"),
37+
HardwareDirs: paths.NewPathList(filepath.Join("..", "hardware"), "downloaded_hardware"),
3838
BuiltInToolsDirs: paths.NewPathList("downloaded_tools"),
3939
BuiltInLibrariesDirs: paths.NewPathList("downloaded_libraries"),
4040
OtherLibrariesDirs: paths.NewPathList("libraries"),

‎legacy/builder/test/ctags_runner_test.go‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ func TestCTagsRunner(t *testing.T) {
3232
sketchLocation := Abs(t, paths.New("downloaded_libraries", "Bridge", "examples", "Bridge", "Bridge.ino"))
3333

3434
ctx := &types.Context{
35-
HardwareDirs: paths.NewPathList(filepath.Join("..", "hardware"), "hardware", "downloaded_hardware"),
35+
HardwareDirs: paths.NewPathList(filepath.Join("..", "hardware"), "downloaded_hardware"),
3636
BuiltInToolsDirs: paths.NewPathList("downloaded_tools"),
3737
BuiltInLibrariesDirs: paths.NewPathList("downloaded_libraries"),
3838
OtherLibrariesDirs: paths.NewPathList("libraries"),
@@ -82,7 +82,7 @@ func TestCTagsRunnerSketchWithClass(t *testing.T) {
8282
sketchLocation := Abs(t, paths.New("sketch_with_class", "sketch_with_class.ino"))
8383

8484
ctx := &types.Context{
85-
HardwareDirs: paths.NewPathList(filepath.Join("..", "hardware"), "hardware", "downloaded_hardware"),
85+
HardwareDirs: paths.NewPathList(filepath.Join("..", "hardware"), "downloaded_hardware"),
8686
BuiltInToolsDirs: paths.NewPathList("downloaded_tools"),
8787
BuiltInLibrariesDirs: paths.NewPathList("downloaded_libraries"),
8888
OtherLibrariesDirs: paths.NewPathList("libraries"),
@@ -130,7 +130,7 @@ func TestCTagsRunnerSketchWithTypename(t *testing.T) {
130130
sketchLocation := Abs(t, paths.New("sketch_with_typename", "sketch_with_typename.ino"))
131131

132132
ctx := &types.Context{
133-
HardwareDirs: paths.NewPathList(filepath.Join("..", "hardware"), "hardware", "downloaded_hardware"),
133+
HardwareDirs: paths.NewPathList(filepath.Join("..", "hardware"), "downloaded_hardware"),
134134
BuiltInToolsDirs: paths.NewPathList("downloaded_tools"),
135135
BuiltInLibrariesDirs: paths.NewPathList("downloaded_libraries"),
136136
OtherLibrariesDirs: paths.NewPathList("libraries"),
@@ -177,7 +177,7 @@ func TestCTagsRunnerSketchWithNamespace(t *testing.T) {
177177
sketchLocation := Abs(t, paths.New("sketch_with_namespace", "sketch_with_namespace.ino"))
178178

179179
ctx := &types.Context{
180-
HardwareDirs: paths.NewPathList(filepath.Join("..", "hardware"), "hardware", "downloaded_hardware"),
180+
HardwareDirs: paths.NewPathList(filepath.Join("..", "hardware"), "downloaded_hardware"),
181181
BuiltInToolsDirs: paths.NewPathList("downloaded_tools"),
182182
BuiltInLibrariesDirs: paths.NewPathList("downloaded_libraries"),
183183
OtherLibrariesDirs: paths.NewPathList("libraries"),
@@ -223,7 +223,7 @@ func TestCTagsRunnerSketchWithTemplates(t *testing.T) {
223223
sketchLocation := Abs(t, paths.New("sketch_with_templates_and_shift", "sketch_with_templates_and_shift.cpp"))
224224

225225
ctx := &types.Context{
226-
HardwareDirs: paths.NewPathList(filepath.Join("..", "hardware"), "hardware", "downloaded_hardware"),
226+
HardwareDirs: paths.NewPathList(filepath.Join("..", "hardware"), "downloaded_hardware"),
227227
BuiltInToolsDirs: paths.NewPathList("downloaded_tools"),
228228
BuiltInLibrariesDirs: paths.NewPathList("downloaded_libraries"),
229229
OtherLibrariesDirs: paths.NewPathList("libraries"),

‎legacy/builder/test/hardware/arduino/avr/boards.txt‎

Lines changed: 0 additions & 18 deletions
This file was deleted.

‎legacy/builder/test/hardware/platform.txt‎

Lines changed: 0 additions & 1 deletion
This file was deleted.

‎legacy/builder/test/hardware_loader_test.go‎

Lines changed: 11 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -28,8 +28,11 @@ import (
2828

2929
func TestLoadHardware(t *testing.T) {
3030
DownloadCoresAndToolsAndLibraries(t)
31+
downloadedHardwareAvr := paths.New("downloaded_hardware", "arduino", "avr")
32+
paths.New("hardware", "arduino", "avr", "boards.local.txt").CopyTo(downloadedHardwareAvr.Join("boards.local.txt"))
33+
paths.New("hardware", "arduino", "avr", "platform.local.txt").CopyTo(downloadedHardwareAvr.Join("platform.local.txt"))
3134
ctx := &types.Context{
32-
HardwareDirs: paths.NewPathList("downloaded_hardware", filepath.Join("..", "hardware"), "hardware"),
35+
HardwareDirs: paths.NewPathList("downloaded_hardware", filepath.Join("..", "hardware")),
3336
}
3437

3538
commands := []types.Command{
@@ -42,7 +45,7 @@ func TestLoadHardware(t *testing.T) {
4245
}
4346

4447
packages := ctx.Hardware
45-
require.Equal(t, 2, len(packages))
48+
require.Equal(t, 1, len(packages))
4649
require.NotNil(t, packages["arduino"])
4750
require.Equal(t, 2, len(packages["arduino"].Platforms))
4851

@@ -73,7 +76,7 @@ func TestLoadHardware(t *testing.T) {
7376

7477
func TestLoadHardwareMixingUserHardwareFolder(t *testing.T) {
7578
ctx := &types.Context{
76-
HardwareDirs: paths.NewPathList("downloaded_hardware", filepath.Join("..", "hardware"), "hardware", "user_hardware"),
79+
HardwareDirs: paths.NewPathList("downloaded_hardware", filepath.Join("..", "hardware"), "user_hardware"),
7780
}
7881

7982
commands := []types.Command{
@@ -92,9 +95,9 @@ func TestLoadHardwareMixingUserHardwareFolder(t *testing.T) {
9295

9396
if runtime.GOOS == "windows" {
9497
//a package is a symlink, and windows does not support them
95-
require.Equal(t, 3, len(packages))
98+
require.Equal(t, 2, len(packages))
9699
} else {
97-
require.Equal(t, 4, len(packages))
100+
require.Equal(t, 3, len(packages))
98101
}
99102

100103
require.NotNil(t, packages["arduino"])
@@ -191,7 +194,7 @@ func TestLoadHardwareWithBoardManagerFolderStructure(t *testing.T) {
191194

192195
func TestLoadLotsOfHardware(t *testing.T) {
193196
ctx := &types.Context{
194-
HardwareDirs: paths.NewPathList("downloaded_board_manager_stuff", "downloaded_hardware", filepath.Join("..", "hardware"), "hardware", "user_hardware"),
197+
HardwareDirs: paths.NewPathList("downloaded_board_manager_stuff", "downloaded_hardware", filepath.Join("..", "hardware"), "user_hardware"),
195198
}
196199

197200
commands := []types.Command{
@@ -207,9 +210,9 @@ func TestLoadLotsOfHardware(t *testing.T) {
207210

208211
if runtime.GOOS == "windows" {
209212
//a package is a symlink, and windows does not support them
210-
require.Equal(t, 5, len(packages))
213+
require.Equal(t, 4, len(packages))
211214
} else {
212-
require.Equal(t, 6, len(packages))
215+
require.Equal(t, 5, len(packages))
213216
}
214217

215218
require.NotNil(t, packages["arduino"])

‎legacy/builder/test/includes_to_include_folders_test.go‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ func TestIncludesToIncludeFolders(t *testing.T) {
3030
DownloadCoresAndToolsAndLibraries(t)
3131

3232
ctx := &types.Context{
33-
HardwareDirs: paths.NewPathList(filepath.Join("..", "hardware"), "hardware", "downloaded_hardware"),
33+
HardwareDirs: paths.NewPathList(filepath.Join("..", "hardware"), "downloaded_hardware"),
3434
BuiltInToolsDirs: paths.NewPathList("downloaded_tools"),
3535
BuiltInLibrariesDirs: paths.NewPathList("downloaded_libraries"),
3636
OtherLibrariesDirs: paths.NewPathList("libraries"),
@@ -66,7 +66,7 @@ func TestIncludesToIncludeFoldersSketchWithIfDef(t *testing.T) {
6666
DownloadCoresAndToolsAndLibraries(t)
6767

6868
ctx := &types.Context{
69-
HardwareDirs: paths.NewPathList(filepath.Join("..", "hardware"), "hardware", "downloaded_hardware"),
69+
HardwareDirs: paths.NewPathList(filepath.Join("..", "hardware"), "downloaded_hardware"),
7070
BuiltInToolsDirs: paths.NewPathList("downloaded_tools"),
7171
BuiltInLibrariesDirs: paths.NewPathList("downloaded_libraries"),
7272
OtherLibrariesDirs: paths.NewPathList("libraries"),
@@ -101,7 +101,7 @@ func TestIncludesToIncludeFoldersIRremoteLibrary(t *testing.T) {
101101
DownloadCoresAndToolsAndLibraries(t)
102102

103103
ctx := &types.Context{
104-
HardwareDirs: paths.NewPathList(filepath.Join("..", "hardware"), "hardware", "downloaded_hardware"),
104+
HardwareDirs: paths.NewPathList(filepath.Join("..", "hardware"), "downloaded_hardware"),
105105
BuiltInToolsDirs: paths.NewPathList("downloaded_tools"),
106106
BuiltInLibrariesDirs: paths.NewPathList("downloaded_libraries"),
107107
OtherLibrariesDirs: paths.NewPathList("libraries"),
@@ -139,7 +139,7 @@ func TestIncludesToIncludeFoldersANewLibrary(t *testing.T) {
139139
DownloadCoresAndToolsAndLibraries(t)
140140

141141
ctx := &types.Context{
142-
HardwareDirs: paths.NewPathList(filepath.Join("..", "hardware"), "hardware", "downloaded_hardware"),
142+
HardwareDirs: paths.NewPathList(filepath.Join("..", "hardware"), "downloaded_hardware"),
143143
BuiltInToolsDirs: paths.NewPathList("downloaded_tools"),
144144
BuiltInLibrariesDirs: paths.NewPathList("downloaded_libraries"),
145145
OtherLibrariesDirs: paths.NewPathList("libraries"),
@@ -174,7 +174,7 @@ func TestIncludesToIncludeFoldersDuplicateLibs(t *testing.T) {
174174
DownloadCoresAndToolsAndLibraries(t)
175175

176176
ctx := &types.Context{
177-
HardwareDirs: paths.NewPathList(filepath.Join("..", "hardware"), "hardware", "downloaded_hardware", "user_hardware"),
177+
HardwareDirs: paths.NewPathList(filepath.Join("..", "hardware"), "downloaded_hardware", "user_hardware"),
178178
BuiltInToolsDirs: paths.NewPathList("downloaded_tools"),
179179
BuiltInLibrariesDirs: paths.NewPathList("downloaded_libraries"),
180180
SketchLocation: paths.New("user_hardware", "my_avr_platform", "avr", "libraries", "SPI", "examples", "BarometricPressureSensor", "BarometricPressureSensor.ino"),
@@ -211,7 +211,7 @@ func TestIncludesToIncludeFoldersDuplicateLibsWithConflictingLibsOutsideOfPlatfo
211211
DownloadCoresAndToolsAndLibraries(t)
212212

213213
ctx := &types.Context{
214-
HardwareDirs: paths.NewPathList(filepath.Join("..", "hardware"), "hardware", "downloaded_hardware", "user_hardware"),
214+
HardwareDirs: paths.NewPathList(filepath.Join("..", "hardware"), "downloaded_hardware", "user_hardware"),
215215
BuiltInToolsDirs: paths.NewPathList("downloaded_tools"),
216216
BuiltInLibrariesDirs: paths.NewPathList("downloaded_libraries"),
217217
OtherLibrariesDirs: paths.NewPathList("libraries"),
@@ -249,7 +249,7 @@ func TestIncludesToIncludeFoldersDuplicateLibs2(t *testing.T) {
249249
DownloadCoresAndToolsAndLibraries(t)
250250

251251
ctx := &types.Context{
252-
HardwareDirs: paths.NewPathList(filepath.Join("..", "hardware"), "hardware", "downloaded_hardware", "downloaded_board_manager_stuff"),
252+
HardwareDirs: paths.NewPathList(filepath.Join("..", "hardware"), "downloaded_hardware", "downloaded_board_manager_stuff"),
253253
BuiltInToolsDirs: paths.NewPathList("downloaded_tools"),
254254
BuiltInLibrariesDirs: paths.NewPathList("downloaded_libraries"),
255255
OtherLibrariesDirs: paths.NewPathList("libraries"),
@@ -287,7 +287,7 @@ func TestIncludesToIncludeFoldersSubfolders(t *testing.T) {
287287
DownloadCoresAndToolsAndLibraries(t)
288288

289289
ctx := &types.Context{
290-
HardwareDirs: paths.NewPathList(filepath.Join("..", "hardware"), "hardware", "downloaded_hardware"),
290+
HardwareDirs: paths.NewPathList(filepath.Join("..", "hardware"), "downloaded_hardware"),
291291
BuiltInToolsDirs: paths.NewPathList("downloaded_tools"),
292292
BuiltInLibrariesDirs: paths.NewPathList("downloaded_libraries"),
293293
OtherLibrariesDirs: paths.NewPathList("libraries"),

‎legacy/builder/test/libraries_loader_test.go‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ func TestLoadLibrariesAVR(t *testing.T) {
4141
DownloadCoresAndToolsAndLibraries(t)
4242

4343
ctx := &types.Context{
44-
HardwareDirs: paths.NewPathList(filepath.Join("..", "hardware"), "hardware", "downloaded_hardware"),
44+
HardwareDirs: paths.NewPathList(filepath.Join("..", "hardware"), "downloaded_hardware"),
4545
BuiltInLibrariesDirs: paths.NewPathList("downloaded_libraries"),
4646
OtherLibrariesDirs: paths.NewPathList("libraries"),
4747
FQBN: parseFQBN(t, "arduino:avr:leonardo"),
@@ -151,7 +151,7 @@ func TestLoadLibrariesSAM(t *testing.T) {
151151
DownloadCoresAndToolsAndLibraries(t)
152152

153153
ctx := &types.Context{
154-
HardwareDirs: paths.NewPathList(filepath.Join("..", "hardware"), "hardware", "downloaded_hardware"),
154+
HardwareDirs: paths.NewPathList(filepath.Join("..", "hardware"), "downloaded_hardware"),
155155
BuiltInLibrariesDirs: paths.NewPathList("downloaded_libraries"),
156156
OtherLibrariesDirs: paths.NewPathList("libraries"),
157157
FQBN: parseFQBN(t, "arduino:sam:arduino_due_x_dbg"),
@@ -234,7 +234,7 @@ func TestLoadLibrariesAVRNoDuplicateLibrariesFolders(t *testing.T) {
234234
DownloadCoresAndToolsAndLibraries(t)
235235

236236
ctx := &types.Context{
237-
HardwareDirs: paths.NewPathList(filepath.Join("..", "hardware"), "hardware", "downloaded_hardware"),
237+
HardwareDirs: paths.NewPathList(filepath.Join("..", "hardware"), "downloaded_hardware"),
238238
BuiltInLibrariesDirs: paths.NewPathList("downloaded_libraries"),
239239
OtherLibrariesDirs: paths.NewPathList("libraries", filepath.Join("downloaded_hardware", "arduino", "avr", "libraries")),
240240
FQBN: parseFQBN(t, "arduino:avr:leonardo"),
@@ -263,7 +263,7 @@ func TestLoadLibrariesMyAVRPlatform(t *testing.T) {
263263
DownloadCoresAndToolsAndLibraries(t)
264264

265265
ctx := &types.Context{
266-
HardwareDirs: paths.NewPathList(filepath.Join("..", "hardware"), "hardware", "user_hardware", "downloaded_hardware"),
266+
HardwareDirs: paths.NewPathList(filepath.Join("..", "hardware"), "user_hardware", "downloaded_hardware"),
267267
BuiltInLibrariesDirs: paths.NewPathList("downloaded_libraries"),
268268
OtherLibrariesDirs: paths.NewPathList("libraries", filepath.Join("downloaded_hardware", "arduino", "avr", "libraries")),
269269
FQBN: parseFQBN(t, "my_avr_platform:avr:custom_yun"),

‎legacy/builder/test/load_vid_pid_specific_properties_test.go‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ func TestLoadVIDPIDSpecificPropertiesWhenNoVIDPIDAreProvided(t *testing.T) {
2929
DownloadCoresAndToolsAndLibraries(t)
3030

3131
ctx := &types.Context{
32-
HardwareDirs: paths.NewPathList(filepath.Join("..", "hardware"), "hardware", "downloaded_hardware"),
32+
HardwareDirs: paths.NewPathList(filepath.Join("..", "hardware"), "downloaded_hardware"),
3333
BuiltInToolsDirs: paths.NewPathList("downloaded_tools", "./tools_builtin"),
3434
SketchLocation: paths.New("sketch1", "sketch1.ino"),
3535
FQBN: parseFQBN(t, "arduino:avr:micro"),
@@ -59,7 +59,7 @@ func TestLoadVIDPIDSpecificProperties(t *testing.T) {
5959
DownloadCoresAndToolsAndLibraries(t)
6060

6161
ctx := &types.Context{
62-
HardwareDirs: paths.NewPathList(filepath.Join("..", "hardware"), "hardware", "downloaded_hardware"),
62+
HardwareDirs: paths.NewPathList(filepath.Join("..", "hardware"), "downloaded_hardware"),
6363
BuiltInToolsDirs: paths.NewPathList("downloaded_tools", "./tools_builtin"),
6464
SketchLocation: paths.New("sketch1", "sketch1.ino"),
6565
FQBN: parseFQBN(t, "arduino:avr:micro"),

0 commit comments

Comments
 (0)