summaryrefslogtreecommitdiff
path: root/dev-embedded/arduino-builder/files
diff options
context:
space:
mode:
authorV3n3RiX <venerix@koprulu.sector>2022-08-29 22:47:16 +0100
committerV3n3RiX <venerix@koprulu.sector>2022-08-29 22:47:16 +0100
commit8993ea73a9714d22178ba6ada8c04be83cd71ec7 (patch)
treeeec3cc3c457b3e760f6ca631fd51e0c004705e88 /dev-embedded/arduino-builder/files
parentae838334efa4ecfd172331e8f5ae4eea8c5dd876 (diff)
gentoo auto-resync : 29:08:2022 - 22:47:16
Diffstat (limited to 'dev-embedded/arduino-builder/files')
-rw-r--r--dev-embedded/arduino-builder/files/arduino-builder-1.3.25-platform-paths.patch19
-rw-r--r--dev-embedded/arduino-builder/files/arduino-builder-1.3.25-skip-tests.patch109
-rw-r--r--dev-embedded/arduino-builder/files/arduino-builder-1.4.1-platform-paths.patch19
-rw-r--r--dev-embedded/arduino-builder/files/arduino-builder-1.4.1-skip-tests.patch129
4 files changed, 0 insertions, 276 deletions
diff --git a/dev-embedded/arduino-builder/files/arduino-builder-1.3.25-platform-paths.patch b/dev-embedded/arduino-builder/files/arduino-builder-1.3.25-platform-paths.patch
deleted file mode 100644
index 854dc886af01..000000000000
--- a/dev-embedded/arduino-builder/files/arduino-builder-1.3.25-platform-paths.patch
+++ /dev/null
@@ -1,19 +0,0 @@
-diff --git a/src/arduino.cc/builder/hardware/platform.txt b/src/arduino.cc/builder/hardware/platform.txt
-index ca8df1f..17ce03f 100644
---- a/src/arduino.cc/arduino-builder/src/arduino.cc/builder/hardware/platform.txt
-+++ b/src/arduino.cc/arduino-builder/src/arduino.cc/builder/hardware/platform.txt
-@@ -1,11 +1,11 @@
- # ctags
- # ------------------------------
--tools.ctags.path={runtime.tools.ctags.path}
--tools.ctags.cmd.path={path}/ctags
-+tools.ctags.path=/usr/bin
-+tools.ctags.cmd.path={path}/arduino-ctags
- tools.ctags.pattern="{cmd.path}" -u --language-force=c++ -f - --c++-kinds=svpf --fields=KSTtzns --line-directives "{source_file}"
-
- # additional entries
--tools.avrdude.path={runtime.tools.avrdude.path}
-+tools.avrdude.path=/usr/bin
-
- preproc.macros.flags=-w -x c++ -E -CC
- #preproc.macros.compatibility_flags={build.mbed_api_include} {build.nRF51822_api_include} {build.ble_api_include} {compiler.libsam.c.flags} {compiler.arm.cmsis.path} {build.variant_system_include}
diff --git a/dev-embedded/arduino-builder/files/arduino-builder-1.3.25-skip-tests.patch b/dev-embedded/arduino-builder/files/arduino-builder-1.3.25-skip-tests.patch
deleted file mode 100644
index 4ed170061c16..000000000000
--- a/dev-embedded/arduino-builder/files/arduino-builder-1.3.25-skip-tests.patch
+++ /dev/null
@@ -1,109 +0,0 @@
-Skip tests that can't run on Gentoo because of the network sandbox
-diff --git a/src/arduino.cc/builder/test/hardware_loader_test.go b/src/arduino.cc/builder/test/hardware_loader_test.go
-index c9ea1d5..e7c68d2 100644
---- a/src/arduino.cc/arduino-builder/src/arduino.cc/builder/test/hardware_loader_test.go
-+++ b/src/arduino.cc/arduino-builder/src/arduino.cc/builder/test/hardware_loader_test.go
-@@ -41,6 +41,7 @@ import (
- )
-
- func TestLoadHardware(t *testing.T) {
-+ t.Skip("Can't run on Gentoo")
- ctx := &types.Context{
- HardwareFolders: []string{"downloaded_hardware", filepath.Join("..", "hardware"), "hardware"},
- }
-@@ -85,6 +86,7 @@ func TestLoadHardware(t *testing.T) {
- }
-
- func TestLoadHardwareMixingUserHardwareFolder(t *testing.T) {
-+ t.Skip("Can't run on Gentoo")
- ctx := &types.Context{
- HardwareFolders: []string{"downloaded_hardware", filepath.Join("..", "hardware"), "hardware", "user_hardware"},
- }
-@@ -155,6 +157,7 @@ func TestLoadHardwareMixingUserHardwareFolder(t *testing.T) {
- }
-
- func TestLoadHardwareWithBoardManagerFolderStructure(t *testing.T) {
-+ t.Skip("Can't run on Gentoo")
- ctx := &types.Context{
- HardwareFolders: []string{"downloaded_board_manager_stuff"},
- }
-@@ -203,6 +206,7 @@ func TestLoadHardwareWithBoardManagerFolderStructure(t *testing.T) {
- }
-
- func TestLoadLotsOfHardware(t *testing.T) {
-+ t.Skip("Can't run on Gentoo")
- ctx := &types.Context{
- HardwareFolders: []string{"downloaded_board_manager_stuff", "downloaded_hardware", filepath.Join("..", "hardware"), "hardware", "user_hardware"},
- }
-diff --git a/src/arduino.cc/builder/test/helper_tools_downloader.go b/src/arduino.cc/builder/test/helper_tools_downloader.go
-index 3642510..e6391b6 100644
---- a/src/arduino.cc/arduino-builder/src/arduino.cc/builder/test/helper_tools_downloader.go
-+++ b/src/arduino.cc/arduino-builder/src/arduino.cc/builder/test/helper_tools_downloader.go
-@@ -83,6 +83,7 @@ type Core struct {
- }
-
- func DownloadCoresAndToolsAndLibraries(t *testing.T) {
-+ t.Skip("Gentoo skips tests requiring network");
- cores := []Core{
- Core{Maintainer: "arduino", Arch: "avr", Version: "1.6.10"},
- Core{Maintainer: "arduino", Arch: "sam", Version: "1.6.7"},
-@@ -165,6 +166,7 @@ func patchFiles(t *testing.T) {
- }
-
- func download(t *testing.T, cores, boardsManagerCores, boardsManagerRedBearCores []Core, tools, toolsMultipleVersions, boardsManagerTools, boardsManagerRFduinoTools []Tool, libraries []Library) {
-+ t.Skip("Gentoo skips tests requiring network");
- allCoresDownloaded, err := allCoresAlreadyDownloadedAndUnpacked(HARDWARE_FOLDER, cores)
- NoError(t, err)
- if allCoresDownloaded &&
-diff --git a/src/arduino.cc/builder/test/target_board_resolver_test.go b/src/arduino.cc/builder/test/target_board_resolver_test.go
-index 274eb92..d6973e3 100644
---- a/src/arduino.cc/arduino-builder/src/arduino.cc/builder/test/target_board_resolver_test.go
-+++ b/src/arduino.cc/arduino-builder/src/arduino.cc/builder/test/target_board_resolver_test.go
-@@ -39,6 +39,7 @@ import (
- )
-
- func TestTargetBoardResolverUno(t *testing.T) {
-+ t.Skip("Can't run on Gentoo")
- ctx := &types.Context{
- HardwareFolders: []string{filepath.Join("..", "hardware"), "hardware", "downloaded_hardware"},
- FQBN: "arduino:avr:uno",
-@@ -64,6 +65,7 @@ func TestTargetBoardResolverUno(t *testing.T) {
- }
-
- func TestTargetBoardResolverDue(t *testing.T) {
-+ t.Skip("Can't run on Gentoo")
- ctx := &types.Context{
- HardwareFolders: []string{filepath.Join("..", "hardware"), "hardware", "downloaded_hardware"},
- FQBN: "arduino:sam:arduino_due_x",
-@@ -89,6 +91,7 @@ func TestTargetBoardResolverDue(t *testing.T) {
- }
-
- func TestTargetBoardResolverMega1280(t *testing.T) {
-+ t.Skip("Can't run on Gentoo")
- ctx := &types.Context{
- HardwareFolders: []string{filepath.Join("..", "hardware"), "hardware", "downloaded_hardware"},
- FQBN: "arduino:avr:mega:cpu=atmega1280",
-@@ -115,6 +118,7 @@ func TestTargetBoardResolverMega1280(t *testing.T) {
- }
-
- func TestTargetBoardResolverMega2560(t *testing.T) {
-+ t.Skip("Can't run on Gentoo")
- ctx := &types.Context{
- HardwareFolders: []string{filepath.Join("..", "hardware"), "hardware", "downloaded_hardware"},
- FQBN: "arduino:avr:mega:cpu=atmega2560",
-@@ -141,6 +145,7 @@ func TestTargetBoardResolverMega2560(t *testing.T) {
- }
-
- func TestTargetBoardResolverCustomYun(t *testing.T) {
-+ t.Skip("Can't run on Gentoo")
- ctx := &types.Context{
- HardwareFolders: []string{filepath.Join("..", "hardware"), "hardware", "downloaded_hardware", "user_hardware"},
- FQBN: "my_avr_platform:avr:custom_yun",
-@@ -167,6 +172,7 @@ func TestTargetBoardResolverCustomYun(t *testing.T) {
- }
-
- func TestTargetBoardResolverCustomCore(t *testing.T) {
-+ t.Skip("Can't run on Gentoo")
- ctx := &types.Context{
- HardwareFolders: []string{filepath.Join("..", "hardware"), "hardware", "downloaded_hardware", "user_hardware"},
- FQBN: "watterott:avr:attiny841:core=spencekonde,info=info",
diff --git a/dev-embedded/arduino-builder/files/arduino-builder-1.4.1-platform-paths.patch b/dev-embedded/arduino-builder/files/arduino-builder-1.4.1-platform-paths.patch
deleted file mode 100644
index be1f2b5edda1..000000000000
--- a/dev-embedded/arduino-builder/files/arduino-builder-1.4.1-platform-paths.patch
+++ /dev/null
@@ -1,19 +0,0 @@
-diff --git a/src/arduino.cc/builder/hardware/platform.txt b/src/arduino.cc/builder/hardware/platform.txt
-index ca8df1f..17ce03f 100644
---- a/src/github.com/arduino/arduino-builder/hardware/platform.txt
-+++ b/src/github.com/arduino/arduino-builder/hardware/platform.txt
-@@ -1,11 +1,11 @@
- # ctags
- # ------------------------------
--tools.ctags.path={runtime.tools.ctags.path}
--tools.ctags.cmd.path={path}/ctags
-+tools.ctags.path=/usr/bin
-+tools.ctags.cmd.path={path}/arduino-ctags
- tools.ctags.pattern="{cmd.path}" -u --language-force=c++ -f - --c++-kinds=svpf --fields=KSTtzns --line-directives "{source_file}"
-
- # additional entries
--tools.avrdude.path={runtime.tools.avrdude.path}
-+tools.avrdude.path=/usr/bin
-
- preproc.macros.flags=-w -x c++ -E -CC
- #preproc.macros.compatibility_flags={build.mbed_api_include} {build.nRF51822_api_include} {build.ble_api_include} {compiler.libsam.c.flags} {compiler.arm.cmsis.path} {build.variant_system_include}
diff --git a/dev-embedded/arduino-builder/files/arduino-builder-1.4.1-skip-tests.patch b/dev-embedded/arduino-builder/files/arduino-builder-1.4.1-skip-tests.patch
deleted file mode 100644
index f66e829e4b01..000000000000
--- a/dev-embedded/arduino-builder/files/arduino-builder-1.4.1-skip-tests.patch
+++ /dev/null
@@ -1,129 +0,0 @@
-Skip tests that can't run on Gentoo because of the network sandbox
-diff --git a/test/hardware_loader_test.go b/test/hardware_loader_test.go
-index 147396e..da6c8ef 100644
---- a/src/github.com/arduino/arduino-builder/test/hardware_loader_test.go
-+++ b/src/github.com/arduino/arduino-builder/test/hardware_loader_test.go
-@@ -41,6 +41,7 @@ import (
- )
-
- func TestLoadHardware(t *testing.T) {
-+ t.Skip("Can't run on Gentoo")
- ctx := &types.Context{
- HardwareFolders: []string{"downloaded_hardware", filepath.Join("..", "hardware"), "hardware"},
- }
-@@ -85,6 +86,7 @@ func TestLoadHardware(t *testing.T) {
- }
-
- func TestLoadHardwareMixingUserHardwareFolder(t *testing.T) {
-+ t.Skip("Can't run on Gentoo")
- ctx := &types.Context{
- HardwareFolders: []string{"downloaded_hardware", filepath.Join("..", "hardware"), "hardware", "user_hardware"},
- }
-@@ -155,6 +157,7 @@ func TestLoadHardwareMixingUserHardwareFolder(t *testing.T) {
- }
-
- func TestLoadHardwareWithBoardManagerFolderStructure(t *testing.T) {
-+ t.Skip("Can't run on Gentoo")
- ctx := &types.Context{
- HardwareFolders: []string{"downloaded_board_manager_stuff"},
- }
-@@ -203,6 +206,7 @@ func TestLoadHardwareWithBoardManagerFolderStructure(t *testing.T) {
- }
-
- func TestLoadLotsOfHardware(t *testing.T) {
-+ t.Skip("Can't run on Gentoo")
- ctx := &types.Context{
- HardwareFolders: []string{"downloaded_board_manager_stuff", "downloaded_hardware", filepath.Join("..", "hardware"), "hardware", "user_hardware"},
- }
-diff --git a/test/helper_tools_downloader.go b/test/helper_tools_downloader.go
-index 49aa847..ba77a57 100644
---- a/src/github.com/arduino/arduino-builder/test/helper_tools_downloader.go
-+++ b/src/github.com/arduino/arduino-builder/test/helper_tools_downloader.go
-@@ -83,6 +83,7 @@ type Core struct {
- }
-
- func DownloadCoresAndToolsAndLibraries(t *testing.T) {
-+ t.Skip("Gentoo skips tests requiring network");
- cores := []Core{
- Core{Maintainer: "arduino", Arch: "avr", Version: "1.6.10"},
- Core{Maintainer: "arduino", Arch: "sam", Version: "1.6.7"},
-@@ -177,6 +178,7 @@ func patchFiles(t *testing.T) {
- }
-
- func download(t *testing.T, cores, boardsManagerCores, boardsManagerRedBearCores []Core, tools, toolsMultipleVersions, boardsManagerTools, boardsManagerRFduinoTools []Tool, libraries []Library) {
-+ t.Skip("Gentoo skips tests requiring network");
- allCoresDownloaded, err := allCoresAlreadyDownloadedAndUnpacked(HARDWARE_FOLDER, cores)
- NoError(t, err)
- if allCoresDownloaded &&
-diff --git a/test/target_board_resolver_test.go b/test/target_board_resolver_test.go
-index 49e0abe..7a50fe1 100644
---- a/src/github.com/arduino/arduino-builder/test/target_board_resolver_test.go
-+++ b/src/github.com/arduino/arduino-builder/test/target_board_resolver_test.go
-@@ -39,6 +39,7 @@ import (
- )
-
- func TestTargetBoardResolverUno(t *testing.T) {
-+ t.Skip("Can't run on Gentoo")
- ctx := &types.Context{
- HardwareFolders: []string{filepath.Join("..", "hardware"), "hardware", "downloaded_hardware"},
- FQBN: "arduino:avr:uno",
-@@ -64,6 +65,7 @@ func TestTargetBoardResolverUno(t *testing.T) {
- }
-
- func TestTargetBoardResolverDue(t *testing.T) {
-+ t.Skip("Can't run on Gentoo")
- ctx := &types.Context{
- HardwareFolders: []string{filepath.Join("..", "hardware"), "hardware", "downloaded_hardware"},
- FQBN: "arduino:sam:arduino_due_x",
-@@ -89,6 +91,7 @@ func TestTargetBoardResolverDue(t *testing.T) {
- }
-
- func TestTargetBoardResolverMega1280(t *testing.T) {
-+ t.Skip("Can't run on Gentoo")
- ctx := &types.Context{
- HardwareFolders: []string{filepath.Join("..", "hardware"), "hardware", "downloaded_hardware"},
- FQBN: "arduino:avr:mega:cpu=atmega1280",
-@@ -115,6 +118,7 @@ func TestTargetBoardResolverMega1280(t *testing.T) {
- }
-
- func TestTargetBoardResolverMega2560(t *testing.T) {
-+ t.Skip("Can't run on Gentoo")
- ctx := &types.Context{
- HardwareFolders: []string{filepath.Join("..", "hardware"), "hardware", "downloaded_hardware"},
- FQBN: "arduino:avr:mega:cpu=atmega2560",
-@@ -141,6 +145,7 @@ func TestTargetBoardResolverMega2560(t *testing.T) {
- }
-
- func TestTargetBoardResolverCustomYun(t *testing.T) {
-+ t.Skip("Can't run on Gentoo")
- ctx := &types.Context{
- HardwareFolders: []string{filepath.Join("..", "hardware"), "hardware", "downloaded_hardware", "user_hardware"},
- FQBN: "my_avr_platform:avr:custom_yun",
-@@ -167,6 +172,7 @@ func TestTargetBoardResolverCustomYun(t *testing.T) {
- }
-
- func TestTargetBoardResolverCustomCore(t *testing.T) {
-+ t.Skip("Can't run on Gentoo")
- ctx := &types.Context{
- HardwareFolders: []string{filepath.Join("..", "hardware"), "hardware", "downloaded_hardware", "user_hardware"},
- FQBN: "watterott:avr:attiny841:core=spencekonde,info=info",
-diff --git a/test/wipeout_build_path_if_build_options_changed_test.go b/test/wipeout_build_path_if_build_options_changed_test.go
-index 51bfe80..8501fb6 100644
---- a/src/github.com/arduino/arduino-builder/test/wipeout_build_path_if_build_options_changed_test.go
-+++ b/src/github.com/arduino/arduino-builder/test/wipeout_build_path_if_build_options_changed_test.go
-@@ -42,6 +42,7 @@ import (
- )
-
- func TestWipeoutBuildPathIfBuildOptionsChanged(t *testing.T) {
-+ t.Skip("Can't run in Gentoo")
- ctx := &types.Context{}
-
- buildPath := SetupBuildPath(t, ctx)
-@@ -73,6 +74,7 @@ func TestWipeoutBuildPathIfBuildOptionsChanged(t *testing.T) {
- }
-
- func TestWipeoutBuildPathIfBuildOptionsChangedNoPreviousBuildOptions(t *testing.T) {
-+ t.Skip("Can't run in Gentoo")
- ctx := &types.Context{}
-
- buildPath := SetupBuildPath(t, ctx)