X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=tests%2Fovsdb-execution.at;h=949ed5982966142762d837d8af0bb6774d27d4bd;hb=1335a8d578b03e276294b32df9702c2562705f22;hp=eec2a04cd95941309799d3a9146cc8da0ca42c60;hpb=2c487bc808ba6a4a297523f2c6b78ca3e358073a;p=sliver-openvswitch.git diff --git a/tests/ovsdb-execution.at b/tests/ovsdb-execution.at index eec2a04cd..949ed5982 100644 --- a/tests/ovsdb-execution.at +++ b/tests/ovsdb-execution.at @@ -141,7 +141,7 @@ m4_define([OVSDB_CHECK_EXECUTION], OVS_RUNDIR=`pwd`; export OVS_RUNDIR AT_CHECK([test-ovsdb execute "`$2`" m4_foreach([txn], [$3], [ 'txn'])], [0], [stdout], []) - AT_CHECK([perl $srcdir/uuidfilt.pl stdout], [0], [$4]) + AT_CHECK([${PERL} $srcdir/uuidfilt.pl stdout], [0], [$4]) AT_CLEANUP]) OVSDB_CHECK_EXECUTION([uuid-name must be ], @@ -177,7 +177,7 @@ OVSDB_CHECK_EXECUTION([duplicate uuid-name not allowed], [[[{"uuid":["uuid","<0>"]},{"details":"This \"uuid-name\" appeared on an earlier \"insert\" operation.","error":"duplicate uuid-name","syntax":"\"x\""}] ]]) -m4_define([EXECUTION_EXAMPLES], [ +m4_define([ONE_EXECUTION_EXAMPLE], [dnl dnl At one point the "commit" code ignored new rows with all-default values, dnl so this checks for that problem. OVSDB_CHECK_EXECUTION([insert default row, query table], @@ -193,7 +193,10 @@ OVSDB_CHECK_EXECUTION([insert default row, query table], [[[{"uuid":["uuid","<0>"]}] [{"rows":[{"_uuid":["uuid","<0>"],"_version":["uuid","<1>"],"name":"","number":0}]}] ]]) +]) +m4_define([EXECUTION_EXAMPLES], [ +ONE_EXECUTION_EXAMPLE OVSDB_CHECK_EXECUTION([insert row, query table], [ordinal_schema], [[[["ordinals",