Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 642b4031 authored by Treehugger Robot's avatar Treehugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Require scl files in ExecutionModeScl" into main am: 534b47bc am: bfc36ad9 

Original change: https://android-review.googlesource.com/c/platform/build/+/2828474



Change-Id: I652a0fce6d0e2603a19b4aff7883daa93706513a
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 59e44874 bfc36ad9

tools/rbcrun/host.go

+4 −2
Original line number Diff line number Diff line
@@ -24,7 +24,6 @@ import ( 
	"strings"



	"go.starlark.net/starlark"

	"go.starlark.net/starlarkjson"

	"go.starlark.net/starlarkstruct"

)
@@ -60,7 +59,6 @@ var rbcBuiltins starlark.StringDict = starlark.StringDict{ 


var sclBuiltins starlark.StringDict = starlark.StringDict{

	"struct":   starlark.NewBuiltin("struct", starlarkstruct.Make),

	"json": starlarkjson.Module,

}



func isSymlink(filepath string) (bool, error) {
@@ -389,6 +387,10 @@ func Run(filename string, src interface{}, mode ExecutionMode, allowExternalEntr 
		return nil, nil, err

	}



	if mode == ExecutionModeScl && !strings.HasSuffix(filename, ".scl") {

		return nil, nil, fmt.Errorf("filename must end in .scl: %s", filename)

	}



	// Add top-level file to cache for cycle detection purposes

	moduleCache[filename] = nil

tools/rbcrun/host_test.go

+2 −2
Original line number Diff line number Diff line
@@ -143,7 +143,7 @@ func TestBzlLoadsScl(t *testing.T) { 
	if err := os.Chdir(filepath.Dir(dir)); err != nil {

		t.Fatal(err)

	}

	vars, _, err := Run("testdata/bzl_loads_scl.bzl", nil, ExecutionModeScl, false)

	vars, _, err := Run("testdata/bzl_loads_scl.bzl", nil, ExecutionModeRbc, false)

	if err != nil {

		t.Fatal(err)

	}
@@ -160,7 +160,7 @@ func TestNonEntrypointBzlLoadsScl(t *testing.T) { 
	if err := os.Chdir(filepath.Dir(dir)); err != nil {

		t.Fatal(err)

	}

	vars, _, err := Run("testdata/bzl_loads_scl_2.bzl", nil, ExecutionModeScl, false)

	vars, _, err := Run("testdata/bzl_loads_scl_2.bzl", nil, ExecutionModeRbc, false)

	if err != nil {

		t.Fatal(err)

	}