Cleanly separate IDL annotations from OVSDB schema information.

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

diff --git a/tests/ovsdb-idl.at b/tests/ovsdb-idl.at
index 0ce6535..d16982b 100644 (file)
--- a/tests/ovsdb-idl.at
+++ b/tests/ovsdb-idl.at
@@ -17,17 +17,8 @@ AT_BANNER([OVSDB -- interface description language (IDL)])
 m4_define([OVSDB_CHECK_IDL], 
   [AT_SETUP([$1])
    AT_KEYWORDS([ovsdb server idl positive $5])
-   OVS_CHECK_LCOV(
-     [SCHEMA=$abs_builddir/idltest.ovsschema
-      if test ! -e $SCHEMA; then
-        SCHEMA=$abs_srcdir/idltest.ovsschema
-          if test ! -e $SCHEMA; then
-            echo 'Failed to find idltest.ovsschema'
-            exit 1
-          fi
-      fi
-      ovsdb-tool create db $SCHEMA],
-     [0], [stdout], [ignore])
+   OVS_CHECK_LCOV([ovsdb-tool create db $abs_srcdir/idltest.ovsschema],
+                  [0], [stdout], [ignore])
    AT_CHECK([ovsdb-server '-vPATTERN:console:ovsdb-server|%c|%m' --detach --pidfile=$PWD/server-pid --remote=punix:socket --unixctl=$PWD/unixctl db], [0], [ignore], [ignore])
    m4_if([$2], [], [],
      [OVS_CHECK_LCOV([ovsdb-client transact unix:socket $2], [0], [ignore], [ignore], [kill `cat server-pid`])])