Skip to content

Commit 052b34e

Browse files
oech3oech3
authored andcommitted
build-gnu.sh: Move {ch,run}con tests to SELinux MV and avoid wrong result by false symlinks
1 parent aaa0610 commit 052b34e

File tree

1 file changed

+5
-9
lines changed

1 file changed

+5
-9
lines changed

util/build-gnu.sh

Lines changed: 5 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -111,15 +111,6 @@ test -f "${UU_BUILD_DIR}/[" || (cd ${UU_BUILD_DIR} && ln -s "test" "[")
111111

112112
cd "${path_GNU}" && echo "[ pwd:'${PWD}' ]"
113113

114-
# Any binaries that aren't built become `false` so their tests fail
115-
for binary in $(./build-aux/gen-lists-of-programs.sh --list-progs); do
116-
bin_path="${UU_BUILD_DIR}/${binary}"
117-
test -f "${bin_path}" || {
118-
echo "'${binary}' was not built with uutils, using the 'false' program"
119-
cp "${UU_BUILD_DIR}/false" "${bin_path}"
120-
}
121-
done
122-
123114
# Always update the PATH to test the uutils coreutils instead of the GNU coreutils
124115
# This ensures the correct path is used even if the repository was moved or rebuilt in a different location
125116
"${SED}" -i "s/^[[:blank:]]*PATH=.*/ PATH='${UU_BUILD_DIR//\//\\/}\$(PATH_SEPARATOR)'\"\$\$PATH\" \\\/" tests/local.mk
@@ -170,6 +161,11 @@ grep -rl 'path_prepend_' tests/* | xargs -r "${SED}" -i 's| path_prepend_ ./src|
170161
# path_prepend_ sets $abs_path_dir_: set it manually instead.
171162
grep -rl '\$abs_path_dir_' tests/*/*.sh | xargs -r "${SED}" -i "s|\$abs_path_dir_|${UU_BUILD_DIR//\//\\/}|g"
172163

164+
# We can't build runcon and chcon without libselinux. But GNU no longer builds dummies of them. So consider they are SELinux specific.
165+
"${SED}" -i '/^print_ver_.*/_selinux_required/' tests/runcon/runcon-compute.sh
166+
"${SED}" -i '/^print_ver_.*/_selinux_required/' tests/runcon/runcon-no-reorder.sh
167+
"${SED}" -i '/^print_ver_.*/_selinux_required/' tests/chcon/chcon-fail.sh
168+
173169
# We use coreutils yes
174170
"${SED}" -i "s|--coreutils-prog=||g" tests/misc/coreutils.sh
175171
# Different message

0 commit comments

Comments
 (0)