Merge "Add a testdata property in goPackage and goBinary"
diff --git a/bootstrap/bootstrap.go b/bootstrap/bootstrap.go
index ead22d0..f1b5dca 100644
--- a/bootstrap/bootstrap.go
+++ b/bootstrap/bootstrap.go
@@ -208,6 +208,7 @@
 		PkgPath   string
 		Srcs      []string
 		TestSrcs  []string
+		TestData  []string
 		PluginFor []string
 
 		Darwin struct {
@@ -368,6 +369,10 @@
 	return g.properties.Deps
 }
 
+func (g *GoPackage) TestData() []string {
+	return g.properties.TestData
+}
+
 // A GoBinary is a module for building executable binaries from Go sources.
 type GoBinary struct {
 	blueprint.SimpleName
@@ -375,6 +380,7 @@
 		Deps           []string
 		Srcs           []string
 		TestSrcs       []string
+		TestData       []string
 		PrimaryBuilder bool
 		Default        bool
 
@@ -440,6 +446,10 @@
 	return g.properties.Deps
 }
 
+func (g *GoBinary) TestData() []string {
+	return g.properties.TestData
+}
+
 func (g *GoBinary) GenerateBuildActions(ctx blueprint.ModuleContext) {
 	// Allow the primary builder to create multiple variants.  Any variants after the first
 	// will copy outputs from the first.