From 37b4fcd27a1b4d5149139ca6eb7d2b6caab00497 Mon Sep 17 00:00:00 2001 From: Wildan M Date: Sat, 28 Mar 2026 06:06:27 +0700 Subject: [PATCH 1/2] Update relibc tests bins script --- recipes/tests/relibc-tests-bins/recipe.toml | 37 ++------------------- 1 file changed, 3 insertions(+), 34 deletions(-) diff --git a/recipes/tests/relibc-tests-bins/recipe.toml b/recipes/tests/relibc-tests-bins/recipe.toml index 1d3d80bf..9be8156d 100644 --- a/recipes/tests/relibc-tests-bins/recipe.toml +++ b/recipes/tests/relibc-tests-bins/recipe.toml @@ -4,42 +4,11 @@ same_as = "../../core/relibc" [build] template = "custom" script = """ -PACKAGE_PATH="tests" cookbook_cargo +rsync -av --delete "${COOKBOOK_SOURCE}/" ./ -DYNAMIC_INIT -SRC=${COOKBOOK_SOURCE}/tests -EXPECTSRC=${SRC}/expected/bins_dynamic -DST=${COOKBOOK_STAGE}/root/relibc-tests -CFLAGS+=" -I${SRC}" -LDFLAGS+=" -Wl,-rpath=\\$ORIGIN" -pushd ${SRC} -if [ -z "$TESTBIN" ]; then -for file in **/*.c; do - filename="${file%.*}" - mkdir -p $(dirname $DST/$filename) - # adding "true" because compilation can fail - ${CC} ${CFLAGS} ${LDFLAGS} "$SRC/$file" -o "$DST/$filename" -Wall || true - if [[ -f "${EXPECTSRC}/$filename.stdout" ]]; then - echo "relibc-tests ./$filename" >> $DST/run.sh - else - echo "relibc-tests -s./$filename" >> $DST/run.sh - fi -done -rsync -a ${EXPECTSRC} ${DST}/expected -popd -else - mkdir -p $(dirname $DST/$TESTBIN) $(dirname $DST/expected/$TESTBIN) - ${CC} ${CFLAGS} ${LDFLAGS} "$SRC/$TESTBIN.c" -o "$DST/$TESTBIN" -Wall - if [[ -f "${EXPECTSRC}/$TESTBIN.stdout" ]]; then - cp ${EXPECTSRC}/$TESTBIN.{stdout,stderr} $(dirname $DST/expected/$TESTBIN) - fi -fi +make install-tests DESTDIR="${COOKBOOK_STAGE}/home/user" if [ -n "$TESTBIN" ]; then -if [[ -f "${EXPECTSRC}/$TESTBIN.stdout" ]]; then -"${COOKBOOK_REDOXER}" write-exec sh -c "cd /root/relibc-tests; relibc-tests ./$TESTBIN" -else -"${COOKBOOK_REDOXER}" write-exec sh -c "cd /root/relibc-tests; relibc-tests -s./$TESTBIN" -fi +"${COOKBOOK_REDOXER}" write-exec sh -c "cd /home/user/relibc-tests; make run-once TESTBIN=bins_dynamic/$TESTBIN" fi """ From 4ff0fc1d69f1a3e0687f775f542e4875a1e6aabd Mon Sep 17 00:00:00 2001 From: Wildan M Date: Sat, 28 Mar 2026 06:18:33 +0700 Subject: [PATCH 2/2] Pass NATIVE_LIBC for relibc-tests-bins --- recipes/tests/relibc-tests-bins/recipe.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/recipes/tests/relibc-tests-bins/recipe.toml b/recipes/tests/relibc-tests-bins/recipe.toml index 9be8156d..5ca980a8 100644 --- a/recipes/tests/relibc-tests-bins/recipe.toml +++ b/recipes/tests/relibc-tests-bins/recipe.toml @@ -6,7 +6,7 @@ template = "custom" script = """ rsync -av --delete "${COOKBOOK_SOURCE}/" ./ -make install-tests DESTDIR="${COOKBOOK_STAGE}/home/user" +make install-tests DESTDIR="${COOKBOOK_STAGE}/home/user" NATIVE_LIBC=1 IS_REDOX=1 if [ -n "$TESTBIN" ]; then "${COOKBOOK_REDOXER}" write-exec sh -c "cd /home/user/relibc-tests; make run-once TESTBIN=bins_dynamic/$TESTBIN"