X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=tests%2Fovsdb-tool.at;h=3282e0e3cdce94f68bfbfd2948a1594ba8a65a63;hb=2b13d312fc4d6e5eb1d0e3004fa523bb0c0ba544;hp=e4f4a29e9e6f823c8dbc68c67738458eff9e6449;hpb=a35ae81c6f79ab24e621a9d155538f5b88c5c2ac;p=sliver-openvswitch.git diff --git a/tests/ovsdb-tool.at b/tests/ovsdb-tool.at index e4f4a29e9..3282e0e3c 100644 --- a/tests/ovsdb-tool.at +++ b/tests/ovsdb-tool.at @@ -16,6 +16,7 @@ AT_BANNER([OVSDB -- ovsdb-tool]) m4_define([OVSDB_CHECK_EXECUTION], [AT_SETUP([$1]) AT_KEYWORDS([ovsdb file positive $5]) + OVS_RUNDIR=`pwd`; export OVS_RUNDIR $2 > schema touch .db.~lock~ AT_CHECK([ovsdb-tool create db schema], [0], [stdout], [ignore]) @@ -23,7 +24,7 @@ m4_define([OVSDB_CHECK_EXECUTION], [AT_CHECK([ovsdb-tool transact db 'txn'], [0], [stdout], [ignore]) cat stdout >> output ]) - AT_CHECK([perl $srcdir/uuidfilt.pl output], [0], [$4]) + AT_CHECK([${PERL} $srcdir/uuidfilt.pl output], [0], [$4]) AT_CLEANUP]) EXECUTION_EXAMPLES @@ -40,7 +41,7 @@ AT_CHECK([[ovsdb-tool transact db ' "row": {"name": "five", "number": 5}}, {"op": "comment", "comment": "add row for 5"}]']], [0], [stdout], [ignore]) -AT_CHECK([perl $srcdir/uuidfilt.pl stdout], [0], +AT_CHECK([${PERL} $srcdir/uuidfilt.pl stdout], [0], [[[{"uuid":["uuid","<0>"]},{}] ]]) AT_CHECK([grep "add row for 5" db], [0], [ignore]) @@ -48,6 +49,7 @@ AT_CLEANUP AT_SETUP([ovsdb-tool compact]) AT_KEYWORDS([ovsdb file positive]) +OVS_RUNDIR=`pwd`; export OVS_RUNDIR ordinal_schema > schema dnl Make sure that "ovsdb-tool create" works with a dangling symlink, dnl creating the target of the symlink rather than replacing the symlink @@ -89,7 +91,7 @@ AT_CHECK( done]], [0], [stdout], [ignore]) dnl Check that all the crap is in fact in the database log. -AT_CHECK([[perl $srcdir/uuidfilt.pl db | grep -v ^OVSDB | sed 's/"_date":[0-9]*/"_date":0/' | test-json --multiple -]], [0], +AT_CHECK([[${PERL} $srcdir/uuidfilt.pl db | grep -v ^OVSDB | sed 's/"_date":[0-9]*/"_date":0/' | test-json --multiple -]], [0], [[{"cksum":"12345678 9","name":"ordinals","tables":{"ordinals":{"columns":{"name":{"type":"string"},"number":{"type":"integer"}},"indexes":[["number"]]}},"version":"5.1.3"} {"_comment":"add row for zero 0","_date":0,"ordinals":{"<0>":{"name":"zero"}}} {"_comment":"delete row for 0","_date":0,"ordinals":{"<0>":null}} @@ -113,7 +115,7 @@ AT_CHECK([[perl $srcdir/uuidfilt.pl db | grep -v ^OVSDB | sed 's/"_date":[0-9]*/ dnl Dump out and check the actual database contents. AT_CHECK([[ovsdb-server --unixctl="`pwd`"/unixctl --remote=punix:socket --run "ovsdb-client dump unix:socket ordinals" db]], [0], [stdout], [ignore]) -AT_CHECK([perl $srcdir/uuidfilt.pl stdout], [0], [dnl +AT_CHECK([${PERL} $srcdir/uuidfilt.pl stdout], [0], [dnl ordinals table _uuid name number ------------------------------------ ----- ------ @@ -140,7 +142,7 @@ AT_CHECK([test `wc -l < db` -eq 4]) dnl And check that the dumped data is the same too: AT_CHECK([[ovsdb-server --unixctl="`pwd`"/unixctl --remote=punix:socket --run "ovsdb-client dump unix:socket ordinals" db]], [0], [stdout], [ignore]) -AT_CHECK([perl $srcdir/uuidfilt.pl stdout], [0], [dnl +AT_CHECK([${PERL} $srcdir/uuidfilt.pl stdout], [0], [dnl ordinals table _uuid name number ------------------------------------ ----- ------ @@ -155,6 +157,7 @@ AT_CLEANUP AT_SETUP([ovsdb-tool convert -- removing a column]) AT_KEYWORDS([ovsdb file positive]) +OVS_RUNDIR=`pwd`; export OVS_RUNDIR ordinal_schema > schema AT_DATA([new-schema], [[{"name": "ordinals", @@ -181,7 +184,7 @@ AT_CHECK( dnl Dump out and check the actual database contents. AT_CHECK([[ovsdb-server --unixctl="`pwd`"/unixctl --remote=punix:socket --run "ovsdb-client dump unix:socket ordinals" db]], [0], [stdout], [ignore]) -AT_CHECK([perl $srcdir/uuidfilt.pl stdout], [0], [dnl +AT_CHECK([${PERL} $srcdir/uuidfilt.pl stdout], [0], [dnl ordinals table _uuid name number ------------------------------------ ----- ------ @@ -203,7 +206,7 @@ AT_CHECK([test `wc -l < db` -eq 4]) dnl And check that the dumped data is the same except for the removed column: AT_CHECK([[ovsdb-server --unixctl="`pwd`"/unixctl --remote=punix:socket --run "ovsdb-client dump unix:socket ordinals" db]], [0], [stdout], [ignore]) -AT_CHECK([perl $srcdir/uuidfilt.pl stdout], [0], [dnl +AT_CHECK([${PERL} $srcdir/uuidfilt.pl stdout], [0], [dnl ordinals table _uuid number ------------------------------------ ------ @@ -218,6 +221,7 @@ AT_CLEANUP AT_SETUP([ovsdb-tool convert -- adding a column]) AT_KEYWORDS([ovsdb file positive]) +OVS_RUNDIR=`pwd`; export OVS_RUNDIR AT_DATA([schema], [[{"name": "ordinals", "tables": { @@ -243,7 +247,7 @@ AT_CHECK( dnl Dump out and check the actual database contents. AT_CHECK([[ovsdb-server --unixctl="`pwd`"/unixctl --remote=punix:socket --run "ovsdb-client dump unix:socket ordinals" db]], [0], [stdout], [ignore]) -AT_CHECK([perl $srcdir/uuidfilt.pl stdout], [0], [dnl +AT_CHECK([${PERL} $srcdir/uuidfilt.pl stdout], [0], [dnl ordinals table _uuid number ------------------------------------ ------ @@ -265,7 +269,7 @@ AT_CHECK([test `wc -l < db` -eq 4]) dnl And check that the dumped data is the same except for the added column: AT_CHECK([[ovsdb-server --unixctl="`pwd`"/unixctl --remote=punix:socket --run "ovsdb-client dump unix:socket ordinals" db]], [0], [stdout], [ignore]) -AT_CHECK([perl $srcdir/uuidfilt.pl stdout], [0], [dnl +AT_CHECK([${PERL} $srcdir/uuidfilt.pl stdout], [0], [dnl ordinals table _uuid name number ------------------------------------ ---- ------