X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=tests%2Ftestsuite.at;h=f4e80cafe20fffe8ee34462213442d25f49bf6a2;hb=11bbff1b79a97c377021560b8a262af95a0dd1b9;hp=f99b4389df7b357992b2b416eb415e3c0b7edaf8;hpb=d27ce5292c63d864dfa727e061f63b06ca770e19;p=openvswitch

diff --git a/tests/testsuite.at b/tests/testsuite.at
index f99b4389..f4e80caf 100644
--- a/tests/testsuite.at
+++ b/tests/testsuite.at
@@ -18,7 +18,7 @@ AT_TESTED([ovs-vswitchd])
 AT_TESTED([ovs-vsctl])
 AT_TESTED([perl])
 
-m4_define([OVS_WAIT_UNTIL],
+m4_define([OVS_WAIT],
   [AT_CHECK(
     [# First try a quick sleep, so that the test completes very quickly
      # in the normal case.  POSIX doesn't require fractional times to
@@ -30,10 +30,16 @@ m4_define([OVS_WAIT_UNTIL],
        sleep 1
        $1
      done
-     exit 1], [0], [ignore], [ignore])])
+     exit 1], [0], [ignore], [ignore], [$2])])
+
+m4_define([OVS_WAIT_UNTIL], [OVS_WAIT([if $1; then exit 0; fi], [$2])])
+m4_define([OVS_WAIT_WHILE], [OVS_WAIT([if $1; then :; else exit 0; fi], [$2])])
+
+m4_include([tests/ovsdb-macros.at])
 
-m4_include([tests/lcov-pre.at])
 m4_include([tests/library.at])
+m4_include([tests/check-structs.at])
+m4_include([tests/daemon.at])
 m4_include([tests/vconn.at])
 m4_include([tests/dir_name.at])
 m4_include([tests/aes128.at])
@@ -46,4 +52,4 @@ 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])
+m4_include([tests/interface-reconfigure.at])