You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by da...@apache.org on 2017/04/13 07:48:23 UTC
[3/5] camel git commit: CAMEL-11130: Make run-tests.sh also use
kill-karaf.sh
CAMEL-11130: Make run-tests.sh also use kill-karaf.sh
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/e214df4c
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/e214df4c
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/e214df4c
Branch: refs/heads/master
Commit: e214df4cbf7c8a4c0a6776c0141db649aed3cf3d
Parents: 5e9bd73
Author: Tadayoshi Sato <sa...@gmail.com>
Authored: Thu Apr 13 11:30:56 2017 +0900
Committer: Claus Ibsen <da...@apache.org>
Committed: Thu Apr 13 09:48:13 2017 +0200
----------------------------------------------------------------------
tests/camel-itest-karaf/run-tests.sh | 2 +-
tests/camel-itest-osgi/run-tests.sh | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/camel/blob/e214df4c/tests/camel-itest-karaf/run-tests.sh
----------------------------------------------------------------------
diff --git a/tests/camel-itest-karaf/run-tests.sh b/tests/camel-itest-karaf/run-tests.sh
index 39a4657..83a772b 100755
--- a/tests/camel-itest-karaf/run-tests.sh
+++ b/tests/camel-itest-karaf/run-tests.sh
@@ -69,6 +69,6 @@ do
exit 1;
fi
echo "Killing Karaf to ensure no dangling karaf running"
- jps -l | grep karaf | cut -d ' ' -f 1 | xargs -n1 kill -kill
+ ./kill-karaf.sh
fi
done
http://git-wip-us.apache.org/repos/asf/camel/blob/e214df4c/tests/camel-itest-osgi/run-tests.sh
----------------------------------------------------------------------
diff --git a/tests/camel-itest-osgi/run-tests.sh b/tests/camel-itest-osgi/run-tests.sh
index a865370..7916870 100755
--- a/tests/camel-itest-osgi/run-tests.sh
+++ b/tests/camel-itest-osgi/run-tests.sh
@@ -69,6 +69,6 @@ do
exit 1;
fi
echo "Killing Karaf to ensure no dangling karaf running"
- jps -l | grep karaf | cut -d ' ' -f 1 | xargs -n1 kill -kill
+ ./kill-karaf.sh
fi
done