diff options
| author | Gurucharan Shetty <gshetty@nicira.com> | 2014-05-27 11:54:07 -0700 |
|---|---|---|
| committer | Gurucharan Shetty <gshetty@nicira.com> | 2014-06-10 07:47:45 -0700 |
| commit | 14073368d03bf4b0f4f1ecd3858dfc715d6d8d79 (patch) | |
| tree | 4d325aa427b16eac539bf37ff238703f2b7ef5f0 /tests | |
| parent | e60367e2882e7023f34e038f37b5cb270690e776 (diff) | |
| download | openvswitch-14073368d03bf4b0f4f1ecd3858dfc715d6d8d79.tar.gz | |
testsuite.at: pids can have zero after first character.
Fix the bug which did not kill the processes with pids that had
a zero in them. Also, some tests do a AT_CHECK([kill `cat pid`]) which
on windows prints something on the stdout causing the tests to fail.
So supress it.
Signed-off-by: Gurucharan Shetty <gshetty@nicira.com>
Acked-by: Ben Pfaff <blp@nicira.com>
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/testsuite.at | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/tests/testsuite.at b/tests/testsuite.at index d7e5a7d70..012733c0c 100644 --- a/tests/testsuite.at +++ b/tests/testsuite.at @@ -58,7 +58,7 @@ if test "$IS_WIN32" = "yes"; then for i in $*; do # tasklist will always have return code 0. # If pid does exist, there will be a line with the pid. - if tasklist //fi "PID eq $i" | grep $i; then + if tasklist //fi "PID eq $i" | grep $i >/dev/null; then : else return 1 @@ -69,12 +69,12 @@ if test "$IS_WIN32" = "yes"; then -[1-9]*) shift for i in $*; do - taskkill //F //PID $i + taskkill //F //PID $i >/dev/null done ;; - [1-9][1-9]*) + [1-9][0-9]*) for i in $*; do - taskkill //F //PID $i + taskkill //F //PID $i >/dev/null done ;; esac |