2
0
Fork 0

Collect test modules by procedure

This commit is contained in:
Emery Hemingway 2019-10-08 09:13:07 +02:00
parent 6702906437
commit cb7e956a73
8 changed files with 32 additions and 20 deletions

View File

@ -0,0 +1,10 @@
#!/usr/bin/env expect
proc collect_modules {arg} {
global modules
foreach path [glob $arg] {
set name [file tail $path]
file link -s $name $path
append modules " $name "
}
}

View File

@ -40,6 +40,8 @@ let
let
baseSetup = with testPkgs; ''
source ${./common-test-driver.exp}
file link -s core ${depot.base-linux}/bin/core
file link -s timer ${genode.base-linux}/bin/linux_timer_drv
file link -s ld.lib.so ${depot.base-linux}/lib/ld.lib.so

View File

@ -42,6 +42,7 @@ let
baseSetup = with testPkgs;
''
source ${./common-test-driver.exp}
global modules
set HOSTLD ${buildPackages.binutils}/bin/x86_64-unknown-genode-elf-ld

View File

@ -8,12 +8,12 @@ with pkgs;
testConfig = ./fs_report.xml;
testScript = ''
file link -s fs_report ${depot.fs_report}/bin/fs_report
file link -s fs_rom ${depot.fs_rom}/bin/fs_rom
file link -s ram_fs ${depot.ram_fs}/bin/ram_fs
file link -s vfs.lib.so ${depot.vfs}/lib/vfs.lib.so
file link -s test-fs_report ${depot.test-fs_report}/bin/test-fs_report
append modules { fs_report fs_rom ram_fs vfs.lib.so test-fs_report }
collect_modules ${depot.fs_report}/bin/*
collect_modules ${depot.fs_rom}/bin/*
collect_modules ${depot.ram_fs}/bin/*
collect_modules ${depot.test-fs_report}/bin/*
collect_modules ${depot.vfs}/lib/*
run_genode_until {child "test-fs_report" exited with exit value 0} 15
'';
}

View File

@ -9,12 +9,11 @@ rec {
testScript = ''
global qemu_mem
file link -s libc.lib.so ${depot.libc}/lib/libc.lib.so
file link -s libm.lib.so ${depot.libc}/lib/libm.lib.so
file link -s posix.lib.so ${depot.posix}/lib/posix.lib.so
file link -s vfs.lib.so ${depot.vfs}/lib/vfs.lib.so
file link -s test-libc ${depot.test-libc}/bin/test-libc
append modules { libc.lib.so libm.lib.so posix.lib.so vfs.lib.so test-libc }
collect_modules ${depot.libc}/lib/*
collect_modules ${depot.posix}/lib/*
collect_modules ${depot.test-libc}/bin/*
collect_modules ${depot.vfs}/lib/*
set qemu_mem 384
run_genode_until "child .* exited with exit value 0.*\n" 30
'';

View File

@ -8,8 +8,7 @@ rec {
testConfig = lib.renderDhallInit ./log.dhall "{=}";
testScript = ''
file link -s test-log ${genode.base}/bin/test-log
append modules { test-log }
collect_modules ${depot.test-log}/bin/*
run_genode_until {Test done.} 10
'';
}

View File

@ -8,8 +8,8 @@ rec {
testConfig = lib.renderDhallInit ./signal.dhall "{=}";
testScript = ''
file link -s test-signal ${depot.test-signal}/bin/test-signal
append modules { test-signal }
collect_modules ${depot.test-signal}/bin/*
run_genode_until {--- Signalling test finished ---} 80
'';
}

View File

@ -8,10 +8,11 @@ rec {
testConfig = lib.renderDhallInit ./solo5.dhall "{=}";
testScript = ''
global modules
file link -s solo5.lib.so ${solo5}/lib/solo5-bindings-genode/solo5.lib.so
file link -s solo5-test_hello ${solo5.tests}/bin/solo5-test_hello
append modules { solo5.lib.so solo5-test_hello }
collect_modules ${solo5.tests}/bin/*
collect_modules ${solo5}/lib/solo5-bindings-genode/solo5.lib.so
collect_modules ${genode.os}/bin/nic_loopback
collect_modules ${genode.os}/bin/ram_block
collect_modules ${genode.os}/bin/sequence
run_genode_until "child .* exited with exit value 0.*\n" 30
'';