From 54dce2b58b77dd8a5ff7c20a27b4bdbfec1c6e46 Mon Sep 17 00:00:00 2001
From: Karen Arutyunov <karen@codesynthesis.com>
Date: Thu, 16 Mar 2017 15:53:20 +0300
Subject: Make use of >! redirect in testscripts

---
 tests/pkg-build.test     | 12 ++++++------
 tests/pkg-clean.test     | 14 +++++++-------
 tests/pkg-configure.test | 10 +++++-----
 tests/pkg-drop.test      |  8 ++++----
 tests/pkg-fetch.test     |  6 +++---
 tests/pkg-purge.test     |  4 ++--
 tests/pkg-status.test    | 10 +++++-----
 tests/pkg-system.test    |  8 ++++----
 tests/pkg-unpack.test    |  8 ++++----
 tests/pkg-update.test    | 12 ++++++------
 tests/rep-auth.test      |  6 +++---
 tests/rep-fetch.test     |  4 ++--
 tests/rep-info.test      |  2 +-
 13 files changed, 52 insertions(+), 52 deletions(-)

diff --git a/tests/pkg-build.test b/tests/pkg-build.test
index 763574b..af9780b 100644
--- a/tests/pkg-build.test
+++ b/tests/pkg-build.test
@@ -50,7 +50,7 @@
 # Prepare repositories used by tests if running in the local mode.
 #
 +if ($remote != true)
-  rep_create += 2>-
+  rep_create += 2>!
 
   cp -r $src/t1  $out/t1  && $rep_create $out/t1  &$out/t1/packages
   cp -r $src/t2  $out/t2  && $rep_create $out/t2  &$out/t2/packages
@@ -62,14 +62,14 @@
   cp -r $src/t5  $out/t5  && $rep_create $out/t5  &$out/t5/packages
 end
 
-pkg_configure += -d cfg "config.cxx=$config.cxx" 2>-
+pkg_configure += -d cfg "config.cxx=$config.cxx" 2>!
 pkg_disfigure += -d cfg
-pkg_fetch     += -d cfg 2>-
+pkg_fetch     += -d cfg 2>!
 pkg_purge     += -d cfg
 pkg_status    += -d cfg
-pkg_unpack    += -d cfg 2>-
-rep_add       += -d cfg 2>-
-rep_fetch     += -d cfg --auth all --trust-yes 2>-
+pkg_unpack    += -d cfg 2>!
+rep_add       += -d cfg 2>!
+rep_fetch     += -d cfg --auth all --trust-yes 2>!
 
 : libfoo
 :
diff --git a/tests/pkg-clean.test b/tests/pkg-clean.test
index c090036..a853372 100644
--- a/tests/pkg-clean.test
+++ b/tests/pkg-clean.test
@@ -37,7 +37,7 @@
 # Prepare repositories used by tests if running in the local mode.
 #
 +if ($remote != true)
-  rep_create += 2>-
+  rep_create += 2>!
 
   # Create the signed 'hello' repository.
   #
@@ -46,14 +46,14 @@
   $rep_create --key $key $out/hello &$out/hello/packages &$out/hello/signature
 end
 
-pkg_configure += -d cfg "config.cxx=$config.cxx" 2>-
+pkg_configure += -d cfg "config.cxx=$config.cxx" 2>!
 pkg_disfigure += -d cfg
-pkg_fetch     += -d cfg 2>-
+pkg_fetch     += -d cfg 2>!
 pkg_purge     += -d cfg
-pkg_unpack    += -d cfg 2>-
-pkg_update    += -d cfg 2>-
-rep_add       += -d cfg 2>-
-rep_fetch     += -d cfg --auth all 2>-
+pkg_unpack    += -d cfg 2>!
+pkg_update    += -d cfg 2>!
+rep_add       += -d cfg 2>!
+rep_fetch     += -d cfg --auth all 2>!
 
 : no-name
 :
diff --git a/tests/pkg-configure.test b/tests/pkg-configure.test
index 098b1a9..d67e289 100644
--- a/tests/pkg-configure.test
+++ b/tests/pkg-configure.test
@@ -50,7 +50,7 @@
 # Prepare repositories used by tests if running in the local mode.
 #
 +if ($remote != true)
-  rep_create += 2>-
+  rep_create += 2>!
 
   # Create the signed 'hello' repository.
   #
@@ -67,12 +67,12 @@ end
 test.arguments += "config.cxx=$config.cxx"
 
 pkg_disfigure += -d cfg
-pkg_fetch     += -d cfg 2>-
+pkg_fetch     += -d cfg 2>!
 pkg_purge     += -d cfg
 pkg_status    += -d cfg
