Skip to content

Commit 4c3bdea

Browse files
authored
Merge pull request #10162 from oech3/patch-6
run-gnu-tests-smack-ci.sh: Use multi-call binary for faster build
2 parents 6a20bcb + 6d3df54 commit 4c3bdea

File tree

1 file changed

+4
-5
lines changed

1 file changed

+4
-5
lines changed

util/run-gnu-tests-smack-ci.sh

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -78,7 +78,7 @@ chmod +x "$QEMU_DIR/rootfs/init"
7878

7979
# Build utilities for SMACK/ROOTFS tests
8080
echo "Building utilities for SMACK/ROOTFS tests..."
81-
cargo build --profile="${PROFILE}" --manifest-path="$REPO_DIR/Cargo.toml" --package uu_id --features uu_id/smack --package uu_ls --features uu_ls/smack --package uu_mkdir --features uu_mkdir/smack --package uu_mkfifo --features uu_mkfifo/smack --package uu_mknod --features uu_mknod/smack --package uu_df
81+
cargo build --profile="${PROFILE}" --features=feat_smack,id,ls,mkdir,mkfifo,mknod,df --no-default-features
8282

8383
# Find SMACK tests and tests requiring rootfs in mtab (only available in QEMU environment)
8484
QEMU_TESTS=$(grep -l -E 'require_smack_|rootfs in mtab' -r "$GNU_DIR/tests/" 2>/dev/null | sort -u || true)
@@ -109,10 +109,9 @@ for TEST_PATH in $QEMU_TESTS; do
109109
rm -rf "$WORK" "$WORK.gz"
110110
cp -a "$QEMU_DIR/rootfs" "$WORK"
111111

112-
# Copy built utilities for SMACK/ROOTFS tests
113-
for U in id ls mkdir mkfifo mknod df; do
114-
rm -f "$WORK/bin/$U"
115-
cp "$REPO_DIR/target/${PROFILE}/$U" "$WORK/bin/$U"
112+
# Hardlink utilities for SMACK/ROOTFS tests
113+
for U in $("$REPO_DIR/target/${PROFILE}/coreutils" --list); do
114+
ln -vf "$REPO_DIR/target/${PROFILE}/coreutils" "$WORK/bin/$U"
116115
done
117116

118117
# Set test script path and user

0 commit comments

Comments
 (0)