Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

WIP: merging moveit_ci #452

Closed
wants to merge 3 commits into from
Closed

WIP: merging moveit_ci #452

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
02950ba
unify test parameters
rhaschke Dec 13, 2019
21c5d5c
cleanup
rhaschke Dec 13, 2019
1735535
Remove >>> wrapping <<< if folding is supported
rhaschke Apr 8, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 7 additions & 7 deletions industrial_ci/mockups/failing_test/test/no_talker.test
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
<launch>
<!-- This launch file is used to test the rostest on CI server works. It can be any ROS tests that are generic enough -->

<param name="hztest1/topic" value="chatter" />
<param name="hztest1/hz" value="10.0" />
<param name="hztest1/hzerror" value="0.5" />
<param name="hztest1/test_duration" value="1.0" />
<param name="hztest1/wait_time" value="1.0" />
<test test-name="hztest_test" pkg="rostest" type="hztest"
name="hztest1" />
<test test-name="hztest_test" pkg="rostest" type="hztest" name="hztest1">
<param name="topic" value="chatter" />
<param name="hz" value="10.0" />
<param name="hzerror" value="0.5" />
<param name="test_duration" value="5.0" />
<param name="wait_time" value="5.0" />
</test>
</launch>
14 changes: 7 additions & 7 deletions industrial_ci/mockups/industrial_ci_testpkg/test/example_ros.test
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,11 +3,11 @@

<node name="talker" pkg="rospy_tutorials" type="talker.py" />

<param name="hztest1/topic" value="chatter" />
<param name="hztest1/hz" value="10.0" />
<param name="hztest1/hzerror" value="0.5" />
<param name="hztest1/test_duration" value="5.0" />
<param name="hztest1/wait_time" value="21.0" />
<test test-name="hztest_test" pkg="rostest" type="hztest"
name="hztest1" />
<test test-name="hztest_test" pkg="rostest" type="hztest" name="hztest1">
<param name="topic" value="chatter" />
<param name="hz" value="10.0" />
<param name="hzerror" value="0.5" />
<param name="test_duration" value="5.0" />
<param name="wait_time" value="5.0" />
</test>
</launch>
2 changes: 2 additions & 0 deletions industrial_ci/src/folding/none.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,8 +17,10 @@

function ici_start_fold() {
shift 3
ici_color_output $ANSI_BLUE ">>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>"
}

function ici_end_fold() {
shift 4
ici_color_output "<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<"
}
4 changes: 2 additions & 2 deletions industrial_ci/src/tests/source_tests.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,8 +38,8 @@ function run_clang_tidy {
return 0
fi

local build; build="$(dirname "$db")"
local name; name="$(basename "$build")"
local build="$(dirname "$db")"
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

https://github.com/koalaman/shellcheck/wiki/SC2155

local name="$(basename "$build")"

local max_jobs="${CLANG_TIDY_JOBS:-$(nproc)}"
if ! [ "$max_jobs" -ge 1 ]; then
Expand Down
9 changes: 3 additions & 6 deletions industrial_ci/src/util.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -117,9 +117,7 @@ function ici_time_start {
echo # blank line

ici_start_fold "$ICI_TIME_ID" "$ICI_FOLD_NAME" "$ICI_START_TIME"

ici_color_output $ANSI_BLUE ">>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>"
ici_color_output $ANSI_BLUE "Starting function '$ICI_FOLD_NAME'"
ici_color_output $ANSI_BLUE "$ICI_FOLD_NAME"
if [ "$DEBUG_BASH" ] && [ "$DEBUG_BASH" == true ]; then set -x; fi
}

Expand Down Expand Up @@ -148,10 +146,9 @@ function ici_time_end {
local end_time; end_time=$(date -u +%s%N)
local elapsed_seconds; elapsed_seconds=$(( (end_time - ICI_START_TIME)/1000000000 ))

echo -en "\e[${color_wrap}m" # just set color, no output
ici_end_fold "$ICI_TIME_ID" "$name" "$ICI_START_TIME" "$end_time"

ici_color_output "$color_wrap" "<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<"
ici_color_output "$color_wrap" "Function '$name' returned with code '${exit_code}' after $(( elapsed_seconds / 60 )) min $(( elapsed_seconds % 60 )) sec"
ici_color_output "$color_wrap" "'$name' returned with code '${exit_code}' after $(( elapsed_seconds / 60 )) min $(( elapsed_seconds % 60 )) sec"

ICI_FOLD_NAME=
if [ "$DEBUG_BASH" ] && [ "$DEBUG_BASH" == true ]; then set -x; fi
Expand Down