Add test

src/core/graph.go

@@ -176,19 +176,27 @@ func (graph *BuildGraph) TransitiveSubincludes(l BuildLabel) []BuildLabel {
 	graph.subincMux.RLock()
 	defer graph.subincMux.RUnlock()
 
-	return graph.transitiveSubincludes(l)
-}
+	incs := make(labelSet)
+	graph.findTransitiveSubincludes(l, incs)
 
-func (graph *BuildGraph) transitiveSubincludes(l BuildLabel) []BuildLabel {
-	ls := graph.subincludeSubincludes[l]
-	ret := make([]BuildLabel, 0, len(ls))
-	for l := range ls {
+	ret := make(BuildLabels, 0, len(incs))
+	for l := range incs {
 		ret = append(ret, l)
-		ret = append(ret, graph.transitiveSubincludes(l)...)
 	}
+	sort.Sort(ret)
 	return ret
 }
 
+func (graph *BuildGraph) findTransitiveSubincludes(label BuildLabel, includes labelSet) {
+	if _, ok := includes[label]; ok {
+		return
+	}
+	includes[label] = struct{}{}
+	for l := range graph.subincludeSubincludes[label] {
+		graph.findTransitiveSubincludes(l, includes)
+	}
+}
+
 func (graph *BuildGraph) RegisterTransitiveSubinclude(from, to BuildLabel) {
 	graph.subincMux.Lock()
 	defer graph.subincMux.Unlock()

src/export/export.go

@@ -21,7 +21,9 @@ var log = logging.Log
 func ToDir(state *core.BuildState, dir string, targets []core.BuildLabel) {
 	done := map[*core.BuildTarget]bool{}
 	for _, target := range state.Config.Parse.PreloadSubincludes {
-		exportSubinclude(state.Graph, dir, target, done)
+		for _, includeLable := range append(state.Graph.TransitiveSubincludes(target), target) {
+			export(state.Graph, dir, state.Graph.TargetOrDie(includeLable), done)
+		}
 	}
 	for _, target := range targets {
 		export(state.Graph, dir, state.Graph.TargetOrDie(target), done)

test/export/BUILD

@@ -0,0 +1,6 @@
+subinclude("//test/build_defs")
+
+plz_e2e_test(
+    name = "export_src_please_test",
+    cmd = "plz export --output plz-out/plzexport //src:please && plz --repo_root=$(plz query reporoot)/plz-out/plzexport build //src:please",
+)