git://git.onelab.eu
/
sliver-openvswitch.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'mainstream'
[sliver-openvswitch.git]
/
tests
/
ovs-monitor-ipsec.at
diff --git
a/tests/ovs-monitor-ipsec.at
b/tests/ovs-monitor-ipsec.at
index
e66c943
..
67705fa
100644
(file)
--- a/
tests/ovs-monitor-ipsec.at
+++ b/
tests/ovs-monitor-ipsec.at
@@
-2,6
+2,7
@@
AT_BANNER([ovs-monitor-ipsec])
AT_SETUP([ovs-monitor-ipsec])
AT_SKIP_IF([test $HAVE_PYTHON = no])
AT_SETUP([ovs-monitor-ipsec])
AT_SKIP_IF([test $HAVE_PYTHON = no])
+AT_SKIP_IF([$non_ascii_cwd])
OVS_RUNDIR=`pwd`; export OVS_RUNDIR
OVS_DBDIR=`pwd`; export OVS_DBDIR
OVS_RUNDIR=`pwd`; export OVS_RUNDIR
OVS_DBDIR=`pwd`; export OVS_DBDIR
@@
-33,7
+34,7
@@
chmod +x usr/sbin/setkey
touch etc/racoon/certs/ovs-stale.pem
ovs_vsctl () {
touch etc/racoon/certs/ovs-stale.pem
ovs_vsctl () {
- ovs-vsctl --
timeout=5 --
no-wait -vreconnect:emer --db=unix:socket "$@"
+ ovs-vsctl --no-wait -vreconnect:emer --db=unix:socket "$@"
}
trim () { # Removes blank lines and lines starting with # from input.
sed -e '/^#/d' -e '/^[ ]*$/d' "$@"
}
trim () { # Removes blank lines and lines starting with # from input.
sed -e '/^#/d' -e '/^[ ]*$/d' "$@"