update cvs and iptables to newer version for toolchain test

The old versions of cvs and iptables may meet compile error under some architecture
- cvs 1.11.23 fails on x86-64 host and iptables 1.4.9 fails on arm host. Update them to latest version could solve these build error.
Meanwhile, 240s timeout is set for sudoku becasue 120s is not enough to finish compile.

The following changes since commit 7cd2ac0e40d854bab9a32512018aff6172500c0e:

common-licenses: Additions and corrections (2011-06-23 23:44:49 +0100)

are available in the git repository at:
git://git.pokylinux.org/poky-contrib jxu49/master
http://git.pokylinux.org/cgit.cgi/poky-contrib/log/?h=jxu49/master

Jiajun Xu (1):
qemuimagetest: update cvs and iptables to newer version for toolchain
test

 meta/classes/imagetest-qemu.bbclass             |    2 +-
 scripts/qemuimage-testlib                       |   52 ++++++++++++++++++----
 scripts/qemuimage-tests/toolchain/sudoku-savant |    2 +-
 3 files changed, 44 insertions(+), 12 deletions(-)

The old versions of cvs and iptables may meet compile error under some architecture
- cvs 1.11.23 fails on x86-64 host and iptables 1.4.9 fails on arm host. Update them to latest version could solve these build error.
Meanwhile, 240s timeout is set for sudoku becasue 120s is not enough to finish compile.

Signed-off-by Jiajun Xu <[email protected]>

---
 meta/classes/imagetest-qemu.bbclass             |    2 +-
 scripts/qemuimage-testlib                       |   52 ++++++++++++++++++----
 scripts/qemuimage-tests/toolchain/sudoku-savant |    2 +-
 3 files changed, 44 insertions(+), 12 deletions(-)

index e259ae9..25304de 100644
@@ -33,7 +33,7 @@ def qemuimagetest_main(d):
     Test Controller for automated testing.
     """
     
-    casestr = re.compile(r'(?P<scen>\w+\b):(?P<case>\w+$)')
+    casestr = re.compile(r'(?P<scen>\w+\b):(?P<case>\S+$)')
     resultstr = re.compile(r'\s*(?P<case>\w+)\s*(?P<pass>\d+)\s*(?P<fail>\d+)\s*(?P<noresult>\d+)')
     machine = bb.data.getVar('MACHINE', d, 1)
     pname = bb.data.getVar('PN', d, 1)

index 603afe6..3d149de 100755
@@ -11,7 +11,7 @@
 #
 . $COREBASE/scripts/qemuimage-testlib
 
-TIMEOUT=120
+TIMEOUT=240
 
 # Extract and test toolchain tarball
 Test_Toolchain sudoku-savant ${TIMEOUT}

1.7.1

Merged to master, thanks.

Richard