2
0
Fork 0

tests: renable posix test

This commit is contained in:
Ehmry - 2020-11-07 19:16:29 +01:00
parent d042ee20b8
commit 7b5a74d549
2 changed files with 46 additions and 26 deletions

View File

@ -4,6 +4,8 @@ let Prelude = Genode.Prelude
let XML = Prelude.XML
let VFS = Genode.VFS
let Init = Genode.Init
let Child = Init.Child
@ -23,20 +25,39 @@ in λ(params : { bash : Text, coreutils : Text, script : Text }) →
, binary = "vfs"
, config = Init.Config::{
, content =
[ Prelude.XML.text
''
<vfs>
<dir name="dev"> <log name="stdout" label="stdout"/> <log name="stderr" label="stderr"/> <null/> <pipe/> <rtc/> <zero/> </dir>
<dir name="usr"><dir name="bin"><symlink name="env" target="${params.coreutils}/bin/env"/></dir></dir>
<dir name="tmp"><ram/></dir>
<dir name="nix"><dir name="store"><fs label="nix-store"/></dir></dir>
</vfs>
''
[ VFS.vfs
[ VFS.dir
"dev"
[ VFS.dir "pipes" [ VFS.leaf "pipe" ]
, VFS.leaf "log"
, VFS.leaf "null"
, VFS.leaf "rtc"
, VFS.leaf "zero"
]
, VFS.dir
"usr"
[ VFS.dir
"bin"
[ VFS.symlink
"env"
"${params.coreutils}/bin/env"
]
]
, VFS.dir "ram" [ VFS.leaf "ram" ]
, VFS.dir
"nix"
[ VFS.dir
"store"
[ VFS.fs VFS.FS::{ label = "nix-store" } ]
]
]
]
, policies =
[ Init.Config.Policy::{
, service = "File_system"
, label = Init.LabelSelector.prefix "shell"
, label =
Init.LabelSelector.Type.Partial
{ prefix = Some "shell", suffix = None Text }
, attributes = toMap
{ root = "/", writeable = "yes" }
}
@ -68,12 +89,22 @@ in λ(params : { bash : Text, coreutils : Text, script : Text }) →
, caps = 256
, ram = Genode.units.MiB 4
}
, config = Init.Config::{
, policies =
[ Init.Config.Policy::{
, service = "ROM"
, diag = Some True
, label = Init.LabelSelector.prefix "shell"
}
]
}
}
, shell =
Child.flat
Child.Attributes::{
, binary = "bash"
, config = Genode.Init.Config::{
, attributes = toMap { ld_verbose = "true" }
, content =
[ Prelude.XML.text
''
@ -98,21 +129,10 @@ in λ(params : { bash : Text, coreutils : Text, script : Text }) →
, ram = Genode.units.MiB 8
}
, routes =
[ { service =
{ name = "ROM"
, label =
Init.LabelSelector.Type.Partial
{ prefix = Some "/nix/store/"
, suffix = None Text
}
}
, route =
Init.Route.Type.Child
{ name = "vfs_rom"
, label = None Text
, diag = None Bool
}
}
[ Init.ServiceRoute.parentLabel
"ROM"
(Some "vfs.lib.so")
(Some "vfs.lib.so")
]
}
}

View File

@ -24,7 +24,7 @@
} { bash = "${bash}", coreutils = "${coreutils}", script = "${script}" }
'';
inputs = [ bash hello coreutils ]
++ (with genodePackages; [ cached_fs_rom libc posix vfs vfs_pipe ]);
++ (with genodePackages; [ cached_fs_rom posix vfs vfs_pipe ]);
};
};
}