X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=tests%2Fovsdb.at;h=1ee9c03785b3d37c3ba722bc10c9daf107e6a993;hb=79c9f2ee7883b52860c76c3730725f5731402874;hp=d3d53bcc7354b3671c942aab690c0470e4c6b5d0;hpb=41709cccb8099972f9c6c3faf583b1286cb92e8a;p=openvswitch

diff --git a/tests/ovsdb.at b/tests/ovsdb.at
index d3d53bcc..1ee9c037 100644
--- a/tests/ovsdb.at
+++ b/tests/ovsdb.at
@@ -1,16 +1,25 @@
+# OVSDB_CHECK_POSITIVE(TITLE, TEST-OVSDB-ARGS, OUTPUT, [KEYWORDS], [PREREQ])
+#
+# Runs "test-ovsdb TEST-OVSDB-ARGS" and checks that it exits with
+# status 0 and prints OUTPUT on stdout.
+#
+# TITLE is provided to AT_SETUP and KEYWORDS to AT_KEYWORDS.
 m4_define([OVSDB_CHECK_POSITIVE], 
   [AT_SETUP([$1])
-   m4_if([$5], [], [], 
-         [AT_XFAIL_IF([m4_version_prereq([$5], [false], [true])])])
    AT_KEYWORDS([ovsdb positive $4])
-   OVS_CHECK_LCOV([test-ovsdb $2], [0], [$3
+   AT_CHECK([test-ovsdb $2], [0], [$3
 ], [])
    AT_CLEANUP])
 
+# OVSDB_CHECK_NEGATIVE(TITLE, TEST-OVSDB-ARGS, OUTPUT, [KEYWORDS], [PREREQ])
+#
+# Runs "test-ovsdb TEST-OVSDB-ARGS" and checks that it exits with
+# status 1 and that its output on stdout contains substring OUTPUT.
+# TITLE is provided to AT_SETUP and KEYWORDS to AT_KEYWORDS.  
 m4_define([OVSDB_CHECK_NEGATIVE], 
   [AT_SETUP([$1])
    AT_KEYWORDS([ovsdb negative $4])
-   OVS_CHECK_LCOV([test-ovsdb $2], [1], [], [stderr])
+   AT_CHECK([test-ovsdb $2], [1], [], [stderr])
    m4_assert(m4_len([$3]))
    AT_CHECK(
      [if grep -F -e "AS_ESCAPE([$3])" stderr
@@ -28,8 +37,14 @@ m4_include([tests/ovsdb-data.at])
 m4_include([tests/ovsdb-column.at])
 m4_include([tests/ovsdb-table.at])
 m4_include([tests/ovsdb-row.at])
+m4_include([tests/ovsdb-schema.at])
 m4_include([tests/ovsdb-condition.at])
+m4_include([tests/ovsdb-mutation.at])
 m4_include([tests/ovsdb-query.at])
 m4_include([tests/ovsdb-transaction.at])
 m4_include([tests/ovsdb-execution.at])
 m4_include([tests/ovsdb-trigger.at])
+m4_include([tests/ovsdb-tool.at])
+m4_include([tests/ovsdb-server.at])
+m4_include([tests/ovsdb-monitor.at])
+m4_include([tests/ovsdb-idl.at])