Merge "Update tests to expect RBE not supported on linux." into main (cdd872a5) · Commits · e / os / android_build_soong

ui/build/config_test.go

+3 −1

Original line number	Diff line number	Diff line
		@@ -22,6 +22,7 @@ import (
		"os"
		"path/filepath"
		"reflect"
		"runtime"
		"strings"
		"testing"

		@@ -1043,12 +1044,13 @@ func TestBuildConfig(t *testing.T) {
		},
		},
		{
		// RBE is only supported on linux.
		name: "use rbe",
		environ: Environment{"USE_RBE=1"},
		expectedBuildConfig: &smpb.BuildConfig{
		ForceUseGoma: proto.Bool(false),
		UseGoma: proto.Bool(false),
		UseRbe: proto.Bool(true),
		UseRbe: proto.Bool(runtime.GOOS == "linux"),
		NinjaWeightListSource: smpb.BuildConfig_NOT_USED.Enum(),
		},
		},

+9 −0

Original line number	Diff line number	Diff line
		@@ -19,6 +19,7 @@ import (
		"io/ioutil"
		"os"
		"path/filepath"
		"runtime"
		"strings"
		"testing"

		@@ -26,6 +27,10 @@ import (
		)

		func TestDumpRBEMetrics(t *testing.T) {
		// RBE is only supported on linux.
		if runtime.GOOS != "linux" {
		t.Skip("RBE is only supported on linux")
		}
		ctx := testContext()
		tests := []struct {
		description string
		@@ -82,6 +87,10 @@ func TestDumpRBEMetrics(t *testing.T) {
		}

		func TestDumpRBEMetricsErrors(t *testing.T) {
		// RBE is only supported on linux.
		if runtime.GOOS != "linux" {
		t.Skip("RBE is only supported on linux")
		}
		ctx := testContext()
		tests := []struct {
		description string