summaryrefslogtreecommitdiff
path: root/tests/jsonrpc.at
diff options
context:
space:
mode:
authorAndy Zhou <azhou@nicira.com>2014-04-01 00:47:01 -0700
committerAndy Zhou <azhou@nicira.com>2014-04-03 11:17:17 -0700
commiteadd16449c6e5292603cf009d29ab0e249979717 (patch)
tree9fffd59e7f3668d844a9389c5ef75d73fa9c82d2 /tests/jsonrpc.at
parent01fed651097a90ef9365ce6c2f16da2970a5444e (diff)
downloadopenvswitch-eadd16449c6e5292603cf009d29ab0e249979717.tar.gz
unit-test: Link 29 test programs into ovstest
Improve link speed by linking 29 test programs into ovstest. On my machine, running the following command against a fully built tree: $ touch lib/random.c; time make Improve the overall build time from 7 seconds to 3.5 seconds. Signed-off-by: Andy Zhou <azhou@nicira.com> Acked-by: Ben Pfaff <blp@nicira.com>
Diffstat (limited to 'tests/jsonrpc.at')
-rw-r--r--tests/jsonrpc.at12
1 files changed, 6 insertions, 6 deletions
diff --git a/tests/jsonrpc.at b/tests/jsonrpc.at
index 664debe55..e06b5b636 100644
--- a/tests/jsonrpc.at
+++ b/tests/jsonrpc.at
@@ -2,11 +2,11 @@ AT_BANNER([JSON-RPC - C])
AT_SETUP([JSON-RPC request and successful reply])
OVS_RUNDIR=`pwd`; export OVS_RUNDIR
-AT_CHECK([test-jsonrpc --detach --no-chdir --pidfile="`pwd`"/pid listen punix:socket])
+AT_CHECK([ovstest test-jsonrpc --detach --no-chdir --pidfile="`pwd`"/pid listen punix:socket])
AT_CHECK([test -s pid])
AT_CHECK([kill -0 `cat pid`])
AT_CHECK(
- [[test-jsonrpc request unix:socket echo '[{"a": "b", "x": null}]']], [0],
+ [[ovstest test-jsonrpc request unix:socket echo '[{"a": "b", "x": null}]']], [0],
[[{"error":null,"id":0,"result":[{"a":"b","x":null}]}
]], [], [test ! -e pid || kill `cat pid`])
AT_CHECK([kill `cat pid`])
@@ -14,11 +14,11 @@ AT_CLEANUP
AT_SETUP([JSON-RPC request and error reply])
OVS_RUNDIR=`pwd`; export OVS_RUNDIR
-AT_CHECK([test-jsonrpc --detach --no-chdir --pidfile="`pwd`"/pid listen punix:socket])
+AT_CHECK([ovstest test-jsonrpc --detach --no-chdir --pidfile="`pwd`"/pid listen punix:socket])
AT_CHECK([test -s pid])
AT_CHECK([kill -0 `cat pid`])
AT_CHECK(
- [[test-jsonrpc request unix:socket bad-request '[]']], [0],
+ [[ovstest test-jsonrpc request unix:socket bad-request '[]']], [0],
[[{"error":{"error":"unknown method"},"id":0,"result":null}
]], [], [test ! -e pid || kill `cat pid`])
AT_CHECK([kill `cat pid`])
@@ -26,12 +26,12 @@ AT_CLEANUP
AT_SETUP([JSON-RPC notification])
OVS_RUNDIR=`pwd`; export OVS_RUNDIR
-AT_CHECK([test-jsonrpc --detach --no-chdir --pidfile="`pwd`"/pid listen punix:socket])
+AT_CHECK([ovstest test-jsonrpc --detach --no-chdir --pidfile="`pwd`"/pid listen punix:socket])
AT_CHECK([test -s pid])
# When a daemon dies it deletes its pidfile, so make a copy.
AT_CHECK([cp pid pid2])
AT_CHECK([kill -0 `cat pid2`])
-AT_CHECK([[test-jsonrpc notify unix:socket shutdown '[]']], [0], [],
+AT_CHECK([[ovstest test-jsonrpc notify unix:socket shutdown '[]']], [0], [],
[], [kill `cat pid2`])
AT_CHECK(
[pid=`cat pid2`