Setting tag sliver-openvswitch-2.2.90-1

[sliver-openvswitch.git] / tests / ovsdb-macros.at

diff --git a/tests/ovsdb-macros.at b/tests/ovsdb-macros.at
index c0033b3..2aa752b 100644 (file)
--- a/tests/ovsdb-macros.at
+++ b/tests/ovsdb-macros.at
@@ -2,20 +2,14 @@ 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],
+  [OVS_RUNDIR=`pwd`; export OVS_RUNDIR
+   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])])