StrixOS/build_soong
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Remove --multitree-build

Browse Source 
Multitree has been discontinued.

Test: m nothing --no-skip-soong-tests
Change-Id: Ie4d96a11279bf0f20a5e1a49837d9df4b24b1662
This commit is contained in:
Cole Faust
2024-02-28 15:35:49 -08:00
parent 4dc449593a
commit 331b27f511
5 changed files with 20 additions and 53 deletions
Download Patch File Download Diff File Expand all files Collapse all files

47
ui/build/config_test.go
View File

@@ -860,23 +860,24 @@ func TestGetConfigArgsBuildModules(t *testing.T) {
}
func TestGetConfigArgsBuildModulesInDirectory(t *testing.T) {
tests := []buildActionTestCase{{
description: "normal execution in a directory",
dirsInTrees: []string{"0/1/2"},
buildFiles: []string{"0/1/2/Android.mk"},
args: []string{"fake-module"},
curDir: "0/1/2",
tidyOnly: "",
expectedArgs: []string{"fake-module", "MODULES-IN-0-1-2"},
}, {
description: "build file in parent directory",
dirsInTrees: []string{"0/1/2"},
buildFiles: []string{"0/1/Android.mk"},
args: []string{},
curDir: "0/1/2",
tidyOnly: "",
expectedArgs: []string{"MODULES-IN-0-1"},
},
tests := []buildActionTestCase{
{
description: "normal execution in a directory",
dirsInTrees: []string{"0/1/2"},
buildFiles: []string{"0/1/2/Android.mk"},
args: []string{"fake-module"},
curDir: "0/1/2",
tidyOnly: "",
expectedArgs: []string{"fake-module", "MODULES-IN-0-1-2"},
}, {
description: "build file in parent directory",
dirsInTrees: []string{"0/1/2"},
buildFiles: []string{"0/1/Android.mk"},
args: []string{},
curDir: "0/1/2",
tidyOnly: "",
expectedArgs: []string{"MODULES-IN-0-1"},
},
{
description: "build file in parent directory, multiple module names passed in",
dirsInTrees: []string{"0/1/2"},
@@ -902,15 +903,6 @@ func TestGetConfigArgsBuildModulesInDirectory(t *testing.T) {
curDir: ".",
tidyOnly: "",
expectedArgs: []string{},
}, {
description: "multitree build action executed at root directory",
dirsInTrees: []string{},
buildFiles: []string{},
rootSymlink: false,
args: []string{"--multitree-build"},
curDir: ".",
tidyOnly: "",
expectedArgs: []string{"--multitree-build"},
}, {
description: "build action executed at root directory in symlink",
dirsInTrees: []string{},
@@ -953,7 +945,8 @@ func TestGetConfigArgsBuildModulesInDirectory(t *testing.T) {
curDir: "",
tidyOnly: "",
expectedArgs: []string{"-j", "-k", "fake_module"},
}}
},
}
for _, tt := range tests {
t.Run("build action BUILD_MODULES_IN_DIR, "+tt.description, func(t *testing.T) {
testGetConfigArgs(t, tt, BUILD_MODULES_IN_A_DIRECTORY)