-
-
Notifications
You must be signed in to change notification settings - Fork 386
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Improved
{build.*.platform.path} vars enumeration. (#2652)
* Improved build.*.platform.path vars enumeration * Updated docs * Added tests * Added a compatibility note
- Loading branch information
Showing
6 changed files
with
74 additions
and
7 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -18,6 +18,7 @@ package core_test | |
| import ( | ||
| "crypto/md5" | ||
| "encoding/hex" | ||
| "encoding/json" | ||
| "fmt" | ||
| "os" | ||
| "path/filepath" | ||
|
|
@@ -1303,3 +1304,50 @@ func TestCoreHavingIncompatibleDepTools(t *testing.T) { | |
| require.Contains(t, lines, []string{"incompatible_vendor:avr", "n/a", "Incompatible", "Boards"}) | ||
| } | ||
| } | ||
|
|
||
| func TestReferencedCoreBuildAndRuntimeProperties(t *testing.T) { | ||
| env, cli := integrationtest.CreateArduinoCLIWithEnvironment(t) | ||
| defer env.CleanUp() | ||
|
|
||
| _, _, err := cli.Run("core", "install", "arduino:[email protected]") | ||
| require.NoError(t, err) | ||
|
|
||
| testSketchbook, err := paths.New("testdata", "sketchbook_with_extended_platform").Abs() | ||
| require.NoError(t, err) | ||
|
|
||
| // Install custom platform | ||
| err = testSketchbook.Join("hardware").CopyDirTo(cli.SketchbookDir().Join("hardware")) | ||
| require.NoError(t, err) | ||
|
|
||
| // Determine some useful paths | ||
| boardPlatformPath := cli.SketchbookDir().Join("hardware", "test", "avr").String() | ||
| corePlatformPath := cli.DataDir().Join("packages", "arduino", "hardware", "avr", "1.8.6").String() | ||
| corePath := cli.DataDir().Join("packages", "arduino", "hardware", "avr", "1.8.6", "cores", "arduino").String() | ||
|
|
||
| jsonEncode := func(in string) string { | ||
| enc, err := json.Marshal(in) | ||
| require.NoError(t, err) | ||
| return string(enc) | ||
| } | ||
|
|
||
| // Check runtime variables are populated correctly | ||
| { | ||
| outJson, _, err := cli.Run("board", "details", "-b", "test:avr:test", "--show-properties", "--json") | ||
| require.NoError(t, err) | ||
| out := requirejson.Parse(t, outJson).Query(".build_properties") | ||
| out.ArrayMustContain(jsonEncode("build.board.platform.path=" + boardPlatformPath)) | ||
| out.ArrayMustContain(jsonEncode("build.core.platform.path=" + corePlatformPath)) | ||
| out.ArrayMustContain(jsonEncode("build.core.path=" + corePath)) | ||
| out.ArrayMustContain(jsonEncode("runtime.platform.path=" + boardPlatformPath)) | ||
| } | ||
| { | ||
| outJson, _, err := cli.Run("board", "details", "-b", "test:avr:test2", "--show-properties", "--json") | ||
| require.NoError(t, err) | ||
| out := requirejson.Parse(t, outJson).Query(".build_properties") | ||
| out.ArrayMustContain(jsonEncode("build.board.platform.path=" + boardPlatformPath)) | ||
| out.ArrayMustContain(jsonEncode("build.core.platform.path=" + corePlatformPath)) | ||
| out.ArrayMustContain(jsonEncode("build.core.path=" + corePath)) | ||
| // https://github.com/arduino/arduino-cli/issues/2616 | ||
| out.ArrayMustContain(jsonEncode("runtime.platform.path=" + corePlatformPath)) | ||
| } | ||
| } | ||
7 changes: 7 additions & 0 deletions
7
...egrationtest/core/testdata/sketchbook_with_extended_platform/hardware/test/avr/boards.txt
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,7 @@ | ||
|
|
||
| test.name=Test Board | ||
| test.build.core=arduino:arduino | ||
|
|
||
| test2.name=Test 2 Board | ||
| test2.build.core=arduino:arduino | ||
| test2.runtime.use_core_platform_path_for_runtime_platform_path=true |