From: Ben Pfaff <blp@nicira.com>
Date: Tue, 26 Jan 2010 18:46:56 +0000 (-0800)
Subject: tests: Fix ovsdb tests.
X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=29381db022b1fd73c3d6e69150dd0cca64a59dfa;p=openvswitch

tests: Fix ovsdb tests.

This code was updated to use the new name of the schema, but I accidentally
left in the old code to check for the old schema's name.  This worked fine
in my own tests, because I still have a copy of that file sitting around,
but fails on "make distcheck" or a clean source dir.

So this commit deletes the code that checks for the old schema file.
---

diff --git a/tests/ovsdb-macros.at b/tests/ovsdb-macros.at
index c0033b33..298236d6 100644
--- a/tests/ovsdb-macros.at
+++ b/tests/ovsdb-macros.at
@@ -3,15 +3,7 @@ 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],
+     [ovsdb-tool create $1 $abs_top_srcdir/vswitchd/vswitch.ovsschema],
      [0], [stdout], [ignore])
    OVS_CHECK_LCOV(
      [[ovsdb-tool transact $1 \