Skip to content

Commit 943b446

Browse files
authored
Merge pull request #7204 from sylvestre/issue-7179
fix util/remaining-gnu-error.py
2 parents f65fd22 + 79a94d9 commit 943b446

File tree

1 file changed

+9
-22
lines changed

1 file changed

+9
-22
lines changed

util/build-gnu.sh

Lines changed: 9 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -97,7 +97,14 @@ fi
9797
# Set up quilt for patch management
9898
export QUILT_PATCHES="${ME_dir}/gnu-patches/"
9999
cd "$path_GNU"
100-
quilt push -a
100+
101+
# Check if all patches are already applied
102+
if [ "$(quilt applied | wc -l)" -eq "$(quilt series | wc -l)" ]; then
103+
echo "All patches are already applied"
104+
else
105+
# Push all patches
106+
quilt push -a || { echo "Failed to apply patches"; exit 1; }
107+
fi
101108
cd -
102109

103110
"${MAKE}" PROFILE="${UU_MAKE_PROFILE}"
@@ -143,27 +150,7 @@ else
143150

144151
# Handle generated factor tests
145152
t_first=00
146-
t_max=36
147-
# t_max_release=20
148-
# if test "${UU_MAKE_PROFILE}" != "debug"; then
149-
# # Generate the factor tests, so they can be fixed
150-
# # * reduced to 20 to decrease log size (down from 36 expected by GNU)
151-
# # * only for 'release', skipped for 'debug' as redundant and too time consuming (causing timeout errors)
152-
# seq=$(
153-
# i=${t_first}
154-
# while test "${i}" -le "${t_max_release}"; do
155-
# printf '%02d ' $i
156-
# i=$((i + 1))
157-
# done
158-
# )
159-
# for i in ${seq}; do
160-
# "${MAKE}" "tests/factor/t${i}.sh"
161-
# done
162-
# cat
163-
# sed -i -e 's|^seq |/usr/bin/seq |' -e 's|sha1sum |/usr/bin/sha1sum |' tests/factor/t*.sh
164-
# t_first=$((t_max_release + 1))
165-
# fi
166-
# strip all (debug) or just the longer (release) factor tests from Makefile
153+
t_max=37
167154
seq=$(
168155
i=${t_first}
169156
while test "${i}" -le "${t_max}"; do

0 commit comments

Comments
 (0)