projects
/
openvswitch
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Distribute some forgotten files that are needed by "make check".
[openvswitch]
/
tests
/
ovsdb-monitor.at
diff --git
a/tests/ovsdb-monitor.at
b/tests/ovsdb-monitor.at
index e57f41a0b139bbb93b75900712d38daaf2c0b908..47300ea3b84438ea5479846b730f5d1547043084 100644
(file)
--- a/
tests/ovsdb-monitor.at
+++ b/
tests/ovsdb-monitor.at
@@
-23,15
+23,17
@@
m4_define([OVSDB_CHECK_MONITOR],
OVS_CHECK_LCOV([ovsdb-tool create db schema], [0], [stdout], [ignore])
m4_foreach([txn], [$3],
[OVS_CHECK_LCOV([ovsdb-tool transact db 'txn'], [0], [ignore], [ignore])])
OVS_CHECK_LCOV([ovsdb-tool create db schema], [0], [stdout], [ignore])
m4_foreach([txn], [$3],
[OVS_CHECK_LCOV([ovsdb-tool transact db 'txn'], [0], [ignore], [ignore])])
- AT_CHECK([ovsdb-server --detach --pidfile=$PWD/server-pid --
listen=punix:socket --unixctl=$PWD/unixctl db
])
- AT_CHECK([ovsdb-client
monitor --format=csv unix:socket $4 > output & echo $! > monitor-pid
],
+ AT_CHECK([ovsdb-server --detach --pidfile=$PWD/server-pid --
remote=punix:socket --unixctl=$PWD/unixctl db], [0], [ignore], [ignore
])
+ AT_CHECK([ovsdb-client
--detach --pidfile=$PWD/client-pid monitor --format=csv unix:socket $4 > output
],
[0], [ignore], [ignore], [kill `cat server-pid`])
m4_foreach([txn], [$5],
[OVS_CHECK_LCOV([ovsdb-client transact unix:socket 'txn'], [0],
[0], [ignore], [ignore], [kill `cat server-pid`])
m4_foreach([txn], [$5],
[OVS_CHECK_LCOV([ovsdb-client transact unix:socket 'txn'], [0],
- [ignore], [ignore], [kill `cat server-pid monitor-pid`])])
+ [ignore], [ignore], [kill `cat server-pid client-pid`])])
+ OVS_CHECK_LCOV([ovsdb-client transact unix:socket '[[]]'], [0],
+ [ignore], [ignore], [kill `cat server-pid client-pid`])
AT_CHECK([ovs-appctl -t $PWD/unixctl -e exit], [0], [ignore], [ignore])
AT_CHECK([ovs-appctl -t $PWD/unixctl -e exit], [0], [ignore], [ignore])
- wait
- AT_CHECK([perl $srcdir/uuidfilt.pl output], [0], [$6])
+ OVS_WAIT_UNTIL([test ! -e server-pid && test ! -e client-pid && exit 0])
+ AT_CHECK([perl $srcdir/uuidfilt.pl output], [0], [$6]
, [ignore]
)
AT_CLEANUP])
OVSDB_CHECK_MONITOR([monitor insert into empty table],
AT_CLEANUP])
OVSDB_CHECK_MONITOR([monitor insert into empty table],