svn commit: r351391 - head/tests/sys/netpfil/pf

[Li-Wen Hsu]

Author: lwhsu
Date: Thu Aug 22 12:08:35 2019
New Revision: 351391
URL: https://svnweb.freebsd.org/changeset/base/351391

Log:
  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

Modified:
  head/tests/sys/netpfil/pf/forward.sh
  head/tests/sys/netpfil/pf/icmp.sh

Modified: head/tests/sys/netpfil/pf/forward.sh
==============================================================================
--- head/tests/sys/netpfil/pf/forward.sh	Thu Aug 22 11:32:03 2019	(r351390)
+++ head/tests/sys/netpfil/pf/forward.sh	Thu Aug 22 12:08:35 2019	(r351391)
@@ -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

Modified: head/tests/sys/netpfil/pf/icmp.sh
==============================================================================
--- head/tests/sys/netpfil/pf/icmp.sh	Thu Aug 22 11:32:03 2019	(r351390)
+++ head/tests/sys/netpfil/pf/icmp.sh	Thu Aug 22 12:08:35 2019	(r351391)
@@ -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 \