X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;ds=sidebyside;f=tests%2Fovsdb-macros.at;h=ebe0d9de27a4c7957680fc35e54ba2cc9c51dbf8;hb=7446f1480bb27ccb63feab066d901cc940d52462;hp=96c273efaa293eed87acc6d82b22322ce8f0925f;hpb=24c8ae53303ff25d118bb96d237da21a32085160;p=openvswitch diff --git a/tests/ovsdb-macros.at b/tests/ovsdb-macros.at index 96c273ef..ebe0d9de 100644 --- a/tests/ovsdb-macros.at +++ b/tests/ovsdb-macros.at @@ -2,18 +2,10 @@ 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 $SCHEMA], + [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", "table": "Open_vSwitch",