Check md5 sum of initramfs file in l4lx run-script

* Always download md5sum file and check downloaded binaries
* Extend sleep time in l4linux_netperf script, so that DHCP has enough time
* Fix regexp rule in l4linux_netperf run script to work with MAC addresses
  containing only numbers

Fix #787
This commit is contained in:
Stefan Kalkowski 2013-07-01 11:22:59 +02:00 committed by Norman Feske
parent aacb91f22a
commit 1904a223e8
10 changed files with 44 additions and 7 deletions

View File

@ -263,6 +263,12 @@ if {![file exists bin/system-ginger.img]} {
puts "Download system image ..."
exec curl $system_uri > bin/system-ginger.img 2> /dev/null
}
exec >& /dev/null wget -O bin/root-ginger.gz.md5 $initrd_uri.md5
exec >& /dev/null wget -O bin/system-ginger.img.md5 $system_uri.md5
cd bin
exec md5sum -c root-ginger.gz.md5
exec md5sum -c system-ginger.img.md5
cd ..
build_boot_image [join $boot_modules " "]

View File

@ -156,6 +156,10 @@ if {![file exists bin/initrd.gz]} {
puts "Download initramfs ..."
exec >& /dev/null wget -c -O bin/initrd.gz $uri
}
exec >& /dev/null wget -O bin/initrd.gz.md5 $uri.md5
cd bin
exec md5sum -c initrd.gz.md5
cd ..
build_boot_image [join $boot_modules " "]
@ -183,4 +187,4 @@ expect {
}
puts "Test succeeded"
exec rm bin/initrd.gz
exec rm bin/initrd.gz bin/initrd.gz.md5

View File

@ -114,11 +114,15 @@ set boot_modules {
lappend_if $interpose_part_blk boot_modules part_blk
set uri "https://github.com/m-stein/genode_related/raw/master/arndale/ahci_bench/l4lx/initrd.gz"
set uri "http://genode.org/files/l4linux/initrd-ahci-bench.gz"
if {![file exists bin/initrd.gz]} {
puts "Download initramfs ..."
exec >& /dev/null wget -c -O bin/initrd.gz $uri
}
exec >& /dev/null wget -O bin/initrd.gz.md5 $uri.md5
cd bin
exec md5sum -c initrd.gz.md5
cd ..
set fiasco_serial_esc_arg ""

View File

@ -367,7 +367,7 @@ if {![file exists bin/initrd.gz]} {
puts "Download initramfs ..."
exec >& /dev/null wget -c -O bin/initrd.gz $uri
}
exec >& /dev/null wget -c -O bin/initrd.gz.md5 $uri.md5
exec >& /dev/null wget -O bin/initrd.gz.md5 $uri.md5
cd bin
exec md5sum -c initrd.gz.md5
cd ..

View File

@ -130,6 +130,10 @@ if {![file exists bin/initrd.gz]} {
puts "Download initramfs ..."
exec >& /dev/null wget -c -O bin/initrd.gz $uri
}
exec >& /dev/null wget -O bin/initrd.gz.md5 $uri.md5
cd bin
exec md5sum -c initrd.gz.md5
cd ..
build_boot_image [join $boot_modules " "]
@ -137,7 +141,7 @@ build_boot_image [join $boot_modules " "]
#
# Execute test case
#
set ip_match "(\[0-9]{1,3})\.(\[0-9]{1,3})\.(\[0-9]{1,3})\.(\[0-9]{1,3})"
set ip_match "(\[0-9]{1,3})\\.(\[0-9]{1,3})\\.(\[0-9]{1,3})\\.(\[0-9]{1,3})"
#
# Local IP
@ -151,7 +155,7 @@ regexp $ip_match $ip_string ip_local
#
run_genode_until "Link status is: 1.*" 220
set serial_id $spawn_id
sleep 3
sleep 8
send "ip addr show dev eth0\n"
run_genode_until "inet.*\n" 3 $serial_id
regexp $ip_match $output ip_remote

View File

@ -115,12 +115,15 @@ set boot_modules {
usb_drv
}
set uri "https://github.com/downloads/skalk/genode/busybox-initrd-arm-20120710.gz"
set uri "http://genode.org/files/l4linux/busybox-initrd-arm-20120710.gz"
if {![file exists bin/initrd.gz]} {
puts "Download initramfs ..."
exec >& /dev/null wget -c -O bin/initrd.gz $uri
}
exec >& /dev/null wget -O bin/initrd.gz.md5 $uri.md5
cd bin
exec md5sum -c initrd.gz.md5
cd ..
build_boot_image [join $boot_modules " "]

View File

@ -152,6 +152,10 @@ if {![file exists bin/initrd.gz]} {
puts "Download initramfs ..."
exec >& /dev/null wget -c -O bin/initrd.gz $uri
}
exec >& /dev/null wget -O bin/initrd.gz.md5 $uri.md5
cd bin
exec md5sum -c initrd.gz.md5
cd ..
build_boot_image [join $boot_modules " "]

View File

@ -162,6 +162,10 @@ if {![file exists bin/initrd.gz]} {
puts "Download initramfs ..."
exec >& /dev/null wget -c -O bin/initrd.gz $uri
}
exec >& /dev/null wget -O bin/initrd.gz.md5 $uri.md5
cd bin
exec md5sum -c initrd.gz.md5
cd ..
build_boot_image [join $boot_modules " "]

View File

@ -215,6 +215,10 @@ if {![file exists bin/initrd.gz]} {
puts "Download initramfs ..."
exec >& /dev/null wget -c -O bin/initrd.gz $uri
}
exec >& /dev/null wget -O bin/initrd.gz.md5 $uri.md5
cd bin
exec md5sum -c initrd.gz.md5
cd ..
build_boot_image [join $boot_modules " "]

View File

@ -252,6 +252,10 @@ if {![file exists bin/initrd.gz]} {
puts "Download initramfs ..."
exec >& /dev/null wget -c -O bin/initrd.gz $uri
}
exec >& /dev/null wget -O bin/initrd.gz.md5 $uri.md5
cd bin
exec md5sum -c initrd.gz.md5
cd ..
build_boot_image [join $boot_modules " "]