From a461023263ed824e840d98a58e42adedd52ccced Mon Sep 17 00:00:00 2001 From: iory Date: Mon, 23 Jul 2018 17:29:10 +0900 Subject: [PATCH 1/4] [jsk_tools] Add test_env_hooks.test. --- jsk_tools/CMakeLists.txt | 1 + jsk_tools/test/sh/rossetip.sh | 26 +++++++++++++++++ jsk_tools/test/sh/rossetmaster.sh | 21 ++++++++++++++ jsk_tools/test/test_env_hooks.test | 46 ++++++++++++++++++++++++++++++ 4 files changed, 94 insertions(+) create mode 100755 jsk_tools/test/sh/rossetip.sh create mode 100755 jsk_tools/test/sh/rossetmaster.sh create mode 100644 jsk_tools/test/test_env_hooks.test diff --git a/jsk_tools/CMakeLists.txt b/jsk_tools/CMakeLists.txt index c1a9e6779..7ce1c35ac 100644 --- a/jsk_tools/CMakeLists.txt +++ b/jsk_tools/CMakeLists.txt @@ -52,6 +52,7 @@ if (CATKIN_ENABLE_TESTING) jsk_tools_add_rostest(test/test_stdout.test) jsk_tools_add_rostest(test/test_rostopic_host_sanity.test) jsk_tools_add_rostest(test/test_sanity_diagnostics.test) + jsk_tools_add_rostest(test/test_env_hooks.test) find_package(jsk_tools REQUIRED) jsk_tools_add_shell_test(COMMAND echo "testing jsk_tools_add_shell_test") endif() diff --git a/jsk_tools/test/sh/rossetip.sh b/jsk_tools/test/sh/rossetip.sh new file mode 100755 index 000000000..444156ea6 --- /dev/null +++ b/jsk_tools/test/sh/rossetip.sh @@ -0,0 +1,26 @@ +#!/bin/bash + +JSK_TOOLS_PATH=$(rospack find jsk_tools) +if [ "$JSK_TOOLS_PATH" = "/opt/ros/${ROS_DISTRO}/share/jsk_tools" ]; then + source /opt/ros/${ROS_DISTRO}/setup.bash +else + source `catkin locate --shell-verbs` + if [ "$(rospack find jsk_tools)" = "$(catkin locate --install)/share/jsk_tools" ]; then + # for install + source "$(rospack find jsk_tools)"/catkin_env_hook/99.jsk_tools.sh + else + # for devel + cd "$JSK_TOOLS_PATH" && source `catkin locate --devel`/etc/catkin/profile.d/99.jsk_tools.sh + fi +fi + + +ECHO_OUTPUT="$1" + +function ip () { + # overwrite ip command. + echo "$ECHO_OUTPUT" +} + +rossetip_addr > /dev/null 2>&1 +echo $ROS_IP diff --git a/jsk_tools/test/sh/rossetmaster.sh b/jsk_tools/test/sh/rossetmaster.sh new file mode 100755 index 000000000..4dccff8a8 --- /dev/null +++ b/jsk_tools/test/sh/rossetmaster.sh @@ -0,0 +1,21 @@ +#!/bin/bash + +JSK_TOOLS_PATH=$(rospack find jsk_tools) +if [ "$JSK_TOOLS_PATH" = "/opt/ros/${ROS_DISTRO}/share/jsk_tools" ]; then + . /opt/ros/${ROS_DISTRO}/setup.bash +else + . `catkin locate --shell-verbs` + if [ "$(rospack find jsk_tools)" = "$(catkin locate --install)/share/jsk_tools" ]; then + # for install + . "$(rospack find jsk_tools)"/catkin_env_hook/99.jsk_tools.sh + else + # for devel + cd "$JSK_TOOLS_PATH" && . `catkin locate --devel`/etc/catkin/profile.d/99.jsk_tools.sh + fi +fi + + +hostname=${1-"localhost"} +ros_port=${2-"11311"} +rossetmaster "$hostname" "$ros_port" > /dev/null 2>&1 +echo "$ROS_MASTER_URI" diff --git a/jsk_tools/test/test_env_hooks.test b/jsk_tools/test/test_env_hooks.test new file mode 100644 index 000000000..5a8277f13 --- /dev/null +++ b/jsk_tools/test/test_env_hooks.test @@ -0,0 +1,46 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + From ee7003a54d78778dee2fa97745daabf374f535cb Mon Sep 17 00:00:00 2001 From: iory Date: Sat, 11 Jun 2022 02:15:49 +0900 Subject: [PATCH 2/4] wip --- jsk_tools/test/sh/rossetip.sh | 4 ++++ jsk_tools/test/sh/rossetmaster.sh | 3 +++ 2 files changed, 7 insertions(+) diff --git a/jsk_tools/test/sh/rossetip.sh b/jsk_tools/test/sh/rossetip.sh index 444156ea6..b402fb192 100755 --- a/jsk_tools/test/sh/rossetip.sh +++ b/jsk_tools/test/sh/rossetip.sh @@ -17,6 +17,10 @@ fi ECHO_OUTPUT="$1" +function getent () { + echo "127.0.0.1 localhost" +} + function ip () { # overwrite ip command. echo "$ECHO_OUTPUT" diff --git a/jsk_tools/test/sh/rossetmaster.sh b/jsk_tools/test/sh/rossetmaster.sh index 4dccff8a8..72aabd676 100755 --- a/jsk_tools/test/sh/rossetmaster.sh +++ b/jsk_tools/test/sh/rossetmaster.sh @@ -14,6 +14,9 @@ else fi fi +function getent () { + echo "127.0.0.1 localhost" +} hostname=${1-"localhost"} ros_port=${2-"11311"} From 41f02350126d2e8b933a3d6d0f861703c8057e14 Mon Sep 17 00:00:00 2001 From: iory Date: Sat, 11 Jun 2022 15:53:22 +0900 Subject: [PATCH 3/4] Add --- jsk_tools/test/test_env_hooks.test | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/jsk_tools/test/test_env_hooks.test b/jsk_tools/test/test_env_hooks.test index 5a8277f13..f612176eb 100644 --- a/jsk_tools/test/test_env_hooks.test +++ b/jsk_tools/test/test_env_hooks.test @@ -5,8 +5,8 @@ pkg="jsk_tools" type="test_stdout.py"> - - + + - - + + - - + + - - + + - - + + From b28b6723fc6038b1c1a6c44707501375d61e6d0b Mon Sep 17 00:00:00 2001 From: iory Date: Sat, 11 Jun 2022 16:11:51 +0900 Subject: [PATCH 4/4] Add --- jsk_tools/test/sh/rossetmaster.sh | 3 --- 1 file changed, 3 deletions(-) diff --git a/jsk_tools/test/sh/rossetmaster.sh b/jsk_tools/test/sh/rossetmaster.sh index 72aabd676..4dccff8a8 100755 --- a/jsk_tools/test/sh/rossetmaster.sh +++ b/jsk_tools/test/sh/rossetmaster.sh @@ -14,9 +14,6 @@ else fi fi -function getent () { - echo "127.0.0.1 localhost" -} hostname=${1-"localhost"} ros_port=${2-"11311"}