Add cc_library tests

Add tests around reusing objects between static and shared
libraries.

Test: library_test.go
Change-Id: I1a1a01c5ea9f9edfbcaa5b29c39c281630e04f70
This commit is contained in:
Colin Cross 2017-11-16 14:29:11 -08:00
parent 20823f95e6
commit ad59e75a56
4 changed files with 192 additions and 1 deletions

View File

@ -158,6 +158,7 @@ bootstrap_go_package {
],
testSrcs: [
"cc/cc_test.go",
"cc/library_test.go",
"cc/test_data_test.go",
],
pluginFor: ["soong_build"],

View File

@ -108,12 +108,17 @@ func testCc(t *testing.T, bp string) *android.TestContext {
name: "crtend_so",
}
cc_library {
name: "libprotobuf-cpp-lite",
}
`
ctx.MockFileSystem(map[string][]byte{
"Android.bp": []byte(bp),
"foo.c": nil,
"bar.c": nil,
"a.proto": nil,
})
_, errs := ctx.ParseFileList(".", []string{"Android.bp"})

View File

@ -651,7 +651,7 @@ func vndkVsNdk(ctx ModuleContext) bool {
func (library *libraryDecorator) link(ctx ModuleContext,
flags Flags, deps PathDeps, objs Objects) android.Path {
objs = objs.Append(deps.Objs)
objs = deps.Objs.Copy().Append(objs)
var out android.Path
if library.static() || library.header() {
out = library.linkStatic(ctx, flags, deps, objs)

185
cc/library_test.go Normal file
View File

@ -0,0 +1,185 @@
// Copyright 2017 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 cc
import (
"reflect"
"testing"
)
func TestLibraryReuse(t *testing.T) {
t.Run("simple", func(t *testing.T) {
ctx := testCc(t, `
cc_library {
name: "libfoo",
srcs: ["foo.c"],
}`)
libfooShared := ctx.ModuleForTests("libfoo", "android_arm_armv7-a-neon_core_shared").Rule("ld")
libfooStatic := ctx.ModuleForTests("libfoo", "android_arm_armv7-a-neon_core_static").Output("libfoo.a")
if len(libfooShared.Inputs) != 1 {
t.Fatalf("unexpected inputs to libfoo shared: %#v", libfooShared.Inputs.Strings())
}
if len(libfooStatic.Inputs) != 1 {
t.Fatalf("unexpected inputs to libfoo static: %#v", libfooStatic.Inputs.Strings())
}
if libfooShared.Inputs[0] != libfooStatic.Inputs[0] {
t.Errorf("static object not reused for shared library")
}
})
t.Run("extra static source", func(t *testing.T) {
ctx := testCc(t, `
cc_library {
name: "libfoo",
srcs: ["foo.c"],
static: {
srcs: ["bar.c"]
},
}`)
libfooShared := ctx.ModuleForTests("libfoo", "android_arm_armv7-a-neon_core_shared").Rule("ld")
libfooStatic := ctx.ModuleForTests("libfoo", "android_arm_armv7-a-neon_core_static").Output("libfoo.a")
if len(libfooShared.Inputs) != 1 {
t.Fatalf("unexpected inputs to libfoo shared: %#v", libfooShared.Inputs.Strings())
}
if len(libfooStatic.Inputs) != 2 {
t.Fatalf("unexpected inputs to libfoo static: %#v", libfooStatic.Inputs.Strings())
}
if libfooShared.Inputs[0] != libfooStatic.Inputs[0] {
t.Errorf("static object not reused for shared library")
}
})
t.Run("extra shared source", func(t *testing.T) {
ctx := testCc(t, `
cc_library {
name: "libfoo",
srcs: ["foo.c"],
shared: {
srcs: ["bar.c"]
},
}`)
libfooShared := ctx.ModuleForTests("libfoo", "android_arm_armv7-a-neon_core_shared").Rule("ld")
libfooStatic := ctx.ModuleForTests("libfoo", "android_arm_armv7-a-neon_core_static").Output("libfoo.a")
if len(libfooShared.Inputs) != 2 {
t.Fatalf("unexpected inputs to libfoo shared: %#v", libfooShared.Inputs.Strings())
}
if len(libfooStatic.Inputs) != 1 {
t.Fatalf("unexpected inputs to libfoo static: %#v", libfooStatic.Inputs.Strings())
}
if libfooShared.Inputs[0] != libfooStatic.Inputs[0] {
t.Errorf("static object not reused for shared library")
}
})
t.Run("extra static cflags", func(t *testing.T) {
ctx := testCc(t, `
cc_library {
name: "libfoo",
srcs: ["foo.c"],
static: {
cflags: ["-DFOO"],
},
}`)
libfooShared := ctx.ModuleForTests("libfoo", "android_arm_armv7-a-neon_core_shared").Rule("ld")
libfooStatic := ctx.ModuleForTests("libfoo", "android_arm_armv7-a-neon_core_static").Output("libfoo.a")
if len(libfooShared.Inputs) != 1 {
t.Fatalf("unexpected inputs to libfoo shared: %#v", libfooShared.Inputs.Strings())
}
if len(libfooStatic.Inputs) != 1 {
t.Fatalf("unexpected inputs to libfoo static: %#v", libfooStatic.Inputs.Strings())
}
if libfooShared.Inputs[0] == libfooStatic.Inputs[0] {
t.Errorf("static object reused for shared library when it shouldn't be")
}
})
t.Run("extra shared cflags", func(t *testing.T) {
ctx := testCc(t, `
cc_library {
name: "libfoo",
srcs: ["foo.c"],
shared: {
cflags: ["-DFOO"],
},
}`)
libfooShared := ctx.ModuleForTests("libfoo", "android_arm_armv7-a-neon_core_shared").Rule("ld")
libfooStatic := ctx.ModuleForTests("libfoo", "android_arm_armv7-a-neon_core_static").Output("libfoo.a")
if len(libfooShared.Inputs) != 1 {
t.Fatalf("unexpected inputs to libfoo shared: %#v", libfooShared.Inputs.Strings())
}
if len(libfooStatic.Inputs) != 1 {
t.Fatalf("unexpected inputs to libfoo static: %#v", libfooStatic.Inputs.Strings())
}
if libfooShared.Inputs[0] == libfooStatic.Inputs[0] {
t.Errorf("static object reused for shared library when it shouldn't be")
}
})
t.Run("global cflags for reused generated sources", func(t *testing.T) {
ctx := testCc(t, `
cc_library {
name: "libfoo",
srcs: [
"foo.c",
"a.proto",
],
shared: {
srcs: [
"bar.c",
],
},
}`)
libfooShared := ctx.ModuleForTests("libfoo", "android_arm_armv7-a-neon_core_shared").Rule("ld")
libfooStatic := ctx.ModuleForTests("libfoo", "android_arm_armv7-a-neon_core_static").Output("libfoo.a")
if len(libfooShared.Inputs) != 3 {
t.Fatalf("unexpected inputs to libfoo shared: %#v", libfooShared.Inputs.Strings())
}
if len(libfooStatic.Inputs) != 2 {
t.Fatalf("unexpected inputs to libfoo static: %#v", libfooStatic.Inputs.Strings())
}
if !reflect.DeepEqual(libfooShared.Inputs[0:2].Strings(), libfooStatic.Inputs.Strings()) {
t.Errorf("static objects not reused for shared library")
}
libfoo := ctx.ModuleForTests("libfoo", "android_arm_armv7-a-neon_core_shared").Module().(*Module)
if !inList("-DGOOGLE_PROTOBUF_NO_RTTI", libfoo.flags.CFlags) {
t.Errorf("missing protobuf cflags")
}
})
}