From de9d69a6d745d6977930c583e07035f5ce863bb1 Mon Sep 17 00:00:00 2001
From: Martin Stein <martin.stein@genode-labs.com>
Date: Fri, 20 Mar 2015 12:30:18 +0100
Subject: [PATCH] hw: re-enable kernel tests with the new run env

The new run env doesn't pass the "core_type" parameter at one point
which is why we have to pass it through a global HW-specific variable.

Ref #1464
---
 repos/base-hw/run/cpu_scheduler.run |  3 ++-
 repos/base-hw/run/double_list.run   |  3 ++-
 repos/base-hw/run/hw_info.run       |  3 ++-
 tool/run/boot_dir/hw                | 14 ++++++--------
 4 files changed, 12 insertions(+), 11 deletions(-)

diff --git a/repos/base-hw/run/cpu_scheduler.run b/repos/base-hw/run/cpu_scheduler.run
index 91dc742d4..acb3298eb 100644
--- a/repos/base-hw/run/cpu_scheduler.run
+++ b/repos/base-hw/run/cpu_scheduler.run
@@ -11,7 +11,8 @@ build "test/cpu_scheduler"
 create_boot_directory
 
 # create single boot image from the compiled program images
-build_boot_image "test-cpu_scheduler" test
+set core_test 1
+build_boot_image "test-cpu_scheduler"
 
 # configure qemu to use 64 MB RAM and avoid GUI mode
 append qemu_args " -m 64 -nographic"
diff --git a/repos/base-hw/run/double_list.run b/repos/base-hw/run/double_list.run
index 7a98b5f3a..e45a0d039 100644
--- a/repos/base-hw/run/double_list.run
+++ b/repos/base-hw/run/double_list.run
@@ -11,7 +11,8 @@ build "test/double_list"
 create_boot_directory
 
 # create single boot image from the compiled program images
-build_boot_image "test-double_list" test
+set core_test 1
+build_boot_image "test-double_list"
 
 # configure qemu to use 64 MB RAM and avoid GUI mode
 append qemu_args " -m 64 -nographic"
diff --git a/repos/base-hw/run/hw_info.run b/repos/base-hw/run/hw_info.run
index 92371c43a..2c860f93b 100644
--- a/repos/base-hw/run/hw_info.run
+++ b/repos/base-hw/run/hw_info.run
@@ -11,7 +11,8 @@ build "test/hw_info"
 create_boot_directory
 
 # create single boot image from the compiled program images
-build_boot_image "test-hw_info" test
+set core_test 1
+build_boot_image "test-hw_info"
 
 # configure qemu to use 64 MB RAM and avoid GUI mode
 append qemu_args " -m 64 -nographic"
diff --git a/tool/run/boot_dir/hw b/tool/run/boot_dir/hw
index 44c1ab78f..05c5c1f21 100644
--- a/tool/run/boot_dir/hw
+++ b/tool/run/boot_dir/hw
@@ -18,20 +18,18 @@ proc run_boot_string { } {
 ##
 # Populate boot directory with binaries on hw
 #
-proc run_boot_dir {binaries {core_type core}} {
-	if {$core_type == "test"} {
+proc run_boot_dir {binaries} {
+
+	# adapt to wether this is a core-internal test or a common scenario
+	global core_test
+	if {[info exists core_test]} {
 		set core_bin "test-[run_name]"
 		set core_target "test/[run_name]"
-	} elseif {$core_type == "core"} {
+	} else {
 		set core_bin "core"
 		set core_target "core"
-	} else {
-		puts stderr "Error: Unknown core type '$core_type'"
-		exit -1
 	}
 
-	global run_target
-
 	# strip binaries
 	copy_and_strip_genode_binaries_to_run_dir $binaries