On 26 June 2016 at 05:12, Paul Boca <pb...@cloudbasesolutions.com> wrote:
> 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 <pb...@cloudbasesolutions.com> > Thank you, applied. The tests the in pmd.at looks very linux specific. If you get hit with more issues, you can consider skipping these tests for Windows. > --- > V2: No changes > V3: No changes > V4: No changes > --- > tests/pmd.at | 4 ++-- > 1 file changed, 2 insertions(+), 2 deletions(-) > > diff --git a/tests/pmd.at b/tests/pmd.at > index ce22583..3216762 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"]) > -- > 2.7.2.windows.1 > _______________________________________________ > dev mailing list > dev@openvswitch.org > http://openvswitch.org/mailman/listinfo/dev > _______________________________________________ dev mailing list dev@openvswitch.org http://openvswitch.org/mailman/listinfo/dev
