Add --no-result option to suppress printing informational messages

5 files changed, 19 insertions, 27 deletions

diff --git a/tests/rep-auth.test b/tests/rep-auth.test
index 987a3fe..addaad3 100644
--- a/tests/rep-auth.test
+++ b/tests/rep-auth.test
@@ -611,7 +611,7 @@ sc = " " # Space character to append to here-document line when required.
       echo '\'                                >+rep/repositories.manifest;
 
       $rep_create --key $key rep &rep/packages.manifest 2>>/EOE != 0
-        adding foo 1
+        added foo 1
         error: invalid certificate for rep/: no email
         EOE
     }
@@ -626,7 +626,7 @@ sc = " " # Space character to append to here-document line when required.
       echo '\'                                >+rep/repositories.manifest;
 
       $rep_create --key $key rep &rep/packages.manifest 2>>/EOE != 0
-        adding foo 1
+        added foo 1
         error: certificate for repository rep/ has expired
         EOE
     }
diff --git a/tests/rep-create.test b/tests/rep-create.test
index 05aca20..7967181 100644
--- a/tests/rep-create.test
+++ b/tests/rep-create.test
@@ -28,7 +28,7 @@
     $clone_rep;
 
     $* 1/stable/ 2>>/~%EOE% &1/stable/packages.manifest;
-      adding foo 1
+      added foo 1
       %1 package\(s\) in .+/stable/%
       EOE
 
@@ -51,7 +51,7 @@
     $clone_rep;
 
     $* --key $key 1/stable/ 2>>/~%EOE% &1/stable/packages.manifest;
-      adding foo 1
+      added foo 1
       warning: --key option ignored
         info: repository manifest contains no certificate
         info: run 'bpkg help rep-create' for more information
@@ -96,7 +96,7 @@
 
     $* --key $key 1/stable/ 2>>/~%EOE% &1/stable/packages.manifest \
                                        &1/stable/signature.manifest;
-      adding foo 1
+      added foo 1
       %1 package\(s\) in .+/stable/%
       EOE
 
@@ -118,7 +118,7 @@
   :
   $clone_rep;
   $* 1/stable/ 2>>EOE &1/stable/packages.manifest != 0
-    adding foo 1
+    added foo 1
     error: --key option required
       info: repository manifest contains a certificate
       info: run 'bpkg help rep-create' for more information
@@ -144,7 +144,7 @@
   :
   $clone_rep;
   $* --ignore-unknown testing/ 2>>/~%EOE% &testing/packages.manifest
-    adding foo 2
+    added foo 2
     %1 package\(s\) in .+/testing/%
     EOE
 }
diff --git a/tests/rep-fetch-git-branch.test b/tests/rep-fetch-git-branch.test
index dfc9633..6e23e20 100644
--- a/tests/rep-fetch-git-branch.test
+++ b/tests/rep-fetch-git-branch.test
@@ -34,7 +34,7 @@ warning: fetching over dumb HTTP, no progress will be shown'
     warn1 = '%.{0}'
     warn2 = '%.{0}'
     warn3 = '%.{0}'
-    fetch = "%Fetching in '.+style/basic'.+%"
+    fetch = "%fetching in '.+style/basic'.+%"
     warn4 = '%.{0}'
   end;
 
@@ -46,15 +46,15 @@ warning: fetching over dumb HTTP, no progress will be shown'
     %Submodule 'libbar' .+ registered for path 'libbar'%
     $warn2
     %Cloning into '.+doc/style'.+%
-    %Submodule path 'doc/style': checked out .+%
+    %submodule path 'doc/style': checked out .+%
     %Submodule 'basic' .+ registered for path 'doc/style/basic'%
     $warn3
     %Cloning into '.+doc/style/basic'.+%
     $fetch
-    %Submodule path 'doc/style/basic': checked out .+%
+    %submodule path 'doc/style/basic': checked out .+%
     $warn4
     %Cloning into '.+libbar'.+%
-    %Submodule path 'libbar': checked out .+%
+    %submodule path 'libbar': checked out .+%
     1 package\(s\) in 1 repository\(s\)
     EOE
 }
@@ -81,7 +81,7 @@ warning: fetching over dumb HTTP, no progress will be shown'
     $* 2>>~"%EOE%"
       %fetching git:.+libfoo#$branch%
       $warn
-      %Fetching in '.+$branch'.+%
+      %fetching in '.+$branch'.+%
       1 package\(s\) in 1 repository\(s\)
       EOE
   }
@@ -134,15 +134,15 @@ warning: fetching over dumb HTTP, no progress will be shown'
     $* 2>>~"%EOE%" 1>&2;
       %fetching git:.+libfoo#$branch%
       $warn1
-      %Fetching in '.+$branch'.+%
+      %fetching in '.+$branch'.+%
       %warning: unable to rmdir '?libbar'?:.+%
       %Submodule 'libbaz' .+ registered for path 'libbaz'%
       $warn2
-      %Fetching in '.+doc/style'.+%
-      %Submodule path 'doc/style': checked out .+%
+      %fetching in '.+doc/style'.+%
+      %submodule path 'doc/style': checked out .+%
       $warn3
       %Cloning into '.+libbaz'.+%
-      %Submodule path 'libbaz': checked out .+%
+      %submodule path 'libbaz': checked out .+%
       1 package\(s\) in 1 repository\(s\)
       EOE
 
diff --git a/tests/rep-fetch-git-commit.test b/tests/rep-fetch-git-commit.test
index ba05de5..3169904 100644
--- a/tests/rep-fetch-git-commit.test
+++ b/tests/rep-fetch-git-commit.test
@@ -27,7 +27,7 @@ warning: fetching over dumb HTTP, no progress will be shown'
 
     if ($git_protocol == 'https-smart-unadv')
       warn  = '%.{0}'
