X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;ds=sidebyside;f=tests%2Ftestsuite.at;h=2eab5814b3ce90908f74c9f84e55c9e820d97f4b;hb=431585099e82a88a23d5dec28138b5a3a8bb11da;hp=4117f20151f5404fb11fdf6a7e700a9e18033c3b;hpb=24c8ae53303ff25d118bb96d237da21a32085160;p=openvswitch

diff --git a/tests/testsuite.at b/tests/testsuite.at
index 4117f201..2eab5814 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,12 +30,17 @@ 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/classifier.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,7 +51,5 @@ m4_include([tests/timeval.at])
 m4_include([tests/lockfile.at])
 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])