tests: Factor OVSDB_INIT out of OVS_VSCTL_SETUP for other tests to use.

New tests in upcoming commits will use this.

diff --git a/tests/automake.mk b/tests/automake.mk
index ef8b7c308ebc99589f582540ab686cb16e7206ba..7a73a84f6a74838915967228014f606f1652bd6c 100644 (file)
--- a/tests/automake.mk
+++ b/tests/automake.mk
@@ -6,6 +6,7 @@ EXTRA_DIST += \
        $(srcdir)/tests/testsuite
 TESTSUITE_AT = \
        tests/testsuite.at \
+       tests/ovsdb-macros.at \
        tests/lcov-pre.at \
        tests/library.at \
        tests/vconn.at \

diff --git a/tests/ovs-vsctl.at b/tests/ovs-vsctl.at
index 22028d900eb8236069b6236d2fcde213ce2bf173..8f8354ab16afefba8fa1a8dc9a0af883d05a6774 100644 (file)
--- a/tests/ovs-vsctl.at
+++ b/tests/ovs-vsctl.at
@@ -3,23 +3,7 @@ dnl
 dnl Creates an empty database in the current directory and then starts
 dnl an ovsdb-server on it for ovs-vsctl to connect to.
 m4_define([OVS_VSCTL_SETUP],
-  [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 db $SCHEMA],
-     [0], [stdout], [ignore])
-   OVS_CHECK_LCOV(
-     [[ovsdb-tool transact db \
-        '[{"op": "insert",
-           "table": "Open_vSwitch",
-           "row": {}}]']],
-     [0], [ignore], [ignore])
+  [OVSDB_INIT([db])
    AT_CHECK([ovsdb-server --detach --pidfile=$PWD/pid --remote=punix:socket --unixctl=$PWD/unixctl db >/dev/null 2>&1], [0], [ignore], [ignore])])
 
 dnl OVS_VSCTL_CLEANUP

diff --git a/tests/ovsdb-macros.at b/tests/ovsdb-macros.at
new file mode 100644 (file)
index 0000000..96c273e
--- /dev/null
+++ b/tests/ovsdb-macros.at
@@ -0,0 +1,21 @@
+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],
+     [0], [stdout], [ignore])
+   OVS_CHECK_LCOV(
+     [[ovsdb-tool transact $1 \
+        '[{"op": "insert",
+           "table": "Open_vSwitch",
+           "row": {}}]']],
+     [0], [ignore], [ignore])])

diff --git a/tests/testsuite.at b/tests/testsuite.at
index f99b4389df7b357992b2b416eb415e3c0b7edaf8..4117f20151f5404fb11fdf6a7e700a9e18033c3b 100644 (file)
--- a/tests/testsuite.at
+++ b/tests/testsuite.at
@@ -32,7 +32,9 @@ m4_define([OVS_WAIT_UNTIL],
      done
      exit 1], [0], [ignore], [ignore])])
 
+m4_include([tests/ovsdb-macros.at])
 m4_include([tests/lcov-pre.at])
+
 m4_include([tests/library.at])
 m4_include([tests/vconn.at])
 m4_include([tests/dir_name.at])
@@ -46,4 +48,5 @@ m4_include([tests/reconnect.at])
 m4_include([tests/ovsdb.at])
 m4_include([tests/stp.at])
 m4_include([tests/ovs-vsctl.at])
+
 m4_include([tests/lcov-post.at])