Skip to content

Commit 43f3eb3

Browse files
authored
Merge branch 'main' into fix-cksum-debug-flag
2 parents 77d2dd3 + b2d1117 commit 43f3eb3

File tree

2 files changed

+0
-7
lines changed

2 files changed

+0
-7
lines changed

.devcontainer/Dockerfile

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,6 @@ RUN apt-get update \
1212
gcc \
1313
gdb \
1414
gperf \
15-
jq \
1615
libacl1-dev \
1716
libattr1-dev \
1817
libcap-dev \

util/build-gnu.sh

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -135,7 +135,6 @@ else
135135
"$([ "${SELINUX_ENABLED}" = 1 ] && echo --with-selinux || echo --without-selinux)"
136136
#Add timeout to to protect against hangs
137137
"${SED}" -i 's|^"\$@|'"${SYSTEM_TIMEOUT}"' 600 "\$@|' build-aux/test-driver
138-
"${SED}" -i 's| tr | /usr/bin/tr |' tests/init.sh
139138
# Use a better diff
140139
"${SED}" -i 's|diff -c|diff -u|g' tests/Coreutils.pm
141140
"${MAKE}" -j "$("${NPROC}")"
@@ -342,11 +341,6 @@ test \$n_stat1 -ge \$n_stat2 \\' tests/ls/stat-free-color.sh
342341

343342
# Slightly different error message
344343
"${SED}" -i 's/not supported/unexpected argument/' tests/mv/mv-exchange.sh
345-
# Most tests check that `/usr/bin/tr` is working correctly before running.
346-
# However in NixOS/Nix-based distros, the tr util is located somewhere in
347-
# /nix/store/xxxxxxxxxxxx...xxxx/bin/tr
348-
# We just replace the references to `/usr/bin/tr`
349-
"${SED}" -i 's/\/usr\/bin\/tr/$(command -v tr)/' tests/init.sh
350344

351345
# upstream doesn't having the program name in the error message
352346
# but we do. We should keep it that way.

0 commit comments

Comments
 (0)