[ipfilter-cvs] ipfilter/test test.format, v5-1-RELEASE Makefile, v5-1-RELEASE

[Darren <dar...@us...>]

Update of /cvsroot/ipfilter/ipfilter/test
In directory vz-cvs-4.sog:/tmp/cvs-serv22423

Modified Files:
      Tag: v5-1-RELEASE
	test.format Makefile 
Log Message:
3561650 no testing of ipv6 nat parsing

Index: test.format
===================================================================
RCS file: /cvsroot/ipfilter/ipfilter/test/test.format,v
retrieving revision 1.17.2.4
retrieving revision 1.17.2.5
diff -C2 -d -r1.17.2.4 -r1.17.2.5
*** test.format	20 Jul 2012 08:10:50 -0000	1.17.2.4
--- test.format	25 Aug 2012 14:30:34 -0000	1.17.2.5
***************
*** 117,120 ****
--- 117,121 ----
  p6 text text
  p7 text text
+ p8 text text
  p9 text text
  p10 text text
***************
*** 147,148 ****
--- 148,159 ----
  f29 text text
  f30 text text
+ in1_6 text text -6
+ in2_6 text text -6
+ in3_6 text text -6
+ in4_6 text text -6
+ in5_6 text text -6
+ in6_6 text text -6
+ in8_6 text text -6
+ in100_6 text text -6
+ in101_6 text text -6
+ in102_6 text text -6

Index: Makefile
===================================================================
RCS file: /cvsroot/ipfilter/ipfilter/test/Makefile,v
retrieving revision 1.19.2.5
retrieving revision 1.19.2.6
diff -C2 -d -r1.19.2.5 -r1.19.2.6
*** Makefile	20 Jul 2012 08:10:50 -0000	1.19.2.5
--- Makefile	25 Aug 2012 14:30:34 -0000	1.19.2.6
***************
*** 43,51 ****
  intests: in1 in2 in3 in4 in5 in6 in7 in8 in100 in101 in102
  
  logtests: l1
  
  pools: p1 p2 p3 p4 p5 p6 p7 p9 p10 p11 p12 p13 ip1 ip2 ip3
  
! ipv6: ipv6.1 ipv6.2 ipv6.3 ipv6.4 ipv6.5 ipv6.6 ntests6
  
  bpf: bpf1 bpf-f1
--- 43,53 ----
  intests: in1 in2 in3 in4 in5 in6 in7 in8 in100 in101 in102
  
+ intests6: in1_6 in2_6 in3_6 in4_6 in5_6 in6_6 in8_6 in100_6 in101_6 in102_6
+ 
  logtests: l1
  
  pools: p1 p2 p3 p4 p5 p6 p7 p9 p10 p11 p12 p13 ip1 ip2 ip3
  
! ipv6: ipv6.1 ipv6.2 ipv6.3 ipv6.4 ipv6.5 ipv6.6 ntests6 intests6
  
  bpf: bpf1 bpf-f1
***************
*** 420,423 ****
--- 422,456 ----
  	@/bin/sh ./intest `awk "/^$@ / { print; } " test.format`
  
+ in1_6: expected/in1_6 regress/in1_6
+ 	@/bin/sh ./intest `awk "/^$@ / { print; } " test.format`
+ 
+ in2_6: expected/in2_6 regress/in2_6
+ 	@/bin/sh ./intest `awk "/^$@ / { print; } " test.format`
+ 
+ in3_6: expected/in3_6 regress/in3_6
+ 	@/bin/sh ./intest `awk "/^$@ / { print; } " test.format`
+ 
+ in4_6: expected/in4_6 regress/in4_6
+ 	@/bin/sh ./intest `awk "/^$@ / { print; } " test.format`
+ 
+ in5_6: expected/in5_6 regress/in5_6
+ 	@/bin/sh ./intest `awk "/^$@ / { print; } " test.format`
+ 
+ in6_6: expected/in6_6 regress/in6_6
+ 	@/bin/sh ./intest `awk "/^$@ / { print; } " test.format`
+ 
+ in8_6: expected/in8_6 regress/in8_6
+ 	@/bin/sh ./intest `awk "/^$@ / { print; } " test.format`
+ 
+ in100_6: expected/in100_6 regress/in100_6
+ 	@/bin/sh ./intest `awk "/^$@ / { print; } " test.format`
+ 
+ in101_6: expected/in101_6 regress/in101_6
+ 	@/bin/sh ./intest `awk "/^$@ / { print; } " test.format`
+ 
+ in102_6: expected/in102_6 regress/in102_6
+ 	@/bin/sh ./intest `awk "/^$@ / { print; } " test.format`
+ 
+ l1:
  l1:
  	@/bin/sh ./logtest `awk "/^$@ / { print; } " test.format`
***************
*** 494,497 ****
--- 527,531 ----
  	/bin/rm -f i1 i2 i3 i4 i5 i6 i7 i8 i9 i10 i11 i12 i13 i14 i15 i16 i17
  	/bin/rm -f i18 i19 i20 i21 i22 i23
+ 	/bin/rm -f in1_6 in2_6 in3_6 in4_6 in5_6 in6_6 in8_6 in100_6 in101_6 in102_6
  	/bin/rm -f n1 n2 n3 n4 n5 n6 n7 n8 n9 n10 n11 n12 n13 n14 n15 n16 n17 n18 n100 n101 n102 n103 n104 n105 n106 n200
  	/bin/rm -f n1_6 n2_6 n4_6 n5_6 n6_6 n7_6 n8_6 n9_6 n11_6 n12_6 n15_6