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

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

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

Modified Files:
      Tag: v5-1-RELEASE
	Makefile test.format 
Log Message:
3544313 remove nat encap feature

Index: Makefile
===================================================================
RCS file: /cvsroot/ipfilter/ipfilter/test/Makefile,v
retrieving revision 1.19.2.4
retrieving revision 1.19.2.5
diff -C2 -d -r1.19.2.4 -r1.19.2.5
*** Makefile	6 Jul 2012 14:35:37 -0000	1.19.2.4
--- Makefile	20 Jul 2012 08:10:50 -0000	1.19.2.5
***************
*** 34,38 ****
  	 i20 i21 i22 i23
  
! ntests: 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 n201
  
  ntests6: n1_6 n2_6 n4_6 n5_6 n6_6 n7_6 n8_6 n9_6 n11_6 n12_6 n15_6
--- 34,38 ----
  	 i20 i21 i22 i23
  
! ntests: 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
  
  ntests6: n1_6 n2_6 n4_6 n5_6 n6_6 n7_6 n8_6 n9_6 n11_6 n12_6 n15_6
***************
*** 288,297 ****
  	@/bin/sh ./nattest `awk "/^$@ / { print; } " test.format`
  
- n201: expected/n201 regress/n201 input/n201
- 	@/bin/sh ./nattest `awk "/^$@ / { print; } " test.format`
- 
- n202: expected/n202 regress/n202 input/n202
- 	@/bin/sh ./nattest `awk "/^$@ / { print; } " test.format`
- 
  n1_6: expected/n1_6 regress/n1_6 input/n1_6
  	@/bin/sh ./nattest `awk "/^$@ / { print; } " test.format`
--- 288,291 ----
***************
*** 500,504 ****
  	/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 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 n201 n202
  	/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
  	/bin/rm -f ni1 ni2 ni3 ni4 ni5 ni6 ni7 ni8 ni9
--- 494,498 ----
  	/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 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
  	/bin/rm -f ni1 ni2 ni3 ni4 ni5 ni6 ni7 ni8 ni9

Index: test.format
===================================================================
RCS file: /cvsroot/ipfilter/ipfilter/test/test.format,v
retrieving revision 1.17.2.3
retrieving revision 1.17.2.4
diff -C2 -d -r1.17.2.3 -r1.17.2.4
*** test.format	16 Feb 2012 02:22:30 -0000	1.17.2.3
--- test.format	20 Jul 2012 08:10:50 -0000	1.17.2.4
***************
*** 88,93 ****
  n106 hex hex update_ipid=0
  n200 hex hex update_ipid=0
- n201 hex hex update_ipid=0
- n202 hex hex update_ipid=0
  ni1 hex hex update_ipid=1
  ni2 hex hex update_ipid=1
--- 88,91 ----