-pkg_unpack    += -d cfg 2>-
-rep_add       += -d cfg 2>-
-rep_fetch     += -d cfg --auth all 2>-
+pkg_unpack    += -d cfg 2>!
+rep_add       += -d cfg 2>!
+rep_fetch     += -d cfg --auth all 2>!
 
 : no-name
 :
diff --git a/tests/pkg-drop.test b/tests/pkg-drop.test
index 500d611..07c1f93 100644
--- a/tests/pkg-drop.test
+++ b/tests/pkg-drop.test
@@ -25,7 +25,7 @@
 # Prepare repositories used by tests if running in the local mode.
 #
 +if ($remote != true)
-  rep_create += 2>-
+  rep_create += 2>!
 
   cp -r $src/t4a $out/t4a && $rep_create $out/t4a &$out/t4a/packages
   cp -r $src/t4b $out/t4b && $rep_create $out/t4b &$out/t4b/packages
@@ -33,10 +33,10 @@
   cp -r $src/t4d $out/t4d && $rep_create $out/t4d &$out/t4d/packages
 end
 
-pkg_build  += -d cfg --yes 2>-
+pkg_build  += -d cfg --yes 2>!
 pkg_status += -d cfg
-rep_add    += -d cfg 2>-
-rep_fetch  += -d cfg --auth all --trust-yes 2>-
+rep_add    += -d cfg 2>!
+rep_fetch  += -d cfg --auth all --trust-yes 2>!
 
 : no-name
 :
diff --git a/tests/pkg-fetch.test b/tests/pkg-fetch.test
index 6689d3d..85afedb 100644
--- a/tests/pkg-fetch.test
+++ b/tests/pkg-fetch.test
@@ -18,7 +18,7 @@
 # Prepare repositories used by tests if running in the local mode.
 #
 +if ($remote != true)
-  rep_create += 2>-
+  rep_create += 2>!
 
   # Create the signed 'hello' repository.
   #
@@ -34,8 +34,8 @@ end
 pkg_purge  += -d cfg
 pkg_status += -d cfg
 pkg_unpack += -d cfg
-rep_add    += -d cfg 2>-
-rep_fetch  += -d cfg --auth all 2>-
+rep_add    += -d cfg 2>!
+rep_fetch  += -d cfg --auth all 2>!
 
 : no-archive
 :
diff --git a/tests/pkg-purge.test b/tests/pkg-purge.test
index 0f7b256..1c2bff6 100644
--- a/tests/pkg-purge.test
+++ b/tests/pkg-purge.test
@@ -14,8 +14,8 @@
 #     |-- buildfile
 #     `-- manifest
 
-pkg_fetch  += -d cfg 2>-
-pkg_unpack += -d cfg 2>-
+pkg_fetch  += -d cfg 2>!
+pkg_unpack += -d cfg 2>!
 pkg_status += -d cfg
 
 : no-name
diff --git a/tests/pkg-status.test b/tests/pkg-status.test
index ff7cab7..3c00e97 100644
--- a/tests/pkg-status.test
+++ b/tests/pkg-status.test
@@ -25,7 +25,7 @@
 # Prepare repositories used by tests if running in the local mode.
 #
 +if ($remote != true)
-  c = $rep_create 2>-
+  c = $rep_create 2>!
 
   cp -r $src/extra    $out/extra    && $c $out/extra    &$out/extra/packages
   cp -r $src/stable   $out/stable   && $c $out/stable   &$out/stable/packages
@@ -33,10 +33,10 @@
   cp -r $src/unstable $out/unstable && $c $out/unstable &$out/unstable/packages
 end
 
-pkg_fetch  += 2>-
-pkg_purge  += -d cfg 2>-
-rep_add    += -d cfg 2>-
-rep_fetch  += -d cfg --auth all --trust-yes 2>-
+pkg_fetch  += 2>!
+pkg_purge  += -d cfg 2>!
+rep_add    += -d cfg 2>!
+rep_fetch  += -d cfg --auth all --trust-yes 2>!
 
 : basics
 :
diff --git a/tests/pkg-system.test b/tests/pkg-system.test
index e8210f6..18d4347 100644
--- a/tests/pkg-system.test
+++ b/tests/pkg-system.test
@@ -34,7 +34,7 @@
 # Prepare repositories used by tests if running in the local mode.
 #
 +if ($remote != true)
-  rep_create += 2>-
+  rep_create += 2>!
 
   cp -r $src/t1 $out/t1 && $rep_create $out/t1 &$out/t1/packages
   cp -r $src/t2 $out/t2 && $rep_create $out/t2 &$out/t2/packages
@@ -42,10 +42,10 @@
 end
 
 pkg_build  += -d cfg --yes
-pkg_drop   += -d cfg --yes 2>-
+pkg_drop   += -d cfg --yes 2>!
 pkg_status += -d cfg
