Put all make targets in a loop and print a little more what each

IPv6 fragment header test is doing.

21 files changed, 68 insertions, 160 deletions

diff --git a/regress/sys/netinet6/frag6/LICENSE b/regress/sys/netinet6/frag6/LICENSE
new file mode 100644
index 00000000000..b88bf2262c3
--- /dev/null
+++ b/regress/sys/netinet6/frag6/LICENSE
@@ -0,0 +1,13 @@
+# Copyright (c) 2012-2016 Alexander Bluhm <bluhm@openbsd.org>
+#
+# Permission to use, copy, modify, and distribute this software for any
+# purpose with or without fee is hereby granted, provided that the above
+# copyright notice and this permission notice appear in all copies.
+#
+# THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
+# WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
+# MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
+# ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
+# WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
+# ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
+# OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
diff --git a/regress/sys/netinet6/frag6/Makefile b/regress/sys/netinet6/frag6/Makefile
index eb334ce720b..9be355040dd 100644
--- a/regress/sys/netinet6/frag6/Makefile
+++ b/regress/sys/netinet6/frag6/Makefile
@@ -1,4 +1,4 @@
-#	$OpenBSD: Makefile,v 1.14 2016/11/17 13:24:32 bluhm Exp $
+#	$OpenBSD: Makefile,v 1.15 2016/11/17 17:27:05 bluhm Exp $
 
 # The following ports must be installed:
 #
@@ -71,7 +71,6 @@ PYTHON =	PYTHONPATH=${.OBJDIR} python2.7 ${.CURDIR}/
 
 # Ping all addresses.  This ensures that the ip addresses are configured
 # and all routing table are set up to allow bidirectional packet flow.
-TARGETS +=	ping6
 run-regress-ping6:
 	@echo '\n======== $@ ========'
 .for ip in SRC_OUT DST_IN
@@ -81,7 +80,6 @@ run-regress-ping6:
 
 # Ping all addresses again but with 5000 bytes payload.  These large
 # packets get fragmented by SRC and must be handled by DST.
-TARGETS +=	fragping6
 run-regress-fragping6:
 	@echo '\n======== $@ ========'
 .for ip in SRC_OUT DST_IN
@@ -89,140 +87,16 @@ run-regress-fragping6:
 	ping6 -n -c 1 -s 5000 -m ${${ip}6}
 .endfor
 
