From 3a72938103d0e5577aa817e047a5b1d9427421b5 Mon Sep 17 00:00:00 2001
From: Karen Arutyunov <karen@codesynthesis.com>
Date: Mon, 6 May 2019 22:58:35 +0300
Subject: Disable progress indication tests on Windows

---
 tests/ci.testscript      | 15 ++++++++-------
 tests/publish.testscript | 10 +++++-----
 2 files changed, 13 insertions(+), 12 deletions(-)

diff --git a/tests/ci.testscript b/tests/ci.testscript
index 986648f..7b7e180 100644
--- a/tests/ci.testscript
+++ b/tests/ci.testscript
@@ -60,9 +60,9 @@ init += $cxx -d prj 2>! &prj/**/bootstrap/***
 windows = ($cxx.target.class == 'windows')
 
 # Normally we disable the progress indication that complicates stderr output
-# validation. When testing the progress indication specifically we need to
-# handle curl's progress carefully, as it is not always terminated with the
-# newline character on Windows.
+# validation. We also disable the progress indication test on Windows, as
+# curl's progress is not always properly terminated there, messing up with
+# the subsequent output.
 #
 : single-pkg
 :
@@ -81,6 +81,7 @@ windows = ($cxx.target.class == 'windows')
 
   : progress
   :
+  if! $windows
   {
     $clone_root_prj;
     $init -C @cfg &prj-cfg/***;
@@ -88,7 +89,7 @@ windows = ($cxx.target.class == 'windows')
     $* 2>>~"%EOE%"
       submitting to $server
       %.*
-      %.*CI request is queued.*%
+      %CI request is queued.*%
       %reference: .+%
       EOE
   }
@@ -145,6 +146,8 @@ windows = ($cxx.target.class == 'windows')
     +$clone_root_prj
     +$init -C @cfg &prj-cfg/***
 
+    test.options += --no-progress
+
     : valid
     :
     : Here we only test that bdep-ci does not fail for valid overrides. It
@@ -164,9 +167,7 @@ windows = ($cxx.target.class == 'windows')
          --override 'builds: &gcc' \
          --override 'build-include: linux*' \
          --override 'build-exclude: *' 2>>~"%EOE%"
-        submitting to $server
-        %.*
-        %.*CI request is queued.*%
+        %CI request is queued.*%
         %reference: .+%
         EOE
     }
diff --git a/tests/publish.testscript b/tests/publish.testscript
index 9712cf4..a79657f 100644
--- a/tests/publish.testscript
+++ b/tests/publish.testscript
@@ -47,9 +47,9 @@ g = git -C prj >! 2>!
 #
 
 # Normally we disable the progress indication that complicates stderr output
-# validation. When testing the progress indication specifically we need to
-# handle curl's progress carefully, as it is not always terminated with the
-# newline character on Windows.
+# validation. We also disable the progress indication test on Windows, as
+# curl's progress is not always properly terminated there, messing up with
+# the subsequent output.
 #
 : submit
 :
@@ -80,6 +80,7 @@ g = git -C prj >! 2>!
 
     : progress
     :
+    if! $windows
     {
       $clone_root_prj;
       $init -C @cfg &prj-cfg/***;
@@ -90,7 +91,7 @@ g = git -C prj >! 2>!
           upgrade prj/1.0.19
         submitting prj-1.0.19.tar.gz
         %.*
-        %.*package submission is queued(: \.*prj/1.0.19)?%d
+        %package submission is queued(: \.*prj/1.0.19)?%d
         %reference: .{12}%
         EOE
     }
@@ -421,7 +422,6 @@ g = git -C prj >! 2>!
       %.*
       submitting prj-1.0.8.tar.gz
       %.+
-      %.*package submission is queued(: \.*prj/1.0.8)?%d
       %reference: .{12}%
       EOE
 
-- 
cgit v1.1