mirror of
https://gitlab.redox-os.org/redox-os/redox.git
synced 2026-11-04 19:56:36 +08:00
Move relibc-tests sources to /usr/share
This commit is contained in:
parent
cddafcc84a
commit
44a30e582c
@ -26,7 +26,7 @@ data = """
|
||||
export RUST_BACKTRACE=full
|
||||
export HOME=/home/root
|
||||
acid-runner
|
||||
bash /root/relibc-tests/run.sh
|
||||
bash /usr/share/relibc-tests/run.sh
|
||||
os-test-runner
|
||||
shutdown
|
||||
"""
|
||||
|
||||
@ -6,10 +6,10 @@ template = "custom"
|
||||
script = """
|
||||
rsync -av --delete "${COOKBOOK_SOURCE}/" ./
|
||||
|
||||
make install-tests DESTDIR="${COOKBOOK_STAGE}/home/user" NATIVE_LIBC=1 IS_REDOX=1
|
||||
make install-tests DESTDIR="${COOKBOOK_STAGE}/usr/share" 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"
|
||||
"${COOKBOOK_REDOXER}" write-exec sh -c "cd /usr/share/relibc-tests; make run-once TESTBIN=bins_dynamic/$TESTBIN"
|
||||
fi
|
||||
|
||||
# Create runner script
|
||||
@ -17,8 +17,8 @@ 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 IS_REDOX=1
|
||||
cd /usr/share/relibc-tests
|
||||
make run IS_REDOX=1 # FIXME use a user writable dir as build dir
|
||||
EOF
|
||||
|
||||
chmod +x "${COOKBOOK_STAGE}/usr/bin/relibc-tests-runner"
|
||||
|
||||
@ -1,13 +1,11 @@
|
||||
# Due to necessary write permission for compilation the filesystem path of source code installation is an exception
|
||||
# where the package manager can't switch between system-wide and user paths
|
||||
[source]
|
||||
same_as = "../../core/relibc"
|
||||
|
||||
[build]
|
||||
template = "custom"
|
||||
script = """
|
||||
mkdir -pv "${COOKBOOK_STAGE}/home/user/relibc-tests"
|
||||
cp -rv "${COOKBOOK_SOURCE}/tests" "${COOKBOOK_STAGE}/home/user/relibc-tests"
|
||||
mkdir -pv "${COOKBOOK_STAGE}/usr/share/relibc-tests"
|
||||
cp -rv "${COOKBOOK_SOURCE}/tests" "${COOKBOOK_STAGE}/usr/share/relibc-tests"
|
||||
"""
|
||||
|
||||
[package]
|
||||
|
||||
Loading…
Reference in New Issue
Block a user