reactos/buildbot_config
1
0
Fork 0
mirror of https://github.com/reactos/buildbot_config.git synced 2024-11-23 03:39:51 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Use a Git revision-based suffix instead of the build number for identifying tests and run the "configure" script in build_rostests (after setting ROSTESTS_INSTALL).

Browse Source 
Should fix building x64 tests on "Build MSVC_x64" and running them on "Test Win2003_x64".
This commit is contained in:
Colin Finck 2020-01-06 08:02:01 +01:00
parent 399c47aa8b
commit ce46f5709b
No known key found for this signature in database
GPG Key ID: 1BA74E70456BA1A9
3 changed files with 12 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
master/master.cfg
View File

@ -261,8 +261,8 @@ Build_MSVC_x64.addStep(bs_prepare_source)
Build_MSVC_x64.addStep(steps.Compile(name="configure", command=["bash", scripts_root + "configure_msvc"], description=["configure"], descriptionDone=["configured"]))
Build_MSVC_x64.addStep(bs_bootcd)
Build_MSVC_x64.addStep(bs_livecd)
Build_MSVC_x64.addStep(steps.Compile(name="configure", command=["bash", scripts_root + "configure", "-DENABLE_ROSTESTS=1"], description=["configure"], descriptionDone=["configured"]))
Build_MSVC_x64.addStep(steps.Compile(name="rostests", command=["bash", scripts_root + "build_rostests", util.WithProperties('%(buildnumber)s')], warningPattern="^(.*warning[: ].*|.*error[: ].*)", description=["rostests"], descriptionDone=["rostests"]))
Build_MSVC_x64.addStep(steps.Compile(name="rostests", command=["bash", scripts_root + "build_rostests"], warningPattern="^(.*warning[: ].*|.*error[: ].*)", description=["rostests"], descriptionDone=["rostests"]))
Build_MSVC_x64.addStep(steps.SetPropertyFromCommand(command=["bash", scripts_root + "get_suffix"], property="suffix"))
Build_MSVC_x64.addStep(steps.Trigger(schedulerNames=['Carrier-Win2003-x64 Testbot Trigger'], waitForFinish=False, copy_properties=['got_revision', 'id', 'owners', 'reason', 'suffix']))
#Build_MSVC_x64.addStep(bs_upload_iso)
@ -296,14 +296,15 @@ Test_VBox.addStep(bs_submit_results)
#Test_VMW_Hybrid.addStep(bs_submit_results)
Test_Win2003_x64 = util.BuildFactory();
Test_Win2003_x64.addStep(steps.Compile(name="test", command=["bash", scripts_root + "run_rostests", util.WithProperties('%(buildnumber)s')], warningPattern=".*[:] Test .*", description=["testing"], descriptionDone=["test"]))
Test_Win2003_x64.addStep(steps.Compile(name="test", command=["bash", scripts_root + "run_rostests", util.WithProperties('%(suffix)s')], warningPattern=".*[:] Test .*", description=["testing"], descriptionDone=["test"]))
Test_WHS = util.BuildFactory();
Test_WHS.addStep(bs_clean)
Test_WHS.addStep(bs_git)
Test_WHS.addStep(steps.Compile(name="configure", command=["bash", scripts_root + "configure", "-DENABLE_ROSTESTS=1"], description=["configure"], descriptionDone=["configured"]))
Test_WHS.addStep(steps.Compile(name="rostests", command=["bash", scripts_root + "build_rostests", util.WithProperties('%(buildnumber)s')], warningPattern="^(.*warning[: ].*|.*error[: ].*)", description=["rostests"], descriptionDone=["rostests"]))
Test_WHS.addStep(steps.Compile(name="test", command=["bash", scripts_root + "run_rostests", util.WithProperties('%(buildnumber)s')], warningPattern=".*[:] Test .*", description=["testing"], descriptionDone=["test"]))
Test_WHS.addStep(bs_prepare_source)
Test_WHS.addStep(steps.Compile(name="rostests", command=["bash", scripts_root + "build_rostests"], warningPattern="^(.*warning[: ].*|.*error[: ].*)", description=["rostests"], descriptionDone=["rostests"]))
Test_WHS.addStep(steps.SetPropertyFromCommand(command=["bash", scripts_root + "get_suffix"], property="suffix"))
Test_WHS.addStep(steps.Compile(name="test", command=["bash", scripts_root + "run_rostests", util.WithProperties('%(suffix)s')], warningPattern=".*[:] Test .*", description=["testing"], descriptionDone=["test"]))
c['builders'] = [

8
worker/build_rostests
View File

@ -1,15 +1,15 @@
#!/bin/bash
# ReactOS BuildBot Build Scripts
# build_rostests - Build rostests and copy them along with rosautotest.exe to a unique directory identified via the build number
#
# Parameter $1 - The build number
# build_rostests - Build rostests and copy them along with rosautotest.exe to a unique directory identified via the suffix
source ../../config.inc
export ROSTESTS_INSTALL="${ROSTESTS_PREFIX}-$1"
REVISION_SUFFIX=`cat revision_suffix`
export ROSTESTS_INSTALL="${ROSTESTS_PREFIX}-${REVISION_SUFFIX}"
rm -rf $ROSTESTS_INSTALL
mkdir $ROSTESTS_INSTALL
../../configure -DENABLE_ROSTESTS=1
cd $ROS_OUTPUT
ninja rostests_install

2
worker/run_rostests
View File

@ -2,7 +2,7 @@
# ReactOS BuildBot Build Scripts
# run_rostests - Run the tests built via build_rostests using rosautotest
#
# Parameter $1 - The build number
# Parameter $1 - The suffix of the directory containing the tests to run
source ../../config.inc
rm -rf "${ROSAUTOTEST_DIR}"