Version: 6.3.1-2
Followup-For: Bug #1024867
X-Debbugs-Cc: [email protected]
Control: tags -1 ftbfs patch
Hi,
I built it on the porterbox, which is the same as most buildds (HiFive
Unmatched) and slower than the others (except for builders with Qemu VMs, which
are disabled now and probably will remain that way). With the timeout set to
1800, it built fine.
I also built it in another machine locally (HiFive Unleashed clocked at 1GHz, so
slower) and it built successfully.
I attach the .debdiff.
I also detected a typo that it's a bit annoying if you're looking for the
correct string ("Timeout").
Thanks and cheers.
--
Manuel A. Fernandez Montecelo <[email protected]>
diff -Nru mercurial-6.2.3/debian/changelog mercurial-6.2.3/debian/changelog
--- mercurial-6.2.3/debian/changelog 2022-10-07 14:26:54.000000000 +0200
+++ mercurial-6.2.3/debian/changelog 2022-12-14 22:36:50.000000000 +0100
@@ -1,3 +1,10 @@
+mercurial (6.2.3-1+0.riscv64.1) unreleased; urgency=medium
+
+ * Non-maintainer upload.
+ * riscv64: test failures
+
+ -- Manuel A. Fernandez Montecelo <[email protected]> Wed, 14 Dec 2022 21:36:50
+0000
+
mercurial (6.2.3-1) sid; urgency=medium
* New upstream bugfix release.
diff -Nru mercurial-6.2.3/debian/patches/series
mercurial-6.2.3/debian/patches/series
--- mercurial-6.2.3/debian/patches/series 2022-10-07 13:21:27.000000000
+0200
+++ mercurial-6.2.3/debian/patches/series 2022-12-14 22:36:50.000000000
+0100
@@ -6,3 +6,4 @@
deb_specific__disable_libdir_replacement.patch
0005-Tolerate-SIGINT-getting-the-kill-in-test-stdio.py.patch
openssl_3_cipher_tlsv1.patch
+test-timeout-typo.patch
diff -Nru mercurial-6.2.3/debian/patches/test-timeout-typo.patch
mercurial-6.2.3/debian/patches/test-timeout-typo.patch
--- mercurial-6.2.3/debian/patches/test-timeout-typo.patch 1970-01-01
01:00:00.000000000 +0100
+++ mercurial-6.2.3/debian/patches/test-timeout-typo.patch 2022-12-14
22:36:50.000000000 +0100
@@ -0,0 +1,13 @@
+Index: mercurial-6.2.3/tests/run-tests.py
+===================================================================
+--- mercurial-6.2.3.orig/tests/run-tests.py
++++ mercurial-6.2.3/tests/run-tests.py
+@@ -315,7 +315,7 @@ def Popen4(cmd, wd, timeout, env=None):
+ while time.time() - start < timeout and p.returncode is None:
+ time.sleep(0.1)
+ p.timeout = True
+- vlog('# Timout reached for process %d' % p.pid)
++ vlog('# Timeout reached for process %d' % p.pid)
+ if p.returncode is None:
+ terminate(p)
+
diff -Nru mercurial-6.2.3/debian/rules mercurial-6.2.3/debian/rules
--- mercurial-6.2.3/debian/rules 2022-10-07 13:21:27.000000000 +0200
+++ mercurial-6.2.3/debian/rules 2022-12-14 22:36:50.000000000 +0100
@@ -45,7 +45,7 @@
sed -i.deb-backup -e 's/sleep 1/sleep 2/'
$(CURDIR)/tests/test-pull-pull-corruption.t
endif
- http_proxy='' dh_auto_test -- PYTHON=python3 TESTFLAGS="--verbose
--timeout 1440 $(PARALLEL_TEST_JOBS) --blacklist
$(CURDIR)/debian/mercurial.test_blacklist"
+ http_proxy='' dh_auto_test -- PYTHON=python3 TESTFLAGS="--verbose
--timeout 1800 $(PARALLEL_TEST_JOBS) --blacklist
$(CURDIR)/debian/mercurial.test_blacklist"
file-rename 's/\.deb-backup$$//' $(CURDIR)/tests/*
# run blacklisted tests but ignore their results
-cd tests && python3 run-tests.py --verbose `grep ^test
../debian/mercurial.test_blacklist`