-rep_add    += -d cfg 2>-
-rep_fetch  += -d cfg --auth all --trust-yes 2>-
+rep_add    += -d cfg 2>!
+rep_fetch  += -d cfg --auth all --trust-yes 2>!
 
 # Note that when we fetch a package from remote repository the bpkg stderr
 # contains fetch program progress output, that comes prior the informational
diff --git a/tests/pkg-unpack.test b/tests/pkg-unpack.test
index 49faffa..337c939 100644
--- a/tests/pkg-unpack.test
+++ b/tests/pkg-unpack.test
@@ -23,7 +23,7 @@
 # Prepare repositories used by tests if running in the local mode.
 #
 +if ($remote != true)
-  rep_create += 2>-
+  rep_create += 2>!
 
   # Create the signed 'hello' repository.
   #
@@ -36,11 +36,11 @@
   cp -r $src/t1 $out/t1 && $rep_create $out/t1 &$out/t1/packages
 end
 
-pkg_fetch  += -d cfg 2>-
+pkg_fetch  += -d cfg 2>!
 pkg_purge  += -d cfg
 pkg_status += -d cfg
-rep_add    += -d cfg 2>-
-rep_fetch  += -d cfg --auth all 2>-
+rep_add    += -d cfg 2>!
+rep_fetch  += -d cfg --auth all 2>!
 
 : replace-with-existing
 :
diff --git a/tests/pkg-update.test b/tests/pkg-update.test
index c64b309..4e92650 100644
--- a/tests/pkg-update.test
+++ b/tests/pkg-update.test
@@ -37,7 +37,7 @@
 # Prepare repositories used by tests if running in the local mode.
 #
 +if ($remote != true)
-  rep_create += 2>-
+  rep_create += 2>!
 
   # Create the signed 'hello' repository.
   #
@@ -46,13 +46,13 @@
   $rep_create --key $key $out/hello &$out/hello/packages &$out/hello/signature
 end
 
-pkg_configure += -d cfg "config.cxx=$config.cxx" 2>-
+pkg_configure += -d cfg "config.cxx=$config.cxx" 2>!
 pkg_disfigure += -d cfg
-pkg_fetch     += -d cfg 2>-
+pkg_fetch     += -d cfg 2>!
 pkg_purge     += -d cfg
-pkg_unpack    += -d cfg 2>-
-rep_add       += -d cfg 2>-
-rep_fetch     += -d cfg --auth all 2>-
+pkg_unpack    += -d cfg 2>!
+rep_add       += -d cfg 2>!
+rep_fetch     += -d cfg --auth all 2>!
 
 # Sometimes we need to run underlying build update operation with -j 1 options
 # to have an output that we can match reliably.
diff --git a/tests/rep-auth.test b/tests/rep-auth.test
index 80e98de..b2331aa 100644
--- a/tests/rep-auth.test
+++ b/tests/rep-auth.test
@@ -25,7 +25,7 @@
 # Prepare repositories used by tests if running in the local mode.
 #
 +if ($remote != true)
-  rc = $rep_create 2>-
+  rc = $rep_create 2>!
 
   # Create the 'unsigned1' repository.
   #
@@ -82,7 +82,7 @@
 end
 
 pkg_status += -d cfg
-rep_add    += -d cfg 2>-
+rep_add    += -d cfg 2>!
 rep_fetch  += -d cfg
 
 # Check if rep-fetch command was successfull or not.
@@ -101,7 +101,7 @@ sc = " " # Space character to append to here-document line when required.
   +mkdir 1/
   +cp -r $src/unsigned $r
   +cat <<<$cert_manifest >+$r/repositories
-  +$rep_create --key $key $r &$r/packages &$r/signature 2>-
+  +$rep_create --key $key $r &$r/packages &$r/signature 2>!
 
   : rep-fetch
   :
diff --git a/tests/rep-fetch.test b/tests/rep-fetch.test
index e59ebf4..a733ee5 100644
--- a/tests/rep-fetch.test
+++ b/tests/rep-fetch.test
@@ -33,7 +33,7 @@
 # Prepare repositories used by tests if running in the local mode.
 #
 +if ($remote != true)
-  rep_create += 2>-
+  rep_create += 2>!
 
   # Create the signed 'hello' repository.
   #
@@ -57,7 +57,7 @@ end
 
 test.options += --auth all
 
-rep_add += -d cfg 2>-
+rep_add += -d cfg 2>!
 
 : no-repositories
 :
diff --git a/tests/rep-info.test b/tests/rep-info.test
index 43e455e..378ca51 100644
--- a/tests/rep-info.test
+++ b/tests/rep-info.test
@@ -14,7 +14,7 @@
 # Prepare repositories used by tests if running in the local mode.
 #
 +if ($remote != true)
-  rc = $rep_create 2>-
+  rc = $rep_create 2>!
 
   # Create the unsigned 'testing' repository.
   #
-- 
cgit v1.1