From cdac716946b14572d8c5c764a99617fe5a176da2 Mon Sep 17 00:00:00 2001 From: Li-Wen Hsu Date: Thu, 22 Aug 2019 12:08:35 +0000 Subject: [PATCH] Fix path issues after r351212 This fixes sys.netpfil.pf.forward.v4 and sys.netpfil.pf.icmp.cve_2019_5598 failures in CI system. Sponsored by: The FreeBSD Foundation --- tests/sys/netpfil/pf/forward.sh | 2 +- tests/sys/netpfil/pf/icmp.sh | 5 ++++- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/tests/sys/netpfil/pf/forward.sh b/tests/sys/netpfil/pf/forward.sh index 2a3e28e96e52..f84f92a9ed31 100755 --- a/tests/sys/netpfil/pf/forward.sh +++ b/tests/sys/netpfil/pf/forward.sh @@ -36,7 +36,7 @@ v4_body() route add -net 198.51.100.0/24 192.0.2.2 # Sanity check, can we forward ICMP echo requests without pf? - atf_check -s exit:0 $(atf_get_srcdir)/pft_ping.py \ + atf_check -s exit:0 ${common_dir}/pft_ping.py \ --sendif ${epair_send}a \ --to 198.51.100.3 \ --recvif ${epair_recv}a diff --git a/tests/sys/netpfil/pf/icmp.sh b/tests/sys/netpfil/pf/icmp.sh index a02cbf45e34c..fbb62da09efd 100755 --- a/tests/sys/netpfil/pf/icmp.sh +++ b/tests/sys/netpfil/pf/icmp.sh @@ -2,6 +2,8 @@ . $(atf_get_srcdir)/utils.subr +common_dir=$(atf_get_srcdir)/../common + atf_test_case "cve_2019_5598" "cleanup" cve_2019_5598_head() { @@ -32,7 +34,8 @@ cve_2019_5598_body() "pass in proto udp to 198.51.100.3 port 53" \ "pass out proto udp to 198.51.100.3 port 53" - atf_check -s exit:0 $(atf_get_srcdir)/CVE-2019-5598.py \ + atf_check -s exit:0 env PYTHONPATH=${common_dir} \ + $(atf_get_srcdir)/CVE-2019-5598.py \ --sendif ${epair_in}a \ --recvif ${epair_out}a \ --src 192.0.2.1 \