diff --git a/util/run-gnu-tests-smack-ci.sh b/util/run-gnu-tests-smack-ci.sh index fdcd1489700..3a788b008ca 100755 --- a/util/run-gnu-tests-smack-ci.sh +++ b/util/run-gnu-tests-smack-ci.sh @@ -78,7 +78,7 @@ chmod +x "$QEMU_DIR/rootfs/init" # Build utilities for SMACK/ROOTFS tests echo "Building utilities for SMACK/ROOTFS tests..." -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 +cargo build --profile="${PROFILE}" --features=feat_smack,id,ls,mkdir,mkfifo,mknod,df --no-default-features # Find SMACK tests and tests requiring rootfs in mtab (only available in QEMU environment) 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 rm -rf "$WORK" "$WORK.gz" cp -a "$QEMU_DIR/rootfs" "$WORK" - # Copy built utilities for SMACK/ROOTFS tests - for U in id ls mkdir mkfifo mknod df; do - rm -f "$WORK/bin/$U" - cp "$REPO_DIR/target/${PROFILE}/$U" "$WORK/bin/$U" + # Hardlink utilities for SMACK/ROOTFS tests + for U in $("$REPO_DIR/target/${PROFILE}/coreutils" --list); do + ln -vf "$REPO_DIR/target/${PROFILE}/coreutils" "$WORK/bin/$U" done # Set test script path and user