ehmry/genode
ehmry
/
genode
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

linux: fix lx_rmap test to not stuck 

The test did not fail actually. It just behaved strangely and got stuck
in the good case, which is fixed now.

Fixes #1121.
This commit is contained in:
Christian Helmuth 2014-04-15 09:31:50 +02:00
parent 023afebba1
commit 2c15aaf67d
2 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
repos/base-linux/run/lx_rmap.inc
View File

@ -67,6 +67,7 @@ build_boot_image $boot_modules
# Execute test
#
run_genode_until forever
run_genode_until "child exited with exit value 0.*\n" 10
puts "Test succeeded"
# vi: set ft=tcl :

7
repos/base-linux/src/test/lx_rmap/main.cc
View File

@ -67,6 +67,7 @@ int main()
PLOG("before RAM dataspace attach");
env()->rm_session()->attach_at(ds, beg);
PERR("after RAM dataspace attach -- ERROR");
sleep_forever();
} catch (Rm_session::Region_conflict) {
PLOG("OK caught Region_conflict exception");
}
@ -79,6 +80,7 @@ int main()
PLOG("before sub-RM dataspace attach");
env()->rm_session()->attach_at(ds, beg);
PERR("after sub-RM dataspace attach -- ERROR");
sleep_forever();
} catch (Rm_session::Region_conflict) {
PLOG("OK caught Region_conflict exception");
}
@ -98,8 +100,7 @@ int main()
*addr = 0x55;
PLOG("after touch (%x/%x)", val, *addr);
} catch (Rm_session::Region_conflict) {
PLOG("OK caught Region_conflict exception -- ERROR");
PERR("Caught Region_conflict exception -- ERROR");
sleep_forever();
}
sleep_forever();
}