X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=tests%2Fovsdb-monitor.at;h=d24ae9179b53a59317ed28e8b88caf264fc468ed;hb=e379e4d167e31d1cd5f7b86fff091a2e09ff6e45;hp=167b44c355f323a83cbfa5efc5ca98f47db8d3ca;hpb=77a922c7e53c3e9a2618d1f1a622bb2442f535b0;p=sliver-openvswitch.git diff --git a/tests/ovsdb-monitor.at b/tests/ovsdb-monitor.at index 167b44c35..d24ae9179 100644 --- a/tests/ovsdb-monitor.at +++ b/tests/ovsdb-monitor.at @@ -19,6 +19,7 @@ AT_BANNER([OVSDB -- ovsdb-server monitors]) m4_define([OVSDB_CHECK_MONITOR], [AT_SETUP([$1]) AT_KEYWORDS([ovsdb server monitor positive $9]) + OVS_RUNDIR=`pwd`; export OVS_RUNDIR $2 > schema AT_CHECK([ovsdb-tool create db schema], [0], [stdout], [ignore]) m4_foreach([txn], [$3], @@ -35,7 +36,7 @@ m4_define([OVSDB_CHECK_MONITOR], [ignore], [ignore], [kill `cat server-pid client-pid`]) AT_CHECK([ovs-appctl -t "`pwd`"/unixctl -e exit], [0], [ignore], [ignore]) OVS_WAIT_UNTIL([test ! -e server-pid && test ! -e client-pid]) - AT_CHECK([perl $srcdir/ovsdb-monitor-sort.pl < output | perl $srcdir/uuidfilt.pl], [0], [$7], [ignore]) + AT_CHECK([${PERL} $srcdir/ovsdb-monitor-sort.pl < output | ${PERL} $srcdir/uuidfilt.pl], [0], [$7], [ignore]) AT_CLEANUP]) OVSDB_CHECK_MONITOR([monitor insert into empty table], @@ -212,7 +213,7 @@ OVSDB_CHECK_MONITOR([monitor weak reference change], row,action,a,a2a,a2a1,a2b,_version <0>,delete,0,"[""set"",[]]","[""uuid"",""<0>""]","[""uuid"",""<1>""]","[""uuid"",""<2>""]" -<3>,old,,"[""uuid"",""<0>""]",,, +<3>,old,,"[""uuid"",""<0>""]",,,"[""uuid"",""<4>""]" ,new,1,"[""set"",[]]","[""uuid"",""<3>""]","[""uuid"",""<1>""]","[""uuid"",""<5>""]" ]])