From 787b8706fe9f754863b6290ed9cefbc18667659b Mon Sep 17 00:00:00 2001
From: Dongbo Wang <dongbow@microsoft.com>
Date: Mon, 26 Feb 2018 15:17:37 -0800
Subject: [PATCH 1/4] Fix the terse output on Windows for unelevate test run

---
 build.psm1 | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/build.psm1 b/build.psm1
index 50e0475e22d..899b8b171a4 100644
--- a/build.psm1
+++ b/build.psm1
@@ -1097,6 +1097,9 @@ Restore the module to '$Pester' by running:
             $script:nonewline = $true
             $script:inerror = $false
         }
+        elseif ($trimmedline -match "\d+ms") {
+            continue
+        }
         else {
             if ($script:nonewline) {
                 Write-Host "`n" -NoNewline

From 14c0b75e0a1128f28c55468dc02b650b45b3b194 Mon Sep 17 00:00:00 2001
From: Dongbo Wang <dongbow@microsoft.com>
Date: Mon, 26 Feb 2018 15:31:58 -0800
Subject: [PATCH 2/4] Fix the mistake

---
 build.psm1 | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/build.psm1 b/build.psm1
index 899b8b171a4..9ad2c4fb07f 100644
--- a/build.psm1
+++ b/build.psm1
@@ -1098,7 +1098,7 @@ Restore the module to '$Pester' by running:
             $script:inerror = $false
         }
         elseif ($trimmedline -match "\d+ms") {
-            continue
+            return
         }
         else {
             if ($script:nonewline) {

From 93cf860737054aa045910dd26f91c599ba5b3399 Mon Sep 17 00:00:00 2001
From: Dongbo Wang <dongbow@microsoft.com>
Date: Mon, 26 Feb 2018 15:49:47 -0800
Subject: [PATCH 3/4] Make the regex pattern more accurate

---
 build.psm1 | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/build.psm1 b/build.psm1
index 9ad2c4fb07f..eaa6bfc2296 100644
--- a/build.psm1
+++ b/build.psm1
@@ -1097,7 +1097,7 @@ Restore the module to '$Pester' by running:
             $script:nonewline = $true
             $script:inerror = $false
         }
-        elseif ($trimmedline -match "\d+ms") {
+        elseif ($trimmedline -match "^\d+ms$") {
             return
         }
         else {

From 7bb00a77915724ea853d2ffe2c9de2f2b840e2d5 Mon Sep 17 00:00:00 2001
From: Dongbo Wang <dongbow@microsoft.com>
Date: Mon, 26 Feb 2018 16:08:59 -0800
Subject: [PATCH 4/4] Address Aditya's comment

---
 build.psm1 | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/build.psm1 b/build.psm1
index eaa6bfc2296..737bb16a7be 100644
--- a/build.psm1
+++ b/build.psm1
@@ -1097,7 +1097,8 @@ Restore the module to '$Pester' by running:
             $script:nonewline = $true
             $script:inerror = $false
         }
-        elseif ($trimmedline -match "^\d+ms$") {
+        elseif ($trimmedline -match "^\d+(\.\d+)?m?s$") {
+            # Skip the time elapse like '12ms', '1ms', '1.2s' and '12.53s'
             return
         }
         else {