summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorFlorian Schmaus <flow@gentoo.org>2022-10-02 20:00:00 +0200
committerFlorian Schmaus <flow@gentoo.org>2022-10-02 20:11:52 +0200
commit26e98ee46c47a1304a9e39010b32b7a846191ed9 (patch)
tree360b780d1245015a4e5c990b7e533b7f37df865e /net-ftp/atftp/files/atftp-0.8.0-test-sh-declare-local.patch
parentnet-ftp/atftp: add 0.8.0 (diff)
downloadgentoo-26e98ee46c47a1304a9e39010b32b7a846191ed9.tar.gz
gentoo-26e98ee46c47a1304a9e39010b32b7a846191ed9.tar.bz2
gentoo-26e98ee46c47a1304a9e39010b32b7a846191ed9.zip
net-ftp/atftp: update EAPI 7 -> 8, drop BDEPEND, add fix for test.sh
Signed-off-by: Florian Schmaus <flow@gentoo.org>
Diffstat (limited to 'net-ftp/atftp/files/atftp-0.8.0-test-sh-declare-local.patch')
-rw-r--r--net-ftp/atftp/files/atftp-0.8.0-test-sh-declare-local.patch18
1 files changed, 18 insertions, 0 deletions
diff --git a/net-ftp/atftp/files/atftp-0.8.0-test-sh-declare-local.patch b/net-ftp/atftp/files/atftp-0.8.0-test-sh-declare-local.patch
new file mode 100644
index 000000000000..de63fc03a626
--- /dev/null
+++ b/net-ftp/atftp/files/atftp-0.8.0-test-sh-declare-local.patch
@@ -0,0 +1,18 @@
+From a718243fe78fe9002b4145a158e02801e907399b Mon Sep 17 00:00:00 2001
+From: Florian Schmaus <flo@geekplace.eu>
+Date: Sun, 2 Oct 2022 19:47:47 +0200
+Subject: [PATCH 1/2] Declare variable D as local in stop_and_clean
+
+This also fixes tests in Gentoo, where src_test() has already declare
+a variable D, containing the path of the temporary install
+directory (aka. DESTDIR).
+--- a/test/test.sh
++++ b/test/test.sh
+@@ -576,6 +576,7 @@ stop_and_clean(){
+ ## +3 is for "Test tsize option ..." and "Test PCRE mapped download ... "
+ ## +2 for diskspace tests:
+ local M=$(grep "/tmp/" "$TDIR"/multicast*.log | wc -l)
++ local D
+ $INTERACTIVE && D=2
+ cat <<EOF
+ Expected: