projects
/
openvswitch
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
netdev-linux: Avoid potential issues with unset FD.
[openvswitch]
/
tests
/
testsuite.at
diff --git
a/tests/testsuite.at
b/tests/testsuite.at
index f99b4389df7b357992b2b416eb415e3c0b7edaf8..93d7e6eb10127decb41431bd88080a9244c4b5ed 100644
(file)
--- a/
tests/testsuite.at
+++ b/
tests/testsuite.at
@@
-18,7
+18,7
@@
AT_TESTED([ovs-vswitchd])
AT_TESTED([ovs-vsctl])
AT_TESTED([perl])
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
[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
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/lcov-pre.at])
+
m4_include([tests/library.at])
m4_include([tests/library.at])
+m4_include([tests/daemon.at])
m4_include([tests/vconn.at])
m4_include([tests/dir_name.at])
m4_include([tests/aes128.at])
m4_include([tests/vconn.at])
m4_include([tests/dir_name.at])
m4_include([tests/aes128.at])
@@
-46,4
+52,5
@@
m4_include([tests/reconnect.at])
m4_include([tests/ovsdb.at])
m4_include([tests/stp.at])
m4_include([tests/ovs-vsctl.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/lcov-post.at])