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

ldso: be quiet by default

This commit is contained in:
Alexander Boettcher 2013-08-22 14:45:52 +02:00 committed by Christian Helmuth
parent 773b0ecc3d
commit bab1663ea2
2 changed files with 6 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
os/run/ldso.run
View File

@ -31,12 +31,8 @@ run_genode_until "child exited with exit value 0.*\n" 10
# pay only attention to the output of init and its children
grep_output {^\[init }
unify_output {environ: [a-f0-9]+} "environ: <unified>"
compare_output_to {
[init -> test-ldso] Starting ldso ...
[init -> test-ldso] Starting application ... environ: <unified>
[init -> test-ldso]
[init -> test-ldso]
[init -> test-ldso] Static Geekings!
[init -> test-ldso] ================
[init -> test-ldso] Test read

7
os/src/lib/ldso/main.c
View File

@ -87,7 +87,9 @@ int main(int argc, char **argv)
/* build dummy stack */
void *sp = setup_stack(binary, (long)fd);
/* DEBUGGING
printf("Starting ldso ...\n");
*/
/* this is usually '_start' */
func_ptr_type main_func = _rtld(sp, &exit_proc, &objp);
@ -96,10 +98,11 @@ int main(int argc, char **argv)
char **p;
for(p = environ; *p; p++)
printf("env: %s\n", *p);
*/
/* start loaded application */
printf("Starting application ... environ: %p\n", lx_environ);
*/
/* start loaded application */
call_main(main_func);
exit_proc();