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

Commit 72ea641d authored by Colin Cross's avatar Colin Cross Committed by Gerrit Code Review
Browse files

Merge changes Ia17b2bcb,Ic71892c3,Id2b23b9e,I435ee7aa,I85112506, ... 

* changes:
  Consolidate *MutatorContext and ModuleContext into BaseModuleContext
  Add test for missing defaults modules with AllowMissingDependencies
  Capture missing dependency error rules
  Share buildDir for android/soong/android tests
  Reimplement AddMissingDependencies
  Add GenerateAndroidBuildActions to DefaultsModuleBase
parents 733728b4 dc35e211

Android.bp

+2 −0
Original line number Diff line number Diff line
@@ -78,10 +78,12 @@ bootstrap_go_package { 
        "android/env.go",

    ],

    testSrcs: [

        "android/android_test.go",

        "android/arch_test.go",

        "android/config_test.go",

        "android/expand_test.go",

        "android/module_test.go",

        "android/mutator_test.go",

        "android/namespace_test.go",

        "android/neverallow_test.go",

        "android/onceper_test.go",

android/android_test.go

0 → 100644
+46 −0
Original line number Diff line number Diff line 
// Copyright 2019 Google Inc. All rights reserved.

//

// Licensed under the Apache License, Version 2.0 (the "License");

// you may not use this file except in compliance with the License.

// You may obtain a copy of the License at

//

//     http://www.apache.org/licenses/LICENSE-2.0

//

// Unless required by applicable law or agreed to in writing, software

// distributed under the License is distributed on an "AS IS" BASIS,

// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

// See the License for the specific language governing permissions and

// limitations under the License.



package android



import (

	"io/ioutil"

	"os"

	"testing"

)



var buildDir string



func setUp() {

	var err error

	buildDir, err = ioutil.TempDir("", "soong_android_test")

	if err != nil {

		panic(err)

	}

}



func tearDown() {

	os.RemoveAll(buildDir)

}



func TestMain(m *testing.M) {

	run := func() int {

		setUp()

		defer tearDown()



		return m.Run()

	}



	os.Exit(run())

}

android/defaults.go

+3 −0
Original line number Diff line number Diff line
@@ -80,6 +80,9 @@ func (d *DefaultsModuleBase) properties() []interface{} { 
	return d.defaultableProperties

}



func (d *DefaultsModuleBase) GenerateAndroidBuildActions(ctx ModuleContext) {

}



func InitDefaultsModule(module DefaultableModule) {

	module.AddProperties(

		&hostAndDeviceProperties{},

android/defaults_test.go

0 → 100644
+116 −0
Original line number Diff line number Diff line 
// Copyright 2019 Google Inc. All rights reserved.

//

// Licensed under the Apache License, Version 2.0 (the "License");

// you may not use this file except in compliance with the License.

// You may obtain a copy of the License at

//

//     http://www.apache.org/licenses/LICENSE-2.0

//

// Unless required by applicable law or agreed to in writing, software

// distributed under the License is distributed on an "AS IS" BASIS,

// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

// See the License for the specific language governing permissions and

// limitations under the License.



package android



import (

	"testing"



	"github.com/google/blueprint/proptools"

)



type defaultsTestProperties struct {

	Foo []string

}



type defaultsTestModule struct {

	ModuleBase

	DefaultableModuleBase

	properties defaultsTestProperties

}



func (d *defaultsTestModule) GenerateAndroidBuildActions(ctx ModuleContext) {

	ctx.Build(pctx, BuildParams{

		Rule:   Touch,

		Output: PathForModuleOut(ctx, "out"),

	})

}



func defaultsTestModuleFactory() Module {

	module := &defaultsTestModule{}

	module.AddProperties(&module.properties)

	InitDefaultableModule(module)

	InitAndroidModule(module)

	return module

}



type defaultsTestDefaults struct {

	ModuleBase

	DefaultsModuleBase

}



func defaultsTestDefaultsFactory() Module {

	defaults := &defaultsTestDefaults{}

	defaults.AddProperties(&defaultsTestProperties{})

	InitDefaultsModule(defaults)

	return defaults

}



func TestDefaultsAllowMissingDependencies(t *testing.T) {

	config := TestConfig(buildDir, nil)

	config.TestProductVariables.Allow_missing_dependencies = proptools.BoolPtr(true)



	ctx := NewTestContext()

	ctx.SetAllowMissingDependencies(true)



	ctx.RegisterModuleType("test", ModuleFactoryAdaptor(defaultsTestModuleFactory))

	ctx.RegisterModuleType("defaults", ModuleFactoryAdaptor(defaultsTestDefaultsFactory))



	ctx.PreArchMutators(RegisterDefaultsPreArchMutators)



	ctx.Register()



	bp := `

		defaults {

			name: "defaults",

			defaults: ["missing"],

			foo: ["defaults"],

		}



		test {

			name: "missing_defaults",

			defaults: ["missing"],

			foo: ["module"],

		}



		test {

			name: "missing_transitive_defaults",

			defaults: ["defaults"],

			foo: ["module"],

		}

	`



	ctx.MockFileSystem(map[string][]byte{

		"Android.bp": []byte(bp),

	})



	_, errs := ctx.ParseFileList(".", []string{"Android.bp"})

	FailIfErrored(t, errs)

	_, errs = ctx.PrepareBuildActions(config)

	FailIfErrored(t, errs)



	missingDefaults := ctx.ModuleForTests("missing_defaults", "").Output("out")

	missingTransitiveDefaults := ctx.ModuleForTests("missing_transitive_defaults", "").Output("out")



	if missingDefaults.Rule != ErrorRule {

		t.Errorf("expected missing_defaults rule to be ErrorRule, got %#v", missingDefaults.Rule)

	}



	if g, w := missingDefaults.Args["error"], "module missing_defaults missing dependencies: missing\n"; g != w {

		t.Errorf("want error %q, got %q", w, g)

	}



	// TODO: missing transitive defaults is currently not handled

	_ = missingTransitiveDefaults

}

android/module.go

+157 −110

File changed.

Preview size limit exceeded, changes collapsed.