Skip to content

Commit 075fa65

Browse files
learn-moreColinFinck
authored andcommitted
Add reason to Test_WHS and Test_Win2003_x64
1 parent 6a8b923 commit 075fa65

File tree

2 files changed

+4
-3
lines changed

2 files changed

+4
-3
lines changed

master/master.cfg

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -323,15 +323,15 @@ Test_VBox.addStep(bs_submit_results)
323323
#Test_VMW_Hybrid.addStep(bs_submit_results)
324324

325325
Test_Win2003_x64 = util.BuildFactory();
326-
Test_Win2003_x64.addStep(steps.Compile(name="test", command=["bash", scripts_root + "run_rostests", util.WithProperties('%(suffix)s')], warningPattern=".*[:] Test .*", description=["testing"], descriptionDone=["test"]))
326+
Test_Win2003_x64.addStep(steps.Compile(name="test", command=["bash", scripts_root + "run_rostests", util.WithProperties('%(suffix)s'), util.WithProperties('%(reason:-)s')], warningPattern=".*[:] Test .*", description=["testing"], descriptionDone=["test"]))
327327

328328
Test_WHS = util.BuildFactory();
329329
Test_WHS.addStep(bs_clean)
330330
Test_WHS.addStep(bs_git)
331331
Test_WHS.addStep(bs_prepare_source)
332332
Test_WHS.addStep(steps.Compile(name="rostests", command=["bash", scripts_root + "build_rostests"], warningPattern="^(.*warning[: ].*|.*error[: ].*)", description=["rostests"], descriptionDone=["rostests"]))
333333
Test_WHS.addStep(steps.SetPropertyFromCommand(command=["bash", scripts_root + "get_suffix"], property="suffix"))
334-
Test_WHS.addStep(steps.Compile(name="test", command=["bash", scripts_root + "run_rostests", util.WithProperties('%(suffix)s')], warningPattern=".*[:] Test .*", description=["testing"], descriptionDone=["test"]))
334+
Test_WHS.addStep(steps.Compile(name="test", command=["bash", scripts_root + "run_rostests", util.WithProperties('%(suffix)s'), util.WithProperties('%(reason:-)s')], warningPattern=".*[:] Test .*", description=["testing"], descriptionDone=["test"]))
335335

336336

337337
c['builders'] = [

worker/run_rostests

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@
33
# run_rostests - Run the tests built via build_rostests using rosautotest
44
#
55
# Parameter $1 - The suffix of the directory containing the tests to run
6+
# Parameter $2 - The reason for running the tests
67
source ../../config.inc
78

89
rm -rf "${ROSAUTOTEST_DIR}"
@@ -11,7 +12,7 @@ mv "${ROSTESTS_PREFIX}-$1" "${ROSAUTOTEST_DIR}" || exit $?
1112
cd $WORKDIR
1213
mv ${ROSAUTOTEST_DIR}/rosautotest.exe . || exit $?
1314
cp $SOURCEDIR/../rosautotest.ini . || exit $?
14-
./rosautotest.exe /c "Build $1" /w
15+
./rosautotest.exe /c "Build $1 $2" /w
1516

1617
# Initiate a graceful shutdown of the BuildBot worker, which in turn
1718
# initiates a graceful reboot of the Windows VM.

0 commit comments

Comments
 (0)