diff options
| -rw-r--r-- | filesystem/Android.bp | 2 | ||||
| -rw-r--r-- | filesystem/filesystem.go | 6 | ||||
| -rw-r--r-- | filesystem/filesystem_test.go | 42 | ||||
| -rw-r--r-- | filesystem/testing.go | 19 |
4 files changed, 68 insertions, 1 deletions
diff --git a/filesystem/Android.bp b/filesystem/Android.bp index 791019ddb..3cdaa6418 100644 --- a/filesystem/Android.bp +++ b/filesystem/Android.bp @@ -15,8 +15,10 @@ bootstrap_go_package { "filesystem.go", "logical_partition.go", "vbmeta.go", + "testing.go", ], testSrcs: [ + "filesystem_test.go", ], pluginFor: ["soong_build"], } diff --git a/filesystem/filesystem.go b/filesystem/filesystem.go index b2bd6bddf..cf9871701 100644 --- a/filesystem/filesystem.go +++ b/filesystem/filesystem.go @@ -26,7 +26,11 @@ import ( ) func init() { - android.RegisterModuleType("android_filesystem", filesystemFactory) + registerBuildComponents(android.InitRegistrationContext) +} + +func registerBuildComponents(ctx android.RegistrationContext) { + ctx.RegisterModuleType("android_filesystem", filesystemFactory) } type filesystem struct { diff --git a/filesystem/filesystem_test.go b/filesystem/filesystem_test.go new file mode 100644 index 000000000..880b17741 --- /dev/null +++ b/filesystem/filesystem_test.go @@ -0,0 +1,42 @@ +// Copyright 2021 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 filesystem + +import ( + "os" + "testing" + + "android/soong/android" +) + +func TestMain(m *testing.M) { + os.Exit(m.Run()) +} + +var fixture = android.GroupFixturePreparers( + android.PrepareForIntegrationTestWithAndroid, + PrepareForTestWithFilesystemBuildComponents, +) + +func TestFileSystemDeps(t *testing.T) { + result := fixture.RunTestWithBp(t, ` + android_filesystem { + name: "myfilesystem", + } + `) + + // produces "myfilesystem.img" + result.ModuleForTests("myfilesystem", "android_common").Output("myfilesystem.img") +} diff --git a/filesystem/testing.go b/filesystem/testing.go new file mode 100644 index 000000000..631f1b1c8 --- /dev/null +++ b/filesystem/testing.go @@ -0,0 +1,19 @@ +// Copyright 2021 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 filesystem + +import "android/soong/android" + +var PrepareForTestWithFilesystemBuildComponents = android.FixtureRegisterWithContext(registerBuildComponents) |