diff mbox

[ovs-dev,01/16] tests: Fixed PMD tests on Windows

Message ID 1466179424-75840-2-git-send-email-pboca@cloudbasesolutions.com
State Superseded
Headers show

Commit Message

Paul Boca June 17, 2016, 4:06 p.m. UTC 
CHECK_CPU_DISCOVERED check the log file now, not the stderr.
On Windows the ovs-vswitchd output is logged only in log file, not to stderr.
Tested both on Windows and Linux

Signed-off-by: Paul-Daniel Boca <pboca@cloudbasesolutions.com>
---
 tests/pmd.at | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
diff mbox

Patch

diff --git a/tests/pmd.at b/tests/pmd.at
index 3d219ff..1965251 100644
--- a/tests/pmd.at
+++ b/tests/pmd.at
@@ -7,8 +7,8 @@  dnl is greater or equal to 'n_cpu'. Without parameters checks that at
 dnl least one CPU discovered.
 m4_define([CHECK_CPU_DISCOVERED], [
     PATTERN="Discovered [[0-9]]* NUMA nodes and [[0-9]]* CPU cores"
-    OVS_WAIT_UNTIL([grep "$PATTERN" stderr])
-    N_CPU=$(grep "$PATTERN" stderr | sed -e 's/.* \([[0-9]]*\) CPU cores/\1/')
+    OVS_WAIT_UNTIL([grep "$PATTERN" ovs-vswitchd.log])
+    N_CPU=$(grep "$PATTERN" ovs-vswitchd.log | sed -e 's/.* \([[0-9]]*\) CPU cores/\1/')
     if [[ -z "$1" ]]
         then AT_CHECK([test "$N_CPU" -gt "0"])
         else AT_SKIP_IF([test "$N_CPU" -lt "$1"])