From 88b90dd8326328503cdecfc0271f4be02fdc214b Mon Sep 17 00:00:00 2001
From: Boris Kolpackov <boris@codesynthesis.com>
Date: Mon, 15 Aug 2022 08:48:09 +0200
Subject: Improve diagnostics for unknown system package

---
 tests/pkg-build.testscript  | 10 ++++++++--
 tests/pkg-system.testscript | 26 +++++++++++++++++---------
 2 files changed, 25 insertions(+), 11 deletions(-)

(limited to 'tests')

diff --git a/tests/pkg-build.testscript b/tests/pkg-build.testscript
index 6a33757..198e319 100644
--- a/tests/pkg-build.testscript
+++ b/tests/pkg-build.testscript
@@ -2175,7 +2175,10 @@ test.options += --no-progress
     $rep_fetch $rep/t0c;
 
     $* '?libbux'      2>'error: unknown package libbux' != 0;
-    $* '?sys:libbux'  2>'error: unknown package sys:libbux' != 0;
+    $* '?sys:libbux'  2>>EOE != 0;
+      error: unknown package sys:libbux
+        info: consider specifying sys:libbux/*
+      EOE
     $* '?libbar/1.3'  2>'error: unknown package libbar/1.3' != 0;
     $* '?libbar[5 7]' 2>"error: unknown package 'libbar [5 7]'" != 0
   }
@@ -2242,7 +2245,10 @@ test.options += --no-progress
       %.+
       EOE
 
-    $* libfoo '?sys:libhello' 2>'error: unknown package sys:libhello' != 0;
+    $* libfoo '?sys:libhello' 2>>EOE != 0;
+      error: unknown package sys:libhello
+        info: consider specifying sys:libhello/*
+      EOE
 
     $* "sys:libhello/2.0@$rep/t0a" --trust-yes 2>>~%EOE% != 0;
       %.+
diff --git a/tests/pkg-system.testscript b/tests/pkg-system.testscript
index e300afd..fc4f707 100644
--- a/tests/pkg-system.testscript
+++ b/tests/pkg-system.testscript
@@ -52,10 +52,9 @@ rep_remove += -d cfg 2>!
 {
   $clone_cfg;
 
-  $pkg_build 'sys:libbar' 2>>/EOE != 0;
-    error: unknown package libbar
-      info: configuration cfg/ has no repositories
-      info: use 'bpkg rep-add' to add a repository
+  $pkg_build 'sys:libbar' 2>>EOE != 0;
+    error: unknown package sys:libbar
+      info: consider specifying sys:libbar/*
     EOE
 
   $pkg_build 'sys:libbar/1' 2>>EOE;
@@ -851,7 +850,8 @@ rep_remove += -d cfg 2>!
       EOE
 
     $pkg_build 'sys:libbar' 2>>EOE != 0;
-      error: unknown package libbar
+      error: unknown package sys:libbar
+        info: consider specifying sys:libbar/*
       EOE
 
     $pkg_build foo 'sys:libbar/1' 2>>EOE != 0;
@@ -899,10 +899,18 @@ rep_remove += -d cfg 2>!
     # Fail as libbar while being selected is still unknown (not present in t3
     # repo).
     #
-    $pkg_build 'sys:libbar'     2>'error: unknown package libbar' != 0;
-    $pkg_build foo 'sys:libbar' 2>'error: unknown package libbar' != 0;
-    $pkg_status foo             1>'!foo configured 2';
-    $pkg_status libbar          1>'libbar configured,system !2';
+    $pkg_build 'sys:libbar' 2>>EOE != 0;
+      error: unknown package sys:libbar
+        info: consider specifying sys:libbar/*
+      EOE
+
+    $pkg_build foo 'sys:libbar' 2>>EOE != 0;
+      error: unknown package sys:libbar
+        info: consider specifying sys:libbar/*
+      EOE
+
+    $pkg_status foo    1>'!foo configured 2';
+    $pkg_status libbar 1>'libbar configured,system !2';
 
     # Build foo and ?sys:libbar/3.
     #
-- 
cgit v1.1