From bab1663ea2a0a0ca97498b3eb24cfe962c8c279c Mon Sep 17 00:00:00 2001
From: Alexander Boettcher <alexander.boettcher@genode-labs.com>
Date: Thu, 22 Aug 2013 14:45:52 +0200
Subject: [PATCH] ldso: be quiet by default

---
 os/run/ldso.run        | 6 +-----
 os/src/lib/ldso/main.c | 7 +++++--
 2 files changed, 6 insertions(+), 7 deletions(-)

diff --git a/os/run/ldso.run b/os/run/ldso.run
index 2411bc700..367520abf 100644
--- a/os/run/ldso.run
+++ b/os/run/ldso.run
@@ -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
diff --git a/os/src/lib/ldso/main.c b/os/src/lib/ldso/main.c
index 55bca60b5..396958162 100644
--- a/os/src/lib/ldso/main.c
+++ b/os/src/lib/ldso/main.c
@@ -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();