Merge "Update tests to expect RBE not supported on linux." into main am: cdd872a5be
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/3197070 Change-Id: I406b26d9ec7571d69332b8320e8778ea9a0fda8c Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
committed by
Automerger Merge Worker
commit
6646865a31
@@ -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(),
|
||||
},
|
||||
},
|
||||
|
@@ -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
|
||||
|
Reference in New Issue
Block a user