-# Send hand-crafted fragmented packet
-TARGETS +=	frag6
-run-regress-frag6: addr.py
-	@echo '\n======== $@ ========'
-	@echo Check ping6 reassembly
-	${SUDO} ${PYTHON}frag6.py
-
-# An hop by hop options extension header before the fragment header
-TARGETS +=	frag6-ext
-run-regress-frag6-ext: addr.py
-	@echo '\n======== $@ ========'
-	@echo Check ping6 extension header reassembly
-	${SUDO} ${PYTHON}frag6_ext.py
-
-# An hop by hop options extension header after the fragment header
-TARGETS +=	frag6-hop
-run-regress-frag6-hop: addr.py
-	@echo '\n======== $@ ========'
-	@echo Check ping6 not initial hop by hop extension header
-	${SUDO} ${PYTHON}frag6_hop.py
-
-# An destination options extension header after the fragment header
-TARGETS +=	frag6-opt
-run-regress-frag6-opt: addr.py
-	@echo '\n======== $@ ========'
-	@echo Check ping6 destination option reassembly
-	${SUDO} ${PYTHON}frag6_opt.py
-
-# The ethernet frame has some padding that must be ignored by reassembly
-TARGETS +=	frag6-padding
-run-regress-frag6-padding: addr.py
-	@echo '\n======== $@ ========'
-	@echo Check ping6 ethernet padding
-	${SUDO} ${PYTHON}frag6_padding.py
-
-# fragmented packet with head overlapping first fragment
-TARGETS +=	frag6-overhead0
-run-regress-frag6-overhead0: addr.py
-	@echo '\n======== $@ ========'
-	@echo Check ping6 head overlapping first fragment
-	${SUDO} ${PYTHON}frag6_overhead0.py
-
-# fragmented packet with head overlapping second fragment
-TARGETS +=	frag6-overhead
-run-regress-frag6-overhead: addr.py
-	@echo '\n======== $@ ========'
-	@echo Check ping6 head overlapping second fragment
-	${SUDO} ${PYTHON}frag6_overhead.py
-
-# fragmented packet with tail overlapping last fragment
-TARGETS +=	frag6-overtail
-run-regress-frag6-overtail: addr.py
-	@echo '\n======== $@ ========'
-	@echo Check ping6 tail overlapping last fragment
-	${SUDO} ${PYTHON}frag6_overtail.py
-
-# fragmented packet with overlap, drop future fragments
-TARGETS +=	frag6-overdrop
-run-regress-frag6-overdrop: addr.py
-	@echo '\n======== $@ ========'
-	@echo Check ping6 overlap drop future fragments
-	${SUDO} ${PYTHON}frag6_overdrop.py
-
-# fragmented packet with overlap, atomic fragment must be processed
-TARGETS +=	frag6-overatomic
-run-regress-frag6-overatomic: addr.py
-	@echo '\n======== $@ ========'
-	@echo Check ping6 overlapping and atomic fragments
-	${SUDO} ${PYTHON}frag6_overatomic.py
-
-# atomic fragment with short fragmented payload
-TARGETS +=	frag6-shortatomic
-run-regress-frag6-shortatomic: addr.py
-	@echo '\n======== $@ ========'
-	@echo Check ping6 short atomic fragments
-	${SUDO} ${PYTHON}frag6_shortatomic.py
-
-# fragmented packet permuted fragments
-TARGETS +=	frag6-permute
-run-regress-frag6-permute: addr.py
-	@echo '\n======== $@ ========'
-	@echo Check ping6 permuted fragments
-	${SUDO} ${PYTHON}frag6_permute.py
-
-# fragmented packet with zero length first fragment
-TARGETS +=	frag6-zerofirst
-run-regress-frag6-zerofirst: addr.py
-	@echo '\n======== $@ ========'
-	@echo Check ping6 zero length first fragment
-	${SUDO} ${PYTHON}frag6_zerofirst.py
-
-# fragmented packet with zero length second fragment
-TARGETS +=	frag6-zerosecond
-run-regress-frag6-zerosecond: addr.py
-	@echo '\n======== $@ ========'
-	@echo Check ping6 zero length second fragment
-	${SUDO} ${PYTHON}frag6_zerosecond.py
+FRAG6_SCRIPTS !=	cd ${.CURDIR} && ls -1 frag6*.py
 
-# fragmented large ping packet that has to be refragmented by reflector
-TARGETS +=	frag6-refrag
-run-regress-frag6-refrag: addr.py
+.for s in ${FRAG6_SCRIPTS}
+run-regress-${s}: addr.py
 	@echo '\n======== $@ ========'
-	@echo Check ping6 with fragmented reply
-	${SUDO} ${PYTHON}frag6_refrag.py
-
-# atomic fragmented udp packet
-TARGETS +=	frag6-udpatomic
-run-regress-frag6-udpatomic: addr.py
-	@echo '\n======== $@ ========'
-	@echo Check ping6 atomic udp fragment
-	${SUDO} ${PYTHON}frag6_udpatomic.py
-
-# fragmented udp packet after header
-TARGETS +=	frag6-udpheader
-run-regress-frag6-udpheader: addr.py
-	@echo '\n======== $@ ========'
-	@echo Check ping6 udp header fragment
-	${SUDO} ${PYTHON}frag6_udpheader.py
-
-# fragmented udp packet within payload
-TARGETS +=	frag6-udppayload
-run-regress-frag6-udppayload: addr.py
-	@echo '\n======== $@ ========'
-	@echo Check ping6 udp payload fragment
-	${SUDO} ${PYTHON}frag6_udppayload.py
-
-# fragmented icmp packet not within 60 second timeout, test takes 90 seconds
-TARGETS +=	frag6-timeout
-run-regress-frag6-timeout: addr.py
-	@echo '\n======== $@ ========'
-	@echo Check ping6 fragment timeout
-	${SUDO} ${PYTHON}frag6_timeout.py
+	${SUDO} ${PYTHON}${s}
+.endfor
 
