Repository: incubator-slider Updated Branches: refs/heads/feature/SLIDER-397_windows_test_kill()_command_failing 132d9f288 -> 27f0a6252
SLIDER-397 taskkill /f Project: http://git-wip-us.apache.org/repos/asf/incubator-slider/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-slider/commit/27f0a625 Tree: http://git-wip-us.apache.org/repos/asf/incubator-slider/tree/27f0a625 Diff: http://git-wip-us.apache.org/repos/asf/incubator-slider/diff/27f0a625 Branch: refs/heads/feature/SLIDER-397_windows_test_kill()_command_failing Commit: 27f0a625265de8e0d818917c94b2f0d5385b9044 Parents: 132d9f2 Author: Steve Loughran <ste...@apache.org> Authored: Thu Sep 4 20:39:05 2014 +0100 Committer: Steve Loughran <ste...@apache.org> Committed: Thu Sep 4 20:39:05 2014 +0100 ---------------------------------------------------------------------- .../test/groovy/org/apache/slider/test/SliderTestUtils.groovy | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-slider/blob/27f0a625/slider-core/src/test/groovy/org/apache/slider/test/SliderTestUtils.groovy ---------------------------------------------------------------------- diff --git a/slider-core/src/test/groovy/org/apache/slider/test/SliderTestUtils.groovy b/slider-core/src/test/groovy/org/apache/slider/test/SliderTestUtils.groovy index 89f1a34..5086248 100644 --- a/slider-core/src/test/groovy/org/apache/slider/test/SliderTestUtils.groovy +++ b/slider-core/src/test/groovy/org/apache/slider/test/SliderTestUtils.groovy @@ -747,7 +747,7 @@ class SliderTestUtils extends Assert { def commandString if (!Shell.WINDOWS) { - GString killCommand = "jps -l| grep ${grepString} | awk '{print \$1}' | xargs kill $signal" + GString killCommand = "jps -l| grep ${grepString} | awk '{print \$1}' | xargs kill /f $signal" log.info("Command command = $killCommand" ) commandString = ["bash", "-c", killCommand] @@ -755,7 +755,7 @@ class SliderTestUtils extends Assert { /* "jps -l | grep "String" | awk "{print $1}" | xargs -n 1 taskkill /PID" */ - GString killCommand = "\"jps -l | grep \"${grepString}\" | gawk \"{print \$1}\" | xargs -n 1 taskkill /PID\"" + GString killCommand = "\"jps -l | grep \"${grepString}\" | gawk \"{print \$1}\" | xargs -n 1 taskkill /f /PID " commandString = ["CMD", "/C", killCommand] } Process command = commandString.execute()
