X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=tests%2Fovsdb-macros.at;h=c1aa619c3a951a79794c50633c5012dedbea722b;hb=81816a5fe8ddd96a296fabc8ea8069e9a19a2631;hp=c0033b337892bef03fb3bffb6983126015223fc4;hpb=00732bf5b5da6f1d71dc4f4b42f54224c03f71f6;p=openvswitch diff --git a/tests/ovsdb-macros.at b/tests/ovsdb-macros.at index c0033b33..c1aa619c 100644 --- a/tests/ovsdb-macros.at +++ b/tests/ovsdb-macros.at @@ -2,20 +2,13 @@ dnl OVSDB_INIT([$1]) dnl dnl Creates an empty database named $1. m4_define([OVSDB_INIT], - [OVS_CHECK_LCOV( - [SCHEMA=$abs_top_builddir/vswitchd/vswitch-idl.ovsschema - if test ! -e $SCHEMA; then - SCHEMA=$abs_top_srcdir/vswitchd/vswitch-idl.ovsschema - if test ! -e $SCHEMA; then - echo 'Failed to find vswitch-idl.ovsschema' - exit 1 - fi - fi - ovsdb-tool create $1 $abs_top_srcdir/vswitchd/vswitch.ovsschema], + [AT_CHECK( + [ovsdb-tool create $1 $abs_top_srcdir/vswitchd/vswitch.ovsschema], [0], [stdout], [ignore]) - OVS_CHECK_LCOV( + AT_CHECK( [[ovsdb-tool transact $1 \ - '[{"op": "insert", + '["Open_vSwitch", + {"op": "insert", "table": "Open_vSwitch", "row": {}}]']], [0], [ignore], [ignore])])