From 4cb81fd80a63004c08ba49ce9265318d5ba39082 Mon Sep 17 00:00:00 2001
From: Karen Arutyunov <karen@codesynthesis.com>
Date: Wed, 2 Feb 2022 16:20:02 +0300
Subject: Adapt to *-build values added to package manifest

---
 brep/handler/submit/submit.bash.in |  8 ++++----
 tests/ci/ci-load.testscript        | 38 +++++++++++++++++++++++++++++++++++++-
 2 files changed, 41 insertions(+), 5 deletions(-)

diff --git a/brep/handler/submit/submit.bash.in b/brep/handler/submit/submit.bash.in
index 667bbc1..f7e5124 100644
--- a/brep/handler/submit/submit.bash.in
+++ b/brep/handler/submit/submit.bash.in
@@ -47,10 +47,10 @@ function extract_package_manifest () # <archive> <manifest>
   local arc="$1"
   local man="$2"
 
-  # Pass the --deep option to make sure that the *-file manifest values are
-  # resolvable, so rep-create will not fail due to this package down the road.
-  # Note that we also make sure that all the manifest values are known (see
-  # bpkg-pkg-verify for details).
+  # Pass the --deep option to make sure that the bootstrap buildfile is
+  # present and the *-file manifest values are resolvable, so rep-create will
+  # not fail due to this package down the road. Note that we also make sure
+  # that all the manifest values are known (see bpkg-pkg-verify for details).
   #
   if ! run_silent bpkg pkg-verify --deep --manifest "$arc" >"$man"; then
 
diff --git a/tests/ci/ci-load.testscript b/tests/ci/ci-load.testscript
index 57fa9d1..eb9ba7c 100644
--- a/tests/ci/ci-load.testscript
+++ b/tests/ci/ci-load.testscript
@@ -105,6 +105,14 @@
         email: user@example.org
         %depends: \\* build2 .+%
         %depends: \\* bpkg .+%
+        bootstrap-build:\\
+        project = libhello
+        %.+
+        \\
+        root-build:\\
+        cxx.std = latest
+        %.+
+        \\
         location: libhello
         %fragment: .+%
         :
@@ -116,6 +124,14 @@
         email: user@example.org
         %depends: \\* build2 .+%
         %depends: \\* bpkg .+%
+        bootstrap-build:\\
+        project = hello
+        %.+
+        \\
+        root-build:\\
+        cxx.std = latest
+        %.+
+        \\
         location: hello
         %fragment: .+%
         EOE
@@ -148,6 +164,14 @@
         email: user@example.org
         %depends: \\* build2 .+%
         %depends: \\* bpkg .+%
+        bootstrap-build:\\
+        project = hello
+        %.+
+        \\
+        root-build:\\
+        cxx.std = latest
+        %.+
+        \\
         location: hello
         %fragment: .+%
         EOE
@@ -181,6 +205,14 @@
         email: user@example.org
         %depends: \\* build2 .+%
         %depends: \\* bpkg .+%
+        bootstrap-build:\\
+        project = libhello
+        %.+
+        \\
+        root-build:\\
+        cxx.std = latest
+        %.+
+        \\
         location: libhello
         %fragment: .+%
         EOE
@@ -200,7 +232,11 @@
         %.
         reference: $request_id
         EOO
-        %.*:.*%+
+        %.+cache:cache%
+        : 1
+        %.+
+        : 1
+        %.+
         EOE
     }
   }
-- 
cgit v1.1