X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=tests%2Ftestsuite.at;h=b394cb6fff2e34b44b6f456b08b7ecc75157b24d;hb=299016266ed13376a7d671f66d4e0181b41098e3;hp=f894c2a7797263afe125e0ce4d6a4caaf1ee9bf0;hpb=39fb08818bbd9c438dbf23caa89937c663451b5a;p=sliver-openvswitch.git

diff --git a/tests/testsuite.at b/tests/testsuite.at
index f894c2a77..b394cb6ff 100644
--- a/tests/testsuite.at
+++ b/tests/testsuite.at
@@ -1,6 +1,6 @@
 AT_INIT
 
-AT_COPYRIGHT([Copyright (c) 2009 Nicira Networks.
+AT_COPYRIGHT([Copyright (c) 2009, 2010, 2011 Nicira Networks.
 
 Licensed under the Apache License, Version 2.0 (the "License");
 you may not use this file except in compliance with the License.
@@ -15,8 +15,52 @@ See the License for the specific language governing permissions and
 limitations under the License.])
 
 AT_TESTED([ovs-vswitchd])
+AT_TESTED([ovs-vsctl])
+AT_TESTED([perl])
+
+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
+     # work, so this might not work.
+     sleep 0.1
+     $1
+     # Then wait up to 10 seconds.
+     for d in 0 1 2 3 4 5 6 7 8 9; do
+       sleep 1
+       $1
+     done
+     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/ofproto-macros.at])
 
-m4_include([tests/lcov-pre.at])
 m4_include([tests/library.at])
-m4_include([tests/stp.at])
-m4_include([tests/lcov-post.at])
+m4_include([tests/bundle.at])
+m4_include([tests/classifier.at])
+m4_include([tests/check-structs.at])
+m4_include([tests/daemon.at])
+m4_include([tests/daemon-py.at])
+m4_include([tests/ofp-print.at])
+m4_include([tests/ovs-ofctl.at])
+m4_include([tests/odp.at])
+m4_include([tests/multipath.at])
+m4_include([tests/autopath.at])
+m4_include([tests/vconn.at])
+m4_include([tests/file_name.at])
+m4_include([tests/aes128.at])
+m4_include([tests/uuid.at])
+m4_include([tests/json.at])
+m4_include([tests/jsonrpc.at])
+m4_include([tests/jsonrpc-py.at])
+m4_include([tests/timeval.at])
+m4_include([tests/lockfile.at])
+m4_include([tests/reconnect.at])
+m4_include([tests/ofproto.at])
+m4_include([tests/ofproto-dpif.at])
+m4_include([tests/ovsdb.at])
+m4_include([tests/ovs-vsctl.at])
+m4_include([tests/interface-reconfigure.at])