Page MenuHomeFreeBSD
Files F142499112

D47110.id144831.diff
No OneTemporary
Actions

D47110.id144831.diff
View Options

diff --git a/tests/sys/netpfil/common/Makefile b/tests/sys/netpfil/common/Makefile
--- a/tests/sys/netpfil/common/Makefile
+++ b/tests/sys/netpfil/common/Makefile
@@ -1,6 +1,7 @@
PACKAGE= tests
TESTSDIR= ${TESTSBASE}/sys/netpfil/common
+BINDIR= ${TESTSDIR}
ATF_TESTS_SH+= \
@@ -16,6 +17,8 @@
TEST_METADATA+= execenv="jail"
TEST_METADATA+= execenv_jail_params="vnet allow.raw_sockets"
+PROGS= divapp
+
${PACKAGE}FILES+= \
utils.subr \
runner.subr \
diff --git a/tests/sys/netpfil/pf/divapp.c b/tests/sys/netpfil/common/divapp.c
rename from tests/sys/netpfil/pf/divapp.c
rename to tests/sys/netpfil/common/divapp.c
--- a/tests/sys/netpfil/pf/divapp.c
+++ b/tests/sys/netpfil/common/divapp.c
@@ -25,7 +25,7 @@
* SUCH DAMAGE.
*/
-/* Used by tests like divert-to.sh */
+/* Used by divert(4) related tests */
#include <errno.h>
#include <stdlib.h>
diff --git a/tests/sys/netpfil/pf/Makefile b/tests/sys/netpfil/pf/Makefile
--- a/tests/sys/netpfil/pf/Makefile
+++ b/tests/sys/netpfil/pf/Makefile
@@ -1,7 +1,6 @@
PACKAGE= tests
TESTSDIR= ${TESTSBASE}/sys/netpfil/pf
-BINDIR= ${TESTSDIR}
TESTS_SUBDIRS+= ioctl
ATF_TESTS_SH+= altq \
@@ -62,8 +61,6 @@
TEST_METADATA+= execenv="jail"
TEST_METADATA+= execenv_jail_params="vnet allow.raw_sockets"
-PROGS= divapp
-
${PACKAGE}FILES+= CVE-2019-5597.py \
CVE-2019-5598.py \
daytime_inetd.conf \
diff --git a/tests/sys/netpfil/pf/divert-to.sh b/tests/sys/netpfil/pf/divert-to.sh
--- a/tests/sys/netpfil/pf/divert-to.sh
+++ b/tests/sys/netpfil/pf/divert-to.sh
@@ -98,7 +98,7 @@
"pass all" \
"pass in inet proto icmp icmp-type echoreq divert-to 127.0.0.1 port 2000"
- jexec div $(atf_get_srcdir)/divapp 2000 &
+ jexec div $(atf_get_srcdir)/../common/divapp 2000 &
divapp_pid=$!
# Wait for the divapp to be ready
sleep 1
@@ -137,7 +137,7 @@
"pass all" \
"pass in inet proto icmp icmp-type echoreq divert-to 127.0.0.1 port 2000 no state"
- jexec div $(atf_get_srcdir)/divapp 2000 divert-back &
+ jexec div $(atf_get_srcdir)/../common/divapp 2000 divert-back &
divapp_pid=$!
# Wait for the divapp to be ready
sleep 1
@@ -177,7 +177,7 @@
"pass in inet proto icmp icmp-type echoreq no state" \
"pass out inet proto icmp icmp-type echorep divert-to 127.0.0.1 port 2000 no state"
- jexec div $(atf_get_srcdir)/divapp 2000 &
+ jexec div $(atf_get_srcdir)/../common/divapp 2000 &
divapp_pid=$!
# Wait for the divapp to be ready
sleep 1
@@ -217,7 +217,7 @@
"pass in inet proto icmp icmp-type echoreq no state" \
"pass out inet proto icmp icmp-type echorep divert-to 127.0.0.1 port 2000 no state"
- jexec div $(atf_get_srcdir)/divapp 2000 divert-back &
+ jexec div $(atf_get_srcdir)/../common/divapp 2000 divert-back &
divapp_pid=$!
# Wait for the divapp to be ready
sleep 1
@@ -271,9 +271,9 @@
"pass in inet proto icmp icmp-type echoreq divert-to 127.0.0.1 port 2001 no state" \
"pass out inet proto icmp icmp-type echoreq divert-to 127.0.0.1 port 2002 no state"
- jexec router $(atf_get_srcdir)/divapp 2001 divert-back &
+ jexec router $(atf_get_srcdir)/../common/divapp 2001 divert-back &
indivapp_pid=$!
- jexec router $(atf_get_srcdir)/divapp 2002 divert-back &
+ jexec router $(atf_get_srcdir)/../common/divapp 2002 divert-back &
outdivapp_pid=$!
# Wait for the divappS to be ready
sleep 1
@@ -322,9 +322,9 @@
"pass in inet proto icmp icmp-type echoreq divert-to 127.0.0.1 port 1001 no state" \
"pass out inet proto icmp icmp-type echorep divert-to 127.0.0.1 port 1002 no state"
- jexec alcatraz $(atf_get_srcdir)/divapp 1001 divert-back &
+ jexec alcatraz $(atf_get_srcdir)/../common/divapp 1001 divert-back &
indivapp_pid=$!
- jexec alcatraz $(atf_get_srcdir)/divapp 1002 divert-back &
+ jexec alcatraz $(atf_get_srcdir)/../common/divapp 1002 divert-back &
outdivapp_pid=$!
# Wait for the divappS to be ready
sleep 1
@@ -351,9 +351,9 @@
"pass in inet proto icmp icmp-type echoreq divert-to 127.0.0.1 port 2001 no state" \
"pass out inet proto icmp icmp-type echorep divert-to 127.0.0.1 port 2002 no state"
- jexec alcatraz $(atf_get_srcdir)/divapp 2001 divert-back &
+ jexec alcatraz $(atf_get_srcdir)/../common/divapp 2001 divert-back &
indivapp_pid=$!
- jexec alcatraz $(atf_get_srcdir)/divapp 2002 divert-back &
+ jexec alcatraz $(atf_get_srcdir)/../common/divapp 2002 divert-back &
outdivapp_pid=$!
# Wait for the divappS to be ready
sleep 1

File Metadata

Mime Type
text/plain
Expires
Wed, Jan 21, 10:15 AM (11 h, 13 m)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
27800268
Default Alt Text
D47110.id144831.diff (4 KB)

Event Timeline