Skip to content

Commit

Permalink
make work again
Browse files Browse the repository at this point in the history
  • Loading branch information
peterebden committed Nov 29, 2024
1 parent 2f7cb3a commit 9558a3a
Show file tree
Hide file tree
Showing 2 changed files with 1 addition and 7 deletions.
5 changes: 0 additions & 5 deletions src/parse/asp/builtins.go
Original file line number Diff line number Diff line change
Expand Up @@ -402,11 +402,6 @@ func subincludeTarget(s *scope, l core.BuildLabel) *core.BuildTarget {
s.Error("Failed to activate subinclude target: %v", err)
}
}
} else if isLocal && s.pkg == nil {
// The subinclude is local to this package but we didn't hit the part above.
// This is almost certainly going to cause problems sooner or later; we will probably
// lock up having not activated it.
s.Error("Cannot make package-local subincludes from within another subinclude")
}

t := s.WaitForSubincludedTarget(l, pkgLabel)
Expand Down
3 changes: 1 addition & 2 deletions test/double_local_subinclude/BUILD
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,6 @@ subinclude("//test/build_defs")

please_repo_e2e_test(
name = "double_local_subinclude_test",
plz_command = "plz build -p -v 2 //...",
expected_failure = True,
plz_command = "for i in `seq 1 20`; do plz build -p -v 2 //...; done",
repo = "test_repo",
)

0 comments on commit 9558a3a

Please sign in to comment.