X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=tests%2Ftestsuite.at;h=d8af5924880f78306960db0ac3e7979668c84a67;hb=2a9537e2ab6c36c16e306974df5e1e5658cc7258;hp=ceded7e1607e8f29bd927ef29ffe804f2be27c5f;hpb=b12e3c41afaeb9faed1e3562954ec78fd595677d;p=sliver-openvswitch.git

diff --git a/tests/testsuite.at b/tests/testsuite.at
index ceded7e16..d8af59248 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.
@@ -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,19 +30,43 @@ m4_define([OVS_WAIT_UNTIL],
        sleep 1
        $1
      done
-     exit 1], [0], [ignore], [ignore])])
+     exit 1], [0], [ignore], [ignore], [$2])])
 
-m4_include([tests/lcov-pre.at])
+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/lacp.at])
 m4_include([tests/library.at])
-m4_include([tests/dir_name.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/learn.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/stp.at])
 m4_include([tests/ovs-vsctl.at])
-m4_include([tests/lcov-post.at])
+m4_include([tests/ovs-monitor-ipsec.at])
+m4_include([tests/ovs-xapi-sync.at])
+m4_include([tests/interface-reconfigure.at])
+m4_include([tests/stp.at])
+m4_include([tests/vlog.at])