diff options
author | Paul Boca <pboca@cloudbasesolutions.com> | 2016-06-26 12:12:23 +0000 |
---|---|---|
committer | Gurucharan Shetty <guru@ovn.org> | 2016-06-28 08:12:46 -0700 |
commit | 3a21992e21e2d8e707362afc80adb114214510a0 (patch) | |
tree | 5eb978086b14093f1cdb46164fd6bdf0d1f459fb /tests/pmd.at | |
parent | 81d2f75cfc760b0c5ba0c2d5a4c4b2b0f3854740 (diff) | |
download | openvswitch-3a21992e21e2d8e707362afc80adb114214510a0.tar.gz |
tests: Fixed PMD tests on Windows
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>
Acked-by: Alin Gabriel Serdean <aserdean@cloudbasesolutions.com>
Signed-off-by: Gurucharan Shetty <guru@ovn.org>
Diffstat (limited to 'tests/pmd.at')
-rw-r--r-- | tests/pmd.at | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/tests/pmd.at b/tests/pmd.at index ce22583e1..321676267 100644 --- a/tests/pmd.at +++ b/tests/pmd.at @@ -25,8 +25,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"]) |