diff options
| author | Ben Pfaff <blp@nicira.com> | 2010-02-01 14:04:25 -0800 |
|---|---|---|
| committer | Ben Pfaff <blp@nicira.com> | 2010-02-02 15:21:09 -0800 |
| commit | 7c126fbb8a0589f2a29f3e7c520723a2d74b254e (patch) | |
| tree | 3b0db7f29ddb7403fd8a192ac78652b535c09182 /tests/ovsdb-server.at | |
| parent | a778696338b85b86b31b9ec7d1a4daeda430aa8b (diff) | |
| download | openvswitch-7c126fbb8a0589f2a29f3e7c520723a2d74b254e.tar.gz | |
Rework and simplify the "lcov" support for the testsuite.
Diffstat (limited to 'tests/ovsdb-server.at')
| -rw-r--r-- | tests/ovsdb-server.at | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/tests/ovsdb-server.at b/tests/ovsdb-server.at index a1738eaa0..0d8752423 100644 --- a/tests/ovsdb-server.at +++ b/tests/ovsdb-server.at @@ -19,10 +19,10 @@ m4_define([OVSDB_CHECK_EXECUTION], AT_KEYWORDS([ovsdb server positive $5]) AT_DATA([schema], [$2 ]) - OVS_CHECK_LCOV([ovsdb-tool create db schema], [0], [stdout], [ignore]) + AT_CHECK([ovsdb-tool create db schema], [0], [stdout], [ignore]) AT_CHECK([ovsdb-server --detach --pidfile=$PWD/pid --remote=punix:socket --unixctl=$PWD/unixctl db], [0], [ignore], [ignore]) m4_foreach([txn], [$3], - [OVS_CHECK_LCOV([ovsdb-client transact unix:socket 'txn'], [0], [stdout], [ignore], + [AT_CHECK([ovsdb-client transact unix:socket 'txn'], [0], [stdout], [ignore], [test ! -e pid || kill `cat pid`]) cat stdout >> output ]) @@ -42,14 +42,14 @@ AT_DATA([schema], "columns": { "manager": {"type": "string"}}}}} ]]) -OVS_CHECK_LCOV([ovsdb-tool create db schema], [0], [ignore], [ignore]) -OVS_CHECK_LCOV( +AT_CHECK([ovsdb-tool create db schema], [0], [ignore], [ignore]) +AT_CHECK( [[ovsdb-tool transact db \ '[{"op": "insert", "table": "Manager", "row": {"manager": "punix:socket"}}]']], [0], [ignore], [ignore]) AT_CHECK([ovsdb-server --detach --pidfile=$PWD/pid --remote=db:Manager,manager --unixctl=$PWD/unixctl db], [0], [ignore], [ignore]) -OVS_CHECK_LCOV( +AT_CHECK( [[ovsdb-client transact unix:socket \ '[{"op": "select", "table": "Manager", @@ -91,10 +91,10 @@ m4_define([OVSDB_CHECK_EXECUTION], ]) SSL_PORT=`expr 32767 + \( $RANDOM % 32767 \)` PKIDIR=$abs_top_srcdir/tests - OVS_CHECK_LCOV([ovsdb-tool create db schema], [0], [stdout], [ignore]) + AT_CHECK([ovsdb-tool create db schema], [0], [stdout], [ignore]) AT_CHECK([ovsdb-server --detach --pidfile=$PWD/pid --private-key=$PKIDIR/testpki-privkey2.pem --certificate=$PKIDIR/testpki-cert2.pem --ca-cert=$PKIDIR/testpki-cacert.pem --remote=pssl:$SSL_PORT:127.0.0.1 --unixctl=$PWD/unixctl db], [0], [ignore], [ignore]) m4_foreach([txn], [$3], - [OVS_CHECK_LCOV([ovsdb-client --private-key=$PKIDIR/testpki-privkey.pem --certificate=$PKIDIR/testpki-cert.pem --ca-cert=$PKIDIR/testpki-cacert.pem transact ssl:127.0.0.1:$SSL_PORT 'txn'], [0], [stdout], [ignore], + [AT_CHECK([ovsdb-client --private-key=$PKIDIR/testpki-privkey.pem --certificate=$PKIDIR/testpki-cert.pem --ca-cert=$PKIDIR/testpki-cacert.pem transact ssl:127.0.0.1:$SSL_PORT 'txn'], [0], [stdout], [ignore], [test ! -e pid || kill `cat pid`]) cat stdout >> output ]) |