MahnoKropotkinvich/redox
1
0
Fork 0
mirror of https://gitlab.redox-os.org/redox-os/redox.git synced 2026-06-21 04:14:17 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge branch 'fix-auto-test' into 'master'

Browse Source 
Fix and simplify auto-test config

See merge request redox-os/redox!2128
This commit is contained in:
Jeremy Soller 2026-05-07 07:46:44 -06:00
commit d66aaf4602
4 changed files with 34 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
recipes/groups/auto-test/auto-test.ion
View File

@ -1,6 +1,5 @@
#!/usr/bin/env ion
export RUST_BACKTRACE=full
cd /home/user/acid
cargo test
bash /root/relibc-tests/run.sh
os-test-runner
acid-runner
relibc-tests-runner
os-test-runner

12
recipes/tests/acid/recipe.toml
View File

@ -8,6 +8,18 @@ template = "custom"
script = """
mkdir -pv "${COOKBOOK_STAGE}/home/user/acid"
cp -rv "${COOKBOOK_SOURCE}"/* "${COOKBOOK_STAGE}/home/user/acid"
# Create runner script
mkdir -p "${COOKBOOK_STAGE}/usr/bin"
cat > "${COOKBOOK_STAGE}/usr/bin/acid-runner" <<EOF
#!/usr/bin/env bash
set -e
cd /home/user/acid
cargo test
EOF
chmod +x "${COOKBOOK_STAGE}/usr/bin/acid-runner"
"""
[package]
dependencies = ["rust"]

8
recipes/tests/os-test-bins/recipe.toml
View File

@ -11,9 +11,9 @@ template = "custom"
script = """
DYNAMIC_INIT
# Copy source to /usr/share/os-test
mkdir -p "${COOKBOOK_STAGE}/usr/share/os-test"
cd "${COOKBOOK_STAGE}/usr/share/os-test"
# Copy source to /home/user/os-test
mkdir -p "${COOKBOOK_STAGE}/home/user/os-test"
cd "${COOKBOOK_STAGE}/home/user/os-test"
rsync -a "${COOKBOOK_SOURCE}/" "./"
# Pre-compile tests for Redox
@ -56,7 +56,7 @@ mkdir -p "${COOKBOOK_STAGE}/usr/bin"
cat > "${COOKBOOK_STAGE}/usr/bin/os-test-runner" <<EOF
#!/usr/bin/env bash
set -e
cd /usr/share/os-test
cd /home/user/os-test
echo "Ensuring executables are newer than sources"
find . -type f -perm /111 -exec touch '{}' ';'

15
recipes/tests/relibc-tests-bins/recipe.toml
View File

@ -11,4 +11,19 @@ make install-tests DESTDIR="${COOKBOOK_STAGE}/home/user" NATIVE_LIBC=1 IS_REDOX=
if [ -n "$TESTBIN" ]; then
"${COOKBOOK_REDOXER}" write-exec sh -c "cd /home/user/relibc-tests; make run-once TESTBIN=bins_dynamic/$TESTBIN"
fi
# Create runner script
mkdir -p "${COOKBOOK_STAGE}/usr/bin"
cat > "${COOKBOOK_STAGE}/usr/bin/relibc-tests-runner" <<EOF
#!/usr/bin/env bash
set -e
cd /home/user/relibc-tests
make run
EOF
chmod +x "${COOKBOOK_STAGE}/usr/bin/os-test-runner"
"""
[package]
dependencies = ["gnu-make"]