mirror of
https://github.com/tinygo-org/tinygo.git
synced 2026-07-26 06:38:42 +00:00
Carlos Henrique Guardão Gandarez
410bb9c103
* feat: add inheritable-only field to hide processor-level targets from listing Processor-level targets like esp32, rp2040, etc. have flash-method set so they leak through the existing heuristic filter in GetTargetSpecs and appear in `tinygo targets` output. Add an "inheritable-only" JSON field that is checked on raw JSON before inheritance resolution, preventing these non-board targets from being listed while keeping them loadable for direct builds and inheritance. Ref: tinygo-org/tinygo#5178 * fix: prevent inheritable-only from propagating to child targets The InheritableOnly bool field was propagating from parent to child targets through overrideProperties, which would hide board targets from GetTargetSpecs. Fix by preserving/restoring the field across resolveInherits. Also simplify GetTargetSpecs by removing the raw JSON pre-check workaround and remove nonexistent esp32c6 from tests. * prevent build commands to use inheritable only targets
115 lines
3.2 KiB
Go
115 lines
3.2 KiB
Go
package compileopts
|
|
|
|
import (
|
|
"errors"
|
|
"io/fs"
|
|
"reflect"
|
|
"testing"
|
|
)
|
|
|
|
func TestLoadTarget(t *testing.T) {
|
|
_, err := LoadTarget(&Options{Target: "arduino"})
|
|
if err != nil {
|
|
t.Error("LoadTarget test failed:", err)
|
|
}
|
|
|
|
_, err = LoadTarget(&Options{Target: "notexist"})
|
|
if err == nil {
|
|
t.Error("LoadTarget should have failed with non existing target")
|
|
}
|
|
|
|
if !errors.Is(err, fs.ErrNotExist) {
|
|
t.Error("LoadTarget failed for wrong reason:", err)
|
|
}
|
|
}
|
|
|
|
func TestGetTargetSpecs_InheritableOnlyTargetsExcluded(t *testing.T) {
|
|
specs, err := GetTargetSpecs()
|
|
if err != nil {
|
|
t.Fatal("GetTargetSpecs failed:", err)
|
|
}
|
|
|
|
// Inheritable-only processor-level targets should not appear in the listing.
|
|
inheritableOnlyTargets := []string{"esp32", "esp32c3", "esp32s3", "esp8266", "rp2040", "rp2350", "rp2350b"}
|
|
for _, name := range inheritableOnlyTargets {
|
|
if _, ok := specs[name]; ok {
|
|
t.Errorf("inheritable-only target %q should not appear in GetTargetSpecs", name)
|
|
}
|
|
}
|
|
|
|
// Board targets that inherit from inheritable-only targets should still appear.
|
|
boardTargets := []string{"esp32-coreboard-v2", "pico"}
|
|
for _, name := range boardTargets {
|
|
if _, ok := specs[name]; !ok {
|
|
t.Errorf("board target %q should appear in GetTargetSpecs", name)
|
|
}
|
|
}
|
|
}
|
|
|
|
func TestLoadTarget_InheritableOnlyTargetStillLoadable(t *testing.T) {
|
|
// Inheritable-only targets should still be loadable directly (for building).
|
|
_, err := LoadTarget(&Options{Target: "esp32"})
|
|
if err != nil {
|
|
t.Errorf("LoadTarget should still load inheritable-only target esp32: %v", err)
|
|
}
|
|
}
|
|
|
|
func TestOverrideProperties(t *testing.T) {
|
|
baseAutoStackSize := true
|
|
base := &TargetSpec{
|
|
GOOS: "baseGoos",
|
|
CPU: "baseCpu",
|
|
CFlags: []string{"-base-foo", "-base-bar"},
|
|
BuildTags: []string{"bt1", "bt2"},
|
|
DefaultStackSize: 42,
|
|
AutoStackSize: &baseAutoStackSize,
|
|
}
|
|
childAutoStackSize := false
|
|
child := &TargetSpec{
|
|
GOOS: "",
|
|
CPU: "chlidCpu",
|
|
CFlags: []string{"-child-foo", "-child-bar"},
|
|
AutoStackSize: &childAutoStackSize,
|
|
DefaultStackSize: 64,
|
|
}
|
|
|
|
base.overrideProperties(child)
|
|
|
|
if base.GOOS != "baseGoos" {
|
|
t.Errorf("Overriding failed : got %v", base.GOOS)
|
|
}
|
|
if base.CPU != "chlidCpu" {
|
|
t.Errorf("Overriding failed : got %v", base.CPU)
|
|
}
|
|
if !reflect.DeepEqual(base.CFlags, []string{"-base-foo", "-base-bar", "-child-foo", "-child-bar"}) {
|
|
t.Errorf("Overriding failed : got %v", base.CFlags)
|
|
}
|
|
if !reflect.DeepEqual(base.BuildTags, []string{"bt1", "bt2"}) {
|
|
t.Errorf("Overriding failed : got %v", base.BuildTags)
|
|
}
|
|
if *base.AutoStackSize != false {
|
|
t.Errorf("Overriding failed : got %v", base.AutoStackSize)
|
|
}
|
|
if base.DefaultStackSize != 64 {
|
|
t.Errorf("Overriding failed : got %v", base.DefaultStackSize)
|
|
}
|
|
|
|
baseAutoStackSize = true
|
|
base = &TargetSpec{
|
|
AutoStackSize: &baseAutoStackSize,
|
|
DefaultStackSize: 42,
|
|
}
|
|
child = &TargetSpec{
|
|
AutoStackSize: nil,
|
|
DefaultStackSize: 0,
|
|
}
|
|
base.overrideProperties(child)
|
|
if *base.AutoStackSize != true {
|
|
t.Errorf("Overriding failed : got %v", base.AutoStackSize)
|
|
}
|
|
if base.DefaultStackSize != 42 {
|
|
t.Errorf("Overriding failed : got %v", base.DefaultStackSize)
|
|
}
|
|
|
|
}
|