From eadd16449c6e5292603cf009d29ab0e249979717 Mon Sep 17 00:00:00 2001 From: Andy Zhou Date: Tue, 1 Apr 2014 00:47:01 -0700 Subject: 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 Acked-by: Ben Pfaff --- tests/jsonrpc.at | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) (limited to 'tests/jsonrpc.at') 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` -- cgit v1.2.1