test: update to use new routes configuration method
This commit is contained in:
parent
1941fd196c
commit
06c8283dee
|
@ -25,26 +25,16 @@ let relabel =
|
||||||
|
|
||||||
let drivers =
|
let drivers =
|
||||||
Init::{
|
Init::{
|
||||||
|
, routes = [ ServiceRoute.parent "Timer" ]
|
||||||
, services =
|
, services =
|
||||||
[ ServiceRoute.child "Framebuffer" "dynamic"
|
[ ServiceRoute.child "Framebuffer" "dynamic"
|
||||||
, ServiceRoute.child "Block" "dynamic"
|
, ServiceRoute.child "Block" "dynamic"
|
||||||
, ServiceRoute.child "Usb" "usb_drv"
|
, ServiceRoute.child "Usb" "usb_drv"
|
||||||
, ServiceRoute.child "Platform" "platform_drv"
|
, ServiceRoute.child "Platform" "platform_drv"
|
||||||
, ServiceRoute.child "Input" "input_filter"
|
, ServiceRoute.child "Input" "input_filter"
|
||||||
, ServiceRoute.child "Rtc" "rtc"
|
|
||||||
]
|
]
|
||||||
, children = toMap
|
, children = toMap
|
||||||
{ rtc =
|
{ rom_reporter =
|
||||||
Child.flat
|
|
||||||
Child.Attributes::{
|
|
||||||
, binary = "rtc_drv"
|
|
||||||
, provides = [ "Rtc" ]
|
|
||||||
, routes =
|
|
||||||
[ ServiceRoute.parent "IO_PORT"
|
|
||||||
, ServiceRoute.parent "IO_MEM"
|
|
||||||
]
|
|
||||||
}
|
|
||||||
, rom_reporter =
|
|
||||||
Child.flat
|
Child.flat
|
||||||
Child.Attributes::{
|
Child.Attributes::{
|
||||||
, binary = "rom_reporter"
|
, binary = "rom_reporter"
|
||||||
|
@ -107,7 +97,6 @@ let drivers =
|
||||||
[ ServiceRoute.parent "IRQ"
|
[ ServiceRoute.parent "IRQ"
|
||||||
, ServiceRoute.parent "IO_MEM"
|
, ServiceRoute.parent "IO_MEM"
|
||||||
, ServiceRoute.parent "IO_PORT"
|
, ServiceRoute.parent "IO_PORT"
|
||||||
, ServiceRoute.parent "Timer"
|
|
||||||
, ServiceRoute.parentLabel
|
, ServiceRoute.parentLabel
|
||||||
"ROM"
|
"ROM"
|
||||||
(Some "system")
|
(Some "system")
|
||||||
|
@ -172,7 +161,6 @@ let drivers =
|
||||||
"Report"
|
"Report"
|
||||||
(Some "config")
|
(Some "config")
|
||||||
(Some "usb_active_config")
|
(Some "usb_active_config")
|
||||||
, ServiceRoute.parent "Timer"
|
|
||||||
]
|
]
|
||||||
}
|
}
|
||||||
, ps2_drv =
|
, ps2_drv =
|
||||||
|
@ -180,10 +168,7 @@ let drivers =
|
||||||
Child.Attributes::{
|
Child.Attributes::{
|
||||||
, binary = "ps2_drv"
|
, binary = "ps2_drv"
|
||||||
, provides = [ "Input" ]
|
, provides = [ "Input" ]
|
||||||
, routes =
|
, routes = [ ServiceRoute.child "Platform" "platform_drv" ]
|
||||||
[ ServiceRoute.child "Platform" "platform_drv"
|
|
||||||
, ServiceRoute.parent "Timer"
|
|
||||||
]
|
|
||||||
}
|
}
|
||||||
, input_filter =
|
, input_filter =
|
||||||
Child.flat
|
Child.flat
|
||||||
|
@ -193,8 +178,7 @@ let drivers =
|
||||||
, resources = Resources::{ ram = Genode.units.MiB 2 }
|
, resources = Resources::{ ram = Genode.units.MiB 2 }
|
||||||
, provides = [ "Input" ]
|
, provides = [ "Input" ]
|
||||||
, routes =
|
, routes =
|
||||||
[ ServiceRoute.parent "Timer"
|
[ ServiceRoute.parentLabel
|
||||||
, ServiceRoute.parentLabel
|
|
||||||
"ROM"
|
"ROM"
|
||||||
(Some "config")
|
(Some "config")
|
||||||
(Some "input_filter.config")
|
(Some "input_filter.config")
|
||||||
|
|
|
@ -19,16 +19,16 @@ let ServiceRoute = Init.ServiceRoute
|
||||||
let init =
|
let init =
|
||||||
Init::{
|
Init::{
|
||||||
, verbose = True
|
, verbose = True
|
||||||
|
, routes =
|
||||||
|
[ ServiceRoute.parent "Timer"
|
||||||
|
, ServiceRoute.child "Block" "block_router"
|
||||||
|
]
|
||||||
, children =
|
, children =
|
||||||
let blockTest =
|
let blockTest =
|
||||||
Child.flat
|
Child.flat
|
||||||
Child.Attributes::{
|
Child.Attributes::{
|
||||||
, binary = "test-block-client"
|
, binary = "test-block-client"
|
||||||
, resources = Resources::{ ram = Genode.units.MiB 5 }
|
, resources = Resources::{ ram = Genode.units.MiB 5 }
|
||||||
, routes =
|
|
||||||
[ ServiceRoute.parent "Timer"
|
|
||||||
, ServiceRoute.child "Block" "block_router"
|
|
||||||
]
|
|
||||||
}
|
}
|
||||||
|
|
||||||
in toMap
|
in toMap
|
||||||
|
|
|
@ -69,8 +69,7 @@ listToAttrs ((concatLists (map (testsToList) [ linux hw nova ]))) // {
|
||||||
}) novaTests);
|
}) novaTests);
|
||||||
|
|
||||||
in buildPackages.stdenv.mkDerivation {
|
in buildPackages.stdenv.mkDerivation {
|
||||||
pname = "sotest";
|
name = "sotest";
|
||||||
version = toString self.revCount;
|
|
||||||
buildCommand = ''
|
buildCommand = ''
|
||||||
mkdir zip; cd zip
|
mkdir zip; cd zip
|
||||||
cp "${testPkgs.bender}" bender
|
cp "${testPkgs.bender}" bender
|
||||||
|
|
|
@ -29,6 +29,7 @@ let label = λ(_ : Text) → { local = _, route = _ }
|
||||||
let init =
|
let init =
|
||||||
Init::{
|
Init::{
|
||||||
, verbose = True
|
, verbose = True
|
||||||
|
, routes = [ ServiceRoute.parent "Timer" ]
|
||||||
, children = toMap
|
, children = toMap
|
||||||
{ drivers =
|
{ drivers =
|
||||||
Init.toChild
|
Init.toChild
|
||||||
|
@ -44,10 +45,10 @@ let init =
|
||||||
, childRomRoute "dynamic_rom" "numlock"
|
, childRomRoute "dynamic_rom" "numlock"
|
||||||
, childRomRoute "dynamic_rom" "system"
|
, childRomRoute "dynamic_rom" "system"
|
||||||
, ServiceRoute.child "Report" "_report_rom"
|
, ServiceRoute.child "Report" "_report_rom"
|
||||||
|
, ServiceRoute.parent "IRQ"
|
||||||
|
, ServiceRoute.parent "IO_MEM"
|
||||||
|
, ServiceRoute.parent "IO_PORT"
|
||||||
, ServiceRoute.parent "Timer"
|
, ServiceRoute.parent "Timer"
|
||||||
, Genode.Init.ServiceRoute.parent "IRQ"
|
|
||||||
, Genode.Init.ServiceRoute.parent "IO_MEM"
|
|
||||||
, Genode.Init.ServiceRoute.parent "IO_PORT"
|
|
||||||
]
|
]
|
||||||
}
|
}
|
||||||
, dynamic_rom =
|
, dynamic_rom =
|
||||||
|
|
|
@ -17,7 +17,6 @@ in Test::{
|
||||||
, caps = 500
|
, caps = 500
|
||||||
, ram = Genode.units.MiB 10
|
, ram = Genode.units.MiB 10
|
||||||
}
|
}
|
||||||
, routes = [ Genode.Init.ServiceRoute.parent "Timer" ]
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
@ -17,7 +17,6 @@ in Test::{
|
||||||
, caps = 500
|
, caps = 500
|
||||||
, ram = Genode.units.MiB 10
|
, ram = Genode.units.MiB 10
|
||||||
}
|
}
|
||||||
, routes = [ Genode.Init.ServiceRoute.parent "Timer" ]
|
|
||||||
, config = Genode.Init.Config::{
|
, config = Genode.Init.Config::{
|
||||||
, attributes = toMap
|
, attributes = toMap
|
||||||
{ stdin = "/script"
|
{ stdin = "/script"
|
||||||
|
|
|
@ -12,6 +12,10 @@ let ServiceRoute = Init.ServiceRoute
|
||||||
|
|
||||||
let init =
|
let init =
|
||||||
Init::{
|
Init::{
|
||||||
|
, routes =
|
||||||
|
[ Genode.Init.ServiceRoute.parent "Timer"
|
||||||
|
, Genode.Init.ServiceRoute.child "Nic" "bridge"
|
||||||
|
]
|
||||||
, children = toMap
|
, children = toMap
|
||||||
{ nic =
|
{ nic =
|
||||||
Child.flat
|
Child.flat
|
||||||
|
@ -42,10 +46,6 @@ let init =
|
||||||
Child.Attributes::{
|
Child.Attributes::{
|
||||||
, binary = "solo5-test_net"
|
, binary = "solo5-test_net"
|
||||||
, resources = Res::{ caps = 256, ram = Genode.units.MiB 3 }
|
, resources = Res::{ caps = 256, ram = Genode.units.MiB 3 }
|
||||||
, routes =
|
|
||||||
[ ServiceRoute.parent "Timer"
|
|
||||||
, ServiceRoute.child "Nic" "bridge"
|
|
||||||
]
|
|
||||||
, config = Init.Config::{
|
, config = Init.Config::{
|
||||||
, content =
|
, content =
|
||||||
[ Genode.Prelude.XML.text "<cmdline>limit</cmdline>" ]
|
[ Genode.Prelude.XML.text "<cmdline>limit</cmdline>" ]
|
||||||
|
@ -57,10 +57,6 @@ let init =
|
||||||
, binary = "ping"
|
, binary = "ping"
|
||||||
, exitPropagate = True
|
, exitPropagate = True
|
||||||
, resources = Res::{ caps = 128, ram = Genode.units.MiB 6 }
|
, resources = Res::{ caps = 128, ram = Genode.units.MiB 6 }
|
||||||
, routes =
|
|
||||||
[ ServiceRoute.parent "Timer"
|
|
||||||
, ServiceRoute.child "Nic" "bridge"
|
|
||||||
]
|
|
||||||
, config = Init.Config::{
|
, config = Init.Config::{
|
||||||
, attributes = toMap
|
, attributes = toMap
|
||||||
{ interface = "10.0.0.72/24"
|
{ interface = "10.0.0.72/24"
|
||||||
|
|
|
@ -10,6 +10,10 @@ let Res = Init.Resources
|
||||||
|
|
||||||
let init =
|
let init =
|
||||||
Init::{
|
Init::{
|
||||||
|
, routes =
|
||||||
|
[ Genode.Init.ServiceRoute.parent "Timer"
|
||||||
|
, Genode.Init.ServiceRoute.child "Nic" "bridge"
|
||||||
|
]
|
||||||
, children = toMap
|
, children = toMap
|
||||||
{ nic =
|
{ nic =
|
||||||
Child.flat
|
Child.flat
|
||||||
|
@ -40,10 +44,6 @@ let init =
|
||||||
Child.Attributes::{
|
Child.Attributes::{
|
||||||
, binary = "solo5-test_net_2if"
|
, binary = "solo5-test_net_2if"
|
||||||
, resources = Res::{ caps = 256, ram = Genode.units.MiB 5 }
|
, resources = Res::{ caps = 256, ram = Genode.units.MiB 5 }
|
||||||
, routes =
|
|
||||||
[ Genode.Init.ServiceRoute.parent "Timer"
|
|
||||||
, Genode.Init.ServiceRoute.child "Nic" "bridge"
|
|
||||||
]
|
|
||||||
, config = Init.Config::{
|
, config = Init.Config::{
|
||||||
, content =
|
, content =
|
||||||
[ Genode.Prelude.XML.text
|
[ Genode.Prelude.XML.text
|
||||||
|
@ -59,10 +59,6 @@ let init =
|
||||||
, binary = "sequence"
|
, binary = "sequence"
|
||||||
, exitPropagate = True
|
, exitPropagate = True
|
||||||
, resources = Res::{ caps = 256, ram = Genode.units.MiB 8 }
|
, resources = Res::{ caps = 256, ram = Genode.units.MiB 8 }
|
||||||
, routes =
|
|
||||||
[ Genode.Init.ServiceRoute.parent "Timer"
|
|
||||||
, Genode.Init.ServiceRoute.child "Nic" "bridge"
|
|
||||||
]
|
|
||||||
, config = Init.Config::{
|
, config = Init.Config::{
|
||||||
, content =
|
, content =
|
||||||
[ Genode.Prelude.XML.text
|
[ Genode.Prelude.XML.text
|
||||||
|
|
|
@ -27,7 +27,6 @@ let toSimple =
|
||||||
}
|
}
|
||||||
]
|
]
|
||||||
}
|
}
|
||||||
, routes = [ Init.ServiceRoute.parent "Timer" ]
|
|
||||||
}
|
}
|
||||||
|
|
||||||
let tests
|
let tests
|
||||||
|
|
|
@ -6,34 +6,12 @@ let Init = Genode.Init
|
||||||
|
|
||||||
let Child = Init.Child
|
let Child = Init.Child
|
||||||
|
|
||||||
let init =
|
let solo5 =
|
||||||
Init::{
|
|
||||||
, children = toMap
|
|
||||||
{ solo5 =
|
|
||||||
Child.flat
|
Child.flat
|
||||||
Child.Attributes::{
|
Child.Attributes::{
|
||||||
, binary = "solo5-test_time"
|
, binary = "solo5-test_time"
|
||||||
, exitPropagate = True
|
, exitPropagate = True
|
||||||
, resources = Init.Resources::{
|
, resources = Init.Resources::{ caps = 256, ram = Genode.units.MiB 3 }
|
||||||
, caps = 256
|
|
||||||
, ram = Genode.units.MiB 3
|
|
||||||
}
|
|
||||||
, routes =
|
|
||||||
[ Init.ServiceRoute.parent "Timer"
|
|
||||||
, Init.ServiceRoute.child "Rtc" "rtc_drv"
|
|
||||||
]
|
|
||||||
}
|
|
||||||
, rtc_drv =
|
|
||||||
Child.flat
|
|
||||||
Child.Attributes::{
|
|
||||||
, binary = "rtc_drv"
|
|
||||||
, exitPropagate = True
|
|
||||||
, provides = [ "Rtc" ]
|
|
||||||
, routes = [ Init.ServiceRoute.parent "IO_PORT" ]
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|
||||||
in Init.toChild
|
in solo5
|
||||||
init
|
|
||||||
Init.Attributes::{ routes = [ Init.ServiceRoute.parent "IO_PORT" ] }
|
|
||||||
|
|
|
@ -26,7 +26,6 @@ in { Genode = Genode
|
||||||
, Init.ServiceRoute.parent "IO_PORT"
|
, Init.ServiceRoute.parent "IO_PORT"
|
||||||
, Init.ServiceRoute.parent "IRQ"
|
, Init.ServiceRoute.parent "IRQ"
|
||||||
, Init.ServiceRoute.parent "VM"
|
, Init.ServiceRoute.parent "VM"
|
||||||
, Init.ServiceRoute.child "Timer" "timer"
|
|
||||||
]
|
]
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
@ -16,10 +16,7 @@ let vmm =
|
||||||
, caps = 2048
|
, caps = 2048
|
||||||
, ram = Genode.units.MiB 256
|
, ram = Genode.units.MiB 256
|
||||||
}
|
}
|
||||||
, routes =
|
, routes = [ Genode.Init.ServiceRoute.parent "VM" ]
|
||||||
[ Genode.Init.ServiceRoute.parent "Timer"
|
|
||||||
, Genode.Init.ServiceRoute.parent "VM"
|
|
||||||
]
|
|
||||||
}
|
}
|
||||||
|
|
||||||
in Test::{ children = toMap { vmm = vmm } }
|
in Test::{ children = toMap { vmm = vmm } }
|
||||||
|
|
|
@ -23,22 +23,17 @@ let signal =
|
||||||
, exitPropagate = True
|
, exitPropagate = True
|
||||||
, priority = 5
|
, priority = 5
|
||||||
, resources = Init.Resources::{ caps = 500, ram = Genode.units.MiB 10 }
|
, resources = Init.Resources::{ caps = 500, ram = Genode.units.MiB 10 }
|
||||||
, routes = [ Init.ServiceRoute.parent "Timer" ]
|
|
||||||
}
|
}
|
||||||
|
|
||||||
let rtc =
|
let rtc = Child.flat Child.Attributes::{ binary = "test-rtc" }
|
||||||
Child.flat
|
|
||||||
Child.Attributes::{
|
|
||||||
, binary = "test-rtc"
|
|
||||||
, routes =
|
|
||||||
[ Genode.Init.ServiceRoute.parent "Timer"
|
|
||||||
, Genode.Init.ServiceRoute.parent "Rtc"
|
|
||||||
]
|
|
||||||
}
|
|
||||||
|
|
||||||
let pciInit =
|
let pciInit =
|
||||||
Init::{
|
Init::{
|
||||||
, verbose = True
|
, verbose = True
|
||||||
|
, routes =
|
||||||
|
[ ServiceRoute.parent "Timer"
|
||||||
|
, ServiceRoute.child "Platform" "platform_drv"
|
||||||
|
]
|
||||||
, children = toMap
|
, children = toMap
|
||||||
{ test-pci =
|
{ test-pci =
|
||||||
Child.flat
|
Child.flat
|
||||||
|
@ -46,7 +41,6 @@ let pciInit =
|
||||||
, binary = "test-pci"
|
, binary = "test-pci"
|
||||||
, exitPropagate = True
|
, exitPropagate = True
|
||||||
, resources = Resources::{ ram = Genode.units.MiB 3 }
|
, resources = Resources::{ ram = Genode.units.MiB 3 }
|
||||||
, routes = [ ServiceRoute.child "Platform" "platform_drv" ]
|
|
||||||
}
|
}
|
||||||
, acpi_drv =
|
, acpi_drv =
|
||||||
Child.flat
|
Child.flat
|
||||||
|
@ -77,8 +71,7 @@ let pciInit =
|
||||||
, reportRoms = [ label "acpi" ]
|
, reportRoms = [ label "acpi" ]
|
||||||
, provides = [ "Platform", "Acpi" ]
|
, provides = [ "Platform", "Acpi" ]
|
||||||
, routes =
|
, routes =
|
||||||
[ ServiceRoute.parent "Timer"
|
[ ServiceRoute.parent "IRQ"
|
||||||
, ServiceRoute.parent "IRQ"
|
|
||||||
, ServiceRoute.parent "IO_MEM"
|
, ServiceRoute.parent "IO_MEM"
|
||||||
, ServiceRoute.parent "IO_PORT"
|
, ServiceRoute.parent "IO_PORT"
|
||||||
]
|
]
|
||||||
|
|
Loading…
Reference in New Issue