-      fetch = "%Fetching in '.+$abbr_commit'.+%"
+      fetch = "%fetching in '.+$abbr_commit'.+%"
     else
       warn  = "warning: fetching whole repository history"
 
@@ -56,7 +56,7 @@ warning: fetching over dumb HTTP, no progress will be shown'
 
     if ($git_protocol == 'https-smart-unadv')
       warn  = '%.{0}'
-      fetch = "%Fetching in '.+$abbr_commit'.+%"
+      fetch = "%fetching in '.+$abbr_commit'.+%"
     else
       warn  = "warning: fetching whole branch history"
 
@@ -95,7 +95,7 @@ warning: fetching over dumb HTTP, no progress will be shown'
       fetch = '%.{0}'
     else
       warn  = '%.{0}'
-      fetch = "%Fetching in '.+$abbr_commit'.+%"
+      fetch = "%fetching in '.+$abbr_commit'.+%"
     end;
 
     $* 2>>~"%EOE%"
diff --git a/tests/rep-fetch.test b/tests/rep-fetch.test
index 2339b91..1ee0d4b 100644
--- a/tests/rep-fetch.test
+++ b/tests/rep-fetch.test
@@ -192,7 +192,6 @@ $* 2>>/EOE != 0
 
     $* --trust-yes $rep/bar/unstable 2>>EOE;
       added pkg:build2.org/rep-fetch/bar/unstable
-      fetching pkg:build2.org/rep-fetch/bar/unstable
       fetching pkg:build2.org/rep-fetch/bar/testing (complements pkg:build2.org/rep-fetch/bar/unstable)
       fetching pkg:build2.org/rep-fetch/bar/stable (complements pkg:build2.org/rep-fetch/bar/testing)
       fetching pkg:build2.org/rep-fetch/foo/stable (prerequisite of pkg:build2.org/rep-fetch/bar/stable)
@@ -201,7 +200,6 @@ $* 2>>/EOE != 0
       EOE
 
     $* 'pkg:build2.org/rep-fetch/bar/unstable' 2>>EOE;
-      fetching pkg:build2.org/rep-fetch/bar/unstable
       fetching pkg:build2.org/rep-fetch/bar/testing (complements pkg:build2.org/rep-fetch/bar/unstable)
       fetching pkg:build2.org/rep-fetch/bar/stable (complements pkg:build2.org/rep-fetch/bar/testing)
       fetching pkg:build2.org/rep-fetch/foo/stable (prerequisite of pkg:build2.org/rep-fetch/bar/stable)
@@ -228,7 +226,6 @@ $* 2>>/EOE != 0
 
     $* --trust-yes $rep/cycle/stable 2>>EOE;
       added pkg:build2.org/rep-fetch/cycle/stable
-      fetching pkg:build2.org/rep-fetch/cycle/stable
       fetching pkg:build2.org/rep-fetch/cycle/math (prerequisite of pkg:build2.org/rep-fetch/cycle/stable)
       fetching pkg:build2.org/rep-fetch/cycle/extra (prerequisite of pkg:build2.org/rep-fetch/cycle/math)
       3 package(s) in 3 repository(s)
@@ -269,7 +266,6 @@ $* 2>>/EOE != 0
 
       $* --trust-yes $rep/cycle/stable 2>>EOE;
         added pkg:build2.org/rep-fetch/cycle/stable
-        fetching pkg:build2.org/rep-fetch/cycle/stable
         fetching pkg:build2.org/rep-fetch/cycle/math (prerequisite of pkg:build2.org/rep-fetch/cycle/stable)
         fetching pkg:build2.org/rep-fetch/cycle/extra (prerequisite of pkg:build2.org/rep-fetch/cycle/math)
         3 package(s) in 3 repository(s)
@@ -277,7 +273,6 @@ $* 2>>/EOE != 0
 
       $* --trust-yes $stable_rep 2>>EOE;
         updated pkg:build2.org/rep-fetch/cycle/stable
-        fetching pkg:build2.org/rep-fetch/cycle/stable
         fetching pkg:build2.org/rep-fetch/cycle/extra (prerequisite of pkg:build2.org/rep-fetch/cycle/stable)
         2 package(s) in 2 repository(s)
         EOE
@@ -295,7 +290,6 @@ $* 2>>/EOE != 0
 
       $* --trust-yes $rep/cycle/stable 2>>EOE;
         added pkg:build2.org/rep-fetch/cycle/stable
-        fetching pkg:build2.org/rep-fetch/cycle/stable
         fetching pkg:build2.org/rep-fetch/cycle/math (prerequisite of pkg:build2.org/rep-fetch/cycle/stable)
         fetching pkg:build2.org/rep-fetch/cycle/extra (prerequisite of pkg:build2.org/rep-fetch/cycle/math)
         3 package(s) in 3 repository(s)
@@ -359,7 +353,6 @@ if ($remote != true)
     $* 2>!;
 
     $* "dir:($rep/libbar.git)" 2>>"EOE";
-      fetching dir:($rep/libbar.git)
       fetching dir:($rep/style-basic.git) \(prerequisite of dir:($rep/libbar.git)\)
       3 package\(s\) in 2 repository\(s\)
       EOE
@@ -382,7 +375,6 @@ if ($remote != true)
       $* 2>!;
 
       $* --shallow "dir:($rep/libbar.git)" 2>>"EOE";
-        fetching dir:($rep/libbar.git)
         3 package\(s\) in 2 repository\(s\)
         EOE