Control: tag -1 patch Hi Paul,
* PaulLiu <[email protected]> [2025-08-20 23:04]:
Got it. But I need the screen to run the test because the test requires a terminal. Maybe I can use SCREENDIR=`mktemp -d` so that it won't use /run. Or make some directory for screen. Let me prepare a patch.
Oh, I missed that, sorry. Please find two patches attached to replace screen by /usr/bin/script (part of the essential set) and fix a missing dependency in autopkgtests.
Cheers Jochen
From 6ea09cee3e59316aab850004c466917f83a9aac4 Mon Sep 17 00:00:00 2001 From: Jochen Sprickerhof <[email protected]> Date: Thu, 21 Aug 2025 08:22:36 +0200 Subject: [PATCH 2/2] Add missing autopkgtest dependency for usr/bin/strings --- debian/tests/control | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/debian/tests/control b/debian/tests/control index 0f21542..dd690c5 100644 --- a/debian/tests/control +++ b/debian/tests/control @@ -1,5 +1,5 @@ Tests: write-data-test -Depends: @ +Depends: @, binutils Restrictions: allow-stderr Tests: draw-test -- 2.50.1
From c82cc9b75854dcf86188cd24ba6ba7ae25b61094 Mon Sep 17 00:00:00 2001 From: Jochen Sprickerhof <[email protected]> Date: Thu, 21 Aug 2025 08:02:09 +0200 Subject: [PATCH 1/2] Replace screen by script in dh_auto_test Also simplify commands. --- debian/control | 1 - debian/dh_auto_test_wrapper | 5 ----- debian/rules | 11 ++--------- 3 files changed, 2 insertions(+), 15 deletions(-) delete mode 100755 debian/dh_auto_test_wrapper diff --git a/debian/control b/debian/control index abbe17a..2765b15 100644 --- a/debian/control +++ b/debian/control @@ -17,7 +17,6 @@ Build-Depends: debhelper (>= 11), python3-standard-chunk, python3-toml, python3-wheel, - screen Standards-Version: 4.4.0 Homepage: http://pc-basic.org diff --git a/debian/dh_auto_test_wrapper b/debian/dh_auto_test_wrapper deleted file mode 100755 index 5646037..0000000 --- a/debian/dh_auto_test_wrapper +++ /dev/null @@ -1,5 +0,0 @@ -#!/bin/sh - -dh_auto_test "$@" - -echo $? > dh_auto_test.retval diff --git a/debian/rules b/debian/rules index 74f0d5d..ba7d622 100755 --- a/debian/rules +++ b/debian/rules @@ -4,6 +4,7 @@ #export DH_VERBOSE = 1 export PYBUILD_NAME=pcbasic +export PYBUILD_BEFORE_TEST=cp {dir}/pcbasic/data/USAGE.txt {build_dir}/pcbasic/data/ %: dh $@ --with python3 --buildsystem=pybuild @@ -14,12 +15,4 @@ execute_after_dh_auto_build-indep: PYTHONPATH=. python3 -m make docs override_dh_auto_test: - mkdir -p $(CURDIR)/tests/unit/output/single - XDG_RUNTIME_DIR=`mktemp -d` screen -D -m -L -Logfile dh_auto_test.log $(CURDIR)/debian/dh_auto_test_wrapper -- --test-args="$(CURDIR)" - cat dh_auto_test.log - @echo 0 > dh_auto_test.cmp1 - @cmp dh_auto_test.cmp1 dh_auto_test.retval - -override_dh_auto_clean: - dh_auto_clean - rm -rf $(CURDIR)/tests/unit/output + TERM=xterm script -qec dh_auto_test "$@" -- 2.50.1
signature.asc
Description: PGP signature
