[ipfilter-cvs] ipfilter/test test.format, Makefile,

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

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

Modified Files:
	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.23
retrieving revision 1.24
diff -C2 -d -r1.23 -r1.24
*** test.format	20 Jul 2012 08:07:00 -0000	1.23
--- test.format	25 Aug 2012 14:28:07 -0000	1.24
***************
*** 92,96 ****
  ni3 hex hex update_ipid=1
  ni4 hex hex update_ipid=1
! ni5 hex hex update_ipid=1
  ni6 hex text update_ipid=1 -D
  ni7 hex hex update_ipid=1
--- 92,96 ----
  ni3 hex hex update_ipid=1
  ni4 hex hex update_ipid=1
! ni5 hex hex update_ipid=1,ftp_debug=8
  ni6 hex text update_ipid=1 -D
  ni7 hex hex update_ipid=1
***************
*** 148,149 ****
--- 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.25
retrieving revision 1.26
diff -C2 -d -r1.25 -r1.26
*** Makefile	20 Jul 2012 08:06:58 -0000	1.25
--- Makefile	25 Aug 2012 14:28:07 -0000	1.26
***************
*** 141,144 ****
--- 141,156 ----
  # Basic IPv6 NAT tests
  #
+ intests6: \
+ 	$(RESDIR)/in1_6 \
+ 	$(RESDIR)/in2_6 \
+ 	$(RESDIR)/in3_6 \
+ 	$(RESDIR)/in4_6 \
+ 	$(RESDIR)/in5_6 \
+ 	$(RESDIR)/in6_6 \
+ 	$(RESDIR)/in8_6 \
+ 	$(RESDIR)/in100_6 \
+ 	$(RESDIR)/in101_6 \
+ 	$(RESDIR)/in102_6
+ 
  ntests6: \
  	$(RESDIR)/n1_6 \
***************
*** 224,227 ****
--- 236,240 ----
  	$(RESDIR)/ipv6_5 \
  	$(RESDIR)/ipv6_6 \
+ 	intests6 \
  	ntests6
  
***************
*** 598,601 ****
--- 611,644 ----
  	@/bin/sh ./logtest $@ $(TESTMODE)
  
+ $(RESDIR)/in1_6: expected/in1_6 regress/in1_6
+ 	@/bin/sh ./in_test $@ $(TESTMODE)
+ 
+ $(RESDIR)/in2_6: expected/in2_6 regress/in2_6
+ 	@/bin/sh ./in_test $@ $(TESTMODE)
+ 
+ $(RESDIR)/in3_6: expected/in3_6 regress/in3_6
+ 	@/bin/sh ./in_test $@ $(TESTMODE)
+ 
+ $(RESDIR)/in4_6: expected/in4_6 regress/in4_6
+ 	@/bin/sh ./in_test $@ $(TESTMODE)
+ 
+ $(RESDIR)/in5_6: expected/in5_6 regress/in5_6
+ 	@/bin/sh ./in_test $@ $(TESTMODE)
+ 
+ $(RESDIR)/in6_6: expected/in6_6 regress/in6_6
+ 	@/bin/sh ./in_test $@ $(TESTMODE)
+ 
+ $(RESDIR)/in8_6: expected/in8_6 regress/in8_6
+ 	@/bin/sh ./in_test $@ $(TESTMODE)
+ 
+ $(RESDIR)/in100_6: expected/in100_6 regress/in100_6
+ 	@/bin/sh ./in_test $@ $(TESTMODE)
+ 
+ $(RESDIR)/in101_6: expected/in101_6 regress/in101_6
+ 	@/bin/sh ./in_test $@ $(TESTMODE)
+ 
+ $(RESDIR)/in102_6: expected/in102_6 regress/in102_6
+ 	@/bin/sh ./in_test $@ $(TESTMODE)
+ 
  $(RESDIR)/ipv6_1: expected/ipv6_1 input/$(RESDIR)/ipv6_1 regress/$(RESDIR)/ipv6_1
  	@/bin/sh ./ipv6_test $@ $(TESTMODE)