-REGRESS_TARGETS =	${TARGETS:S/^/run-regress-/}
+REGRESS_TARGETS =	run-regress-ping6 run-regress-fragping6 \
+			${FRAG6_SCRIPTS:S/^/run-regress-/}
 
 CLEANFILES +=		addr.py *.pyc *.log
 
diff --git a/regress/sys/netinet6/frag6/frag6.py b/regress/sys/netinet6/frag6/frag6.py
index fbd49af7aca..a42ded0c590 100644
--- a/regress/sys/netinet6/frag6/frag6.py
+++ b/regress/sys/netinet6/frag6/frag6.py
@@ -1,5 +1,6 @@
 #!/usr/local/bin/python2.7
-# send 2 non-overlapping ping6 fragments
+
+print "non-overlapping ping6 fragments"
 
 # |--------|
 #          |----|
diff --git a/regress/sys/netinet6/frag6/frag6_ext.py b/regress/sys/netinet6/frag6/frag6_ext.py
index 02a92cd4b0e..1f5c47d2f89 100644
--- a/regress/sys/netinet6/frag6/frag6_ext.py
+++ b/regress/sys/netinet6/frag6/frag6_ext.py
@@ -1,5 +1,9 @@
 #!/usr/local/bin/python2.7
-# send 2 ping6 fragments with hop-by-hop extension header
+
+print "ping6 fragments with hop-by-hop extension header before fragment header"
+
+# E|---------|
+#           E|----|
 
 import os
 from addr import *
diff --git a/regress/sys/netinet6/frag6/frag6_hop.py b/regress/sys/netinet6/frag6/frag6_hop.py
index 3a224870e1a..f8056e74814 100644
--- a/regress/sys/netinet6/frag6/frag6_hop.py
+++ b/regress/sys/netinet6/frag6/frag6_hop.py
@@ -1,5 +1,6 @@
 #!/usr/local/bin/python2.7
-# send 2 ping6 fragments with missplaced hop-by-hop extension header
+
+print "ping6 fragments with missplaced hop-by-hop extension header"
 
 # |HHHH----------|
 #                |----|
diff --git a/regress/sys/netinet6/frag6/frag6_opt.py b/regress/sys/netinet6/frag6/frag6_opt.py
index ce5ffef5ac0..08ad0148c49 100644
--- a/regress/sys/netinet6/frag6/frag6_opt.py
+++ b/regress/sys/netinet6/frag6/frag6_opt.py
@@ -1,5 +1,9 @@
 #!/usr/local/bin/python2.7
-# send 2 ping6 fragments with fragmented destination option
+
+print "ping6 fragments with fragmented destination option"
+
+# |OOOO|
+#      |OOOOOOOOOO--------------|
 
 import os
 from addr import *
diff --git a/regress/sys/netinet6/frag6/frag6_overatomic.py b/regress/sys/netinet6/frag6/frag6_overatomic.py
index a2f5787d869..664a17664ba 100644
--- a/regress/sys/netinet6/frag6/frag6_overatomic.py
+++ b/regress/sys/netinet6/frag6/frag6_overatomic.py
@@ -1,6 +1,6 @@
 #!/usr/local/bin/python2.7
-# send ping6 fragment that will overlap the second fragment
-# send atomic fragment with offset=0 and more=0, it must be processed
+
+print "atomic fragment with offset=0 and more=0, it must be processed"
 
 #      |XXXXXXXX|
 # |-------------|
diff --git a/regress/sys/netinet6/frag6/frag6_overdrop.py b/regress/sys/netinet6/frag6/frag6_overdrop.py
index 72eb157765a..cbcbab4a052 100644
--- a/regress/sys/netinet6/frag6/frag6_overdrop.py
+++ b/regress/sys/netinet6/frag6/frag6_overdrop.py
@@ -1,6 +1,6 @@
 #!/usr/local/bin/python2.7
-# send ping6 fragment that overlaps the first fragment with the head
-# send complete packet fragments and check that they generate a reply.
+
+print "ping6 fragment that overlaps the first fragment with the head"
 
 # |---------|
 #      |XXXXXXXXX|
diff --git a/regress/sys/netinet6/frag6/frag6_overhead.py b/regress/sys/netinet6/frag6/frag6_overhead.py
index a3e77ef70ce..208e3966260 100644
--- a/regress/sys/netinet6/frag6/frag6_overhead.py
+++ b/regress/sys/netinet6/frag6/frag6_overhead.py
@@ -1,5 +1,6 @@
 #!/usr/local/bin/python2.7
-# send ping6 fragment that overlaps the second fragment with the head
+
+print "ping6 fragment that overlaps the second fragment with the head"
 
 # |----|
 #      |----|
diff --git a/regress/sys/netinet6/frag6/frag6_overhead0.py b/regress/sys/netinet6/frag6/frag6_overhead0.py
index 63b5c9b9128..1b226b168e1 100644
--- a/regress/sys/netinet6/frag6/frag6_overhead0.py
+++ b/regress/sys/netinet6/frag6/frag6_overhead0.py
@@ -1,5 +1,6 @@
 #!/usr/local/bin/python2.7
-# send ping6 fragment that overlaps the first fragment with the head
+
+print "ping6 fragment that overlaps the first fragment with the head"
 
 # |--------|
 #      |XXXXXXXX|
diff --git a/regress/sys/netinet6/frag6/frag6_overtail.py b/regress/sys/netinet6/frag6/frag6_overtail.py
index f144c90a868..72cb733035e 100644
--- a/regress/sys/netinet6/frag6/frag6_overtail.py
+++ b/regress/sys/netinet6/frag6/frag6_overtail.py
@@ -1,5 +1,6 @@
 #!/usr/local/bin/python2.7
-# send ping6 fragment that overlaps the last fragment with the tail
+
+print "ping6 fragment that overlaps the last fragment with the tail"
 
 #          |----|
 #      |XXXXXXXX|
diff --git a/regress/sys/netinet6/frag6/frag6_padding.py b/regress/sys/netinet6/frag6/frag6_padding.py
index 18ecdccbdc8..56185a8b21b 100644
--- a/regress/sys/netinet6/frag6/frag6_padding.py
+++ b/regress/sys/netinet6/frag6/frag6_padding.py
@@ -1,5 +1,6 @@
 #!/usr/local/bin/python2.7
-# send 2 non-overlapping ping6 fragments with ethernet padding
+
+print "non-overlapping ping6 fragments with ethernet padding"
 
 # |--------|XX|
 #          |----|XX|
diff --git a/regress/sys/netinet6/frag6/frag6_permute.py b/regress/sys/netinet6/frag6/frag6_permute.py
index 3d3481ea1bb..f7757136084 100644
--- a/regress/sys/netinet6/frag6/frag6_permute.py
+++ b/regress/sys/netinet6/frag6/frag6_permute.py
@@ -1,5 +1,6 @@
 #!/usr/local/bin/python2.7
-# send 3 non-overlapping ping6 fragments in all possible orders
+
+print "send 3 non-overlapping ping6 fragments in all possible orders"
 
 # |----|
 #      |----|
diff --git a/regress/sys/netinet6/frag6/frag6_refrag.py b/regress/sys/netinet6/frag6/frag6_refrag.py
index 8b9608826cd..1b22ca9884d 100644
--- a/regress/sys/netinet6/frag6/frag6_refrag.py
+++ b/regress/sys/netinet6/frag6/frag6_refrag.py
@@ -1,5 +1,6 @@
 #!/usr/local/bin/python2.7
-# send fragments of a large packet that has to be refragmented by reflector
+
+print "fragments of a large packet that has to be refragmented by reflector"
 
 # |--------|
 #          |------------------|
diff --git a/regress/sys/netinet6/frag6/frag6_shortatomic.py b/regress/sys/netinet6/frag6/frag6_shortatomic.py
index 07d25580341..9cd74005c67 100644
--- a/regress/sys/netinet6/frag6/frag6_shortatomic.py
+++ b/regress/sys/netinet6/frag6/frag6_shortatomic.py
@@ -1,6 +1,6 @@
 #!/usr/local/bin/python2.7
-# send ping6 fragments containig destination option extension header
-# and the same as atomic fragments with missing protocol header
+
+print "fragment with dest option and atomic fragment without protocol header"
 
 # |-IP-|-Frag-|-ExtDest-|-ICMP6-|-pay|
 # |-- atomic fragment --|
diff --git a/regress/sys/netinet6/frag6/frag6_timeout.py b/regress/sys/netinet6/frag6/frag6_timeout.py
index a5b4155824f..cd61dffaea8 100644
--- a/regress/sys/netinet6/frag6/frag6_timeout.py
+++ b/regress/sys/netinet6/frag6/frag6_timeout.py
@@ -1,5 +1,6 @@
 #!/usr/local/bin/python2.7
-# send 6 non-overlapping ping6 fragments in 75 seconds, timeout is 60
+
+print "6 non-overlapping ping6 fragments in 75 seconds, timeout is 60"
 
 # |----|
 #      |----|
diff --git a/regress/sys/netinet6/frag6/frag6_udpatomic.py b/regress/sys/netinet6/frag6/frag6_udpatomic.py
index cc50c50434a..c93fa23e90c 100644
--- a/regress/sys/netinet6/frag6/frag6_udpatomic.py
+++ b/regress/sys/netinet6/frag6/frag6_udpatomic.py
@@ -1,8 +1,8 @@
 #!/usr/local/bin/python2.7
-# send atomic udp fragment
 
-# |--------|
-#          |----|
+print "atomic udp fragment"
+
+# |-------------|
 
 import os
 from addr import *
diff --git a/regress/sys/netinet6/frag6/frag6_udpheader.py b/regress/sys/netinet6/frag6/frag6_udpheader.py
index 431beaf4d9c..d6ef9a06074 100644
--- a/regress/sys/netinet6/frag6/frag6_udpheader.py
+++ b/regress/sys/netinet6/frag6/frag6_udpheader.py
@@ -1,8 +1,9 @@
 #!/usr/local/bin/python2.7
-# send 2 udp fragments splitted after udp header
 
-# |--------|
-#          |----|
+print "udp fragments splitted after udp header"
+
+# |----|
+#      |--------|
 
 import os
 from addr import *
diff --git a/regress/sys/netinet6/frag6/frag6_udppayload.py b/regress/sys/netinet6/frag6/frag6_udppayload.py
index 598faa57858..69b92cc565c 100644
--- a/regress/sys/netinet6/frag6/frag6_udppayload.py
+++ b/regress/sys/netinet6/frag6/frag6_udppayload.py
@@ -1,5 +1,6 @@
 #!/usr/local/bin/python2.7
-# send 2 udp fragments with splitted payload
+
+print "udp fragments with splitted payload"
 
 # |--------|
 #          |----|
diff --git a/regress/sys/netinet6/frag6/frag6_zerofirst.py b/regress/sys/netinet6/frag6/frag6_zerofirst.py
index 0cfea6d69cd..4a5bed9e9d6 100644
--- a/regress/sys/netinet6/frag6/frag6_zerofirst.py
+++ b/regress/sys/netinet6/frag6/frag6_zerofirst.py
@@ -1,5 +1,6 @@
 #!/usr/local/bin/python2.7
-# send ping6 fragment without payload with other proto before first fragment
+
+print "ping6 fragment without payload with other proto before first fragment"
 
 # ||
 # |---------|
diff --git a/regress/sys/netinet6/frag6/frag6_zerosecond.py b/regress/sys/netinet6/frag6/frag6_zerosecond.py
index 06a95e3f40b..0a448ebce87 100644
--- a/regress/sys/netinet6/frag6/frag6_zerosecond.py
+++ b/regress/sys/netinet6/frag6/frag6_zerosecond.py
@@ -1,5 +1,6 @@
 #!/usr/local/bin/python2.7
-# send ping6 fragment without payload with other proto after the first fragment
+
+print "ping6 fragment without payload with other proto after first fragment"
 
 # |---------|
 # ||