RIOT-OS/RIOT
RIOT-OS/RIOT
1
0
Fork 0
mirror of https://github.com/RIOT-OS/RIOT.git synced 2024-12-29 04:50:03 +01:00
Code Releases Activity

ci: adapt .murdock test_job to changed dwq

Browse Source
This commit is contained in:
Kaspar Schleiser 2024-01-17 09:08:06 +01:00
parent 9ec623a33f
commit c84400ee6c
1 changed files with 12 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
.murdock
View File

@ -415,24 +415,23 @@ test_job() {
local board=$(echo $2 | cut -f 1 -d':') local board=$(echo $2 | cut -f 1 -d':')
local toolchain=$(echo $2 | cut -f 2 -d':') local toolchain=$(echo $2 | cut -f 2 -d':')
# this points to the dwq checkout root folder
local basedir="$(pwd)"
# interpret any extra arguments as file names. # interpret any extra arguments as file names.
# They will be sent along with the job to the test worker # They will be sent along with the job to the test worker
# and stored in the application's binary folder. # and stored in the application's binary folder.
shift 2 shift 2
local files="" local files=""
for filename in "$@"; do for filename in "$@"; do
# check if the file is within $(BINDIR) # check if the file is within $(basedir)
if startswith "${BINDIR}" "${filename}"; then if startswith "${basedir}" "${filename}"; then
# get relative (to $(BINDIR) path filename="$(realpath --relative-to ${basedir} ${filename})"
local relpath="$(realpath --relative-to ${BINDIR} ${filename})"
else else
error "$0: error: extra test files not within \${BINDIR}!" error "$0: error: extra test files not within \${basedir}!"
fi fi
# set remote file path. files="${files} --file ${filename}"
# currently, the test workers build in the default build path.
local remote_bindir="${appdir}/bin/${board}"
files="${files} --file ${filename}:${remote_bindir}/${relpath}"
done done
dwqc \ dwqc \
@ -448,6 +447,10 @@ run_test() {
local appdir=$1 local appdir=$1
local board=$(echo $2 | cut -f 1 -d':') local board=$(echo $2 | cut -f 1 -d':')
local toolchain=$(echo $2 | cut -f 2 -d':') local toolchain=$(echo $2 | cut -f 2 -d':')
# set build directory to match the builder
export BINDIR="$(pwd)/build"
print_worker print_worker
echo "-- executing tests for $appdir on $board (compiled with $toolchain toolchain):" echo "-- executing tests for $appdir on $board (compiled with $toolchain toolchain):"
hook run_test_pre hook run_test_pre