diff options
author | Ben Pfaff <blp@nicira.com> | 2015-09-09 10:20:14 -0700 |
---|---|---|
committer | Ben Pfaff <blp@nicira.com> | 2015-09-09 10:24:24 -0700 |
commit | 6132b241efd21160db57d9908ee630a215cce8ea (patch) | |
tree | ce31c89067efff3faca4526ee0e8864112762dcd /tests/unixctl-py.at | |
parent | 120c348fbc6761c47329b32bb4cdd3508041784e (diff) | |
download | openvswitch-6132b241efd21160db57d9908ee630a215cce8ea.tar.gz |
tests: Automatically initialize OVS_*DIR vars when tests begin.
A lot of tests need to initialize the OVS_RUNDIR, OVS_LOGDIR, etc.
variables to point to the directory in which the tests run. Until now,
each of them has had to do this individually, which is redundant. This
commit starts to do this automatically.
Signed-off-by: Ben Pfaff <blp@nicira.com>
Acked-by: Andy Zhou <azhou@nicira.com>
Diffstat (limited to 'tests/unixctl-py.at')
-rw-r--r-- | tests/unixctl-py.at | 6 |
1 files changed, 0 insertions, 6 deletions
diff --git a/tests/unixctl-py.at b/tests/unixctl-py.at index 2fb7ee902..cd0ac23ab 100644 --- a/tests/unixctl-py.at +++ b/tests/unixctl-py.at @@ -72,8 +72,6 @@ OVS_VSWITCHD_STOP AT_CLEANUP AT_SETUP([unixctl bad target - Python]) -OVS_RUNDIR=`pwd`; export OVS_RUNDIR -OVS_DBDIR=`pwd`; export OVS_DBDIR AT_SKIP_IF([test $HAVE_PYTHON = no]) AT_CHECK([PYAPPCTL -t bogus doit], [1], [], [stderr]) @@ -90,10 +88,6 @@ AT_CLEANUP AT_SETUP([unixctl server - Python]) AT_SKIP_IF([test $HAVE_PYTHON = no]) -OVS_RUNDIR=`pwd`; export OVS_RUNDIR -OVS_LOGDIR=`pwd`; export OVS_LOGDIR -OVS_DBDIR=`pwd`; export OVS_DBDIR -OVS_SYSCONFDIR=`pwd`; export OVS_SYSCONFDIR ON_EXIT([kill `cat test-unixctl.py.pid`]) AT_CAPTURE_FILE([`pwd`/test-unixctl.py.log]) AT_CHECK([$PYTHON $srcdir/test-unixctl.py --log-file --pidfile --detach]) |