From 9558a3a39d69721a7e23d0d6c389928c064ecf14 Mon Sep 17 00:00:00 2001 From: Peter Ebden Date: Fri, 29 Nov 2024 11:01:54 +0000 Subject: [PATCH] make work again --- src/parse/asp/builtins.go | 5 ----- test/double_local_subinclude/BUILD | 3 +-- 2 files changed, 1 insertion(+), 7 deletions(-) diff --git a/src/parse/asp/builtins.go b/src/parse/asp/builtins.go index a4e5c0c10..c8bd6253b 100644 --- a/src/parse/asp/builtins.go +++ b/src/parse/asp/builtins.go @@ -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) diff --git a/test/double_local_subinclude/BUILD b/test/double_local_subinclude/BUILD index 4c3f30d5b..94140c0d1 100644 --- a/test/double_local_subinclude/BUILD +++ b/test/double_local_subinclude/BUILD @@ -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", )