diff options
| author | Gurucharan Shetty <gshetty@nicira.com> | 2014-06-17 12:35:32 -0700 |
|---|---|---|
| committer | Gurucharan Shetty <gshetty@nicira.com> | 2014-06-26 17:01:03 -0700 |
| commit | 9e784ba5c90fbfc4db5f36392d9c42322696177e (patch) | |
| tree | a906e802523f53384d58115b593404e37ca7ffe4 /tests | |
| parent | c9f80f7f08b18e3e18b8936346e0ffc087373488 (diff) | |
| download | openvswitch-9e784ba5c90fbfc4db5f36392d9c42322696177e.tar.gz | |
ovs-vsctl.at: Workaround lack of 'kill -l' on Windows.
Also, fflush(stderr) when we raise a signal. The test
this commit is changing would fail otherwise.
Signed-off-by: Gurucharan Shetty <gshetty@nicira.com>
Acked-by: Ben Pfaff <blp@nicira.com>
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/ovs-vsctl.at | 16 |
1 files changed, 14 insertions, 2 deletions
diff --git a/tests/ovs-vsctl.at b/tests/ovs-vsctl.at index f27ffbd8a..135f76834 100644 --- a/tests/ovs-vsctl.at +++ b/tests/ovs-vsctl.at @@ -159,8 +159,14 @@ AT_CHECK( [0], [], [stderr]) AT_CHECK([grep -c 'terminating with signal' stderr], [0], [1 ]) -AT_CHECK([kill -l `cat status`], [0], [ALRM +if test "$IS_WIN32" = "yes"; then + AT_CHECK([cat status], [0], [3 ]) +else + # 128 + SIGALRM + AT_CHECK([cat status], [0], [142 +]) +fi dnl Without --retry, we should retry for passive connections. AT_CHECK( @@ -169,8 +175,14 @@ AT_CHECK( [0], [], [stderr]) AT_CHECK([grep -c 'terminating with signal' stderr], [0], [1 ]) -AT_CHECK([kill -l `cat status`], [0], [ALRM +if test "$IS_WIN32" = "yes"; then + AT_CHECK([cat status], [0], [3 +]) +else + # 128 + SIGALRM + AT_CHECK([cat status], [0], [142 ]) +fi AT_CLEANUP dnl ---------------------------------------------------------------------- |