Integrated Test Container inside Baremetal container.

config/cml/container_ruleset.template

@@ -2,7 +2,6 @@ symbols
 CONT%(cn)d_TYPE_LINUX		'Linux Container'
 CONT%(cn)d_TYPE_BAREMETAL	'Barebones Container'
 CONT%(cn)d_TYPE_POSIX		'POSIX Container'
-CONT%(cn)d_TYPE_TEST		'Test Container'
 CONT%(cn)d_OPT_NAME		'Container Name'
 
 CONT%(cn)d_PHYSMEM_REGIONS	'Container %(cn)d Number of Physical Regions'
@@ -139,11 +138,10 @@ default CONT%(cn)d_VIRT4_END	from 0xe0000000
 default CONT%(cn)d_VIRT5_START	from 0xe0000000
 default CONT%(cn)d_VIRT5_END	from 0xf0000000
 
-default CONT%(cn)d_OPT_NAME from (CONT%(cn)d_TYPE_LINUX==y) ? "linux%(cn)d" : ((CONT%(cn)d_TYPE_BAREMETAL==y) ? "baremetal%(cn)d" : ((CONT%(cn)d_TYPE_TEST==y) ? "test%(cn)d" : "posix%(cn)d"))
+default CONT%(cn)d_OPT_NAME from (CONT%(cn)d_TYPE_LINUX==y) ? "linux%(cn)d" : ((CONT%(cn)d_TYPE_BAREMETAL==y) ? "baremetal%(cn)d" : "posix%(cn)d")
 
 when CONT%(cn)d_TYPE_LINUX==y suppress cont%(cn)d_default_pager_params cont%(cn)d_posix_pager_params
 when CONT%(cn)d_TYPE_BAREMETAL==y suppress cont%(cn)d_linux_pager_params cont%(cn)d_posix_pager_params
-when CONT%(cn)d_TYPE_TEST==y suppress cont%(cn)d_linux_pager_params cont%(cn)d_posix_pager_params
 when CONT%(cn)d_TYPE_POSIX==y suppress cont%(cn)d_linux_pager_params
 unless CONT%(cn)d_TYPE_BAREMETAL==y suppress cont%(cn)d_baremetal_params
 
@@ -162,12 +160,13 @@ cont%(cn)d_baremetal_params	'Baremetal Applications List'
 CONT%(cn)d_BAREMETAL_APP0	'Empty Application'
 CONT%(cn)d_BAREMETAL_APP1	'Hello World'
 CONT%(cn)d_BAREMETAL_APP2	'Thread Library Demo'
-
+CONT%(cn)d_BAREMETAL_APP3       'Test Application'
 
 choices cont%(cn)d_baremetal_params
 	CONT%(cn)d_BAREMETAL_APP0
 	CONT%(cn)d_BAREMETAL_APP1
 	CONT%(cn)d_BAREMETAL_APP2
+	CONT%(cn)d_BAREMETAL_APP3
 	default CONT%(cn)d_BAREMETAL_APP0
 
 menu cont%(cn)d_default_pager_params
@@ -650,7 +649,6 @@ choices container%(cn)d_type
 	CONT%(cn)d_TYPE_BAREMETAL
 	CONT%(cn)d_TYPE_POSIX
         CONT%(cn)d_TYPE_LINUX
-	CONT%(cn)d_TYPE_TEST
         default CONT%(cn)d_TYPE_BAREMETAL
 
 menu cont%(cn)d_menu

config/cml/examples/test/config.cml

@@ -1,113 +0,0 @@
-#
-# Automatically generated, don't edit
-#
-# Generated on: bahadir-laptop
-# At: Fri, 23 Oct 2009 09:24:42 +0000
-# Linux version 2.6.24-22-generic (buildd@vernadsky) (gcc version 4.2.3 (Ubuntu 4.2.3-2ubuntu7)) #1 SMP Mon Nov 24 18:32:42 UTC 2008
-
-#
-# Codezero Microkernel Configurator
-#
-
-#
-# Main architecture
-#
-CONFIG_ARCH_ARM=y
-
-
-#
-# ARM Architecture Configuration
-#
-
-#
-# ARM Architecture Family
-#
-CONFIG_SUBARCH_V5=y
-CONFIG_SUBARCH_V6=n
-CONFIG_SUBARCH_V7=n
-
-
-#
-# ARM CPU type
-#
-
-#
-# ARM Processor Type
-#
-CONFIG_CPU_ARM926=y
-
-
-
-#
-# ARM Platform Type
-#
-
-#
-# ARM Platform Type
-#
-CONFIG_PLATFORM_EB=n
-CONFIG_PLATFORM_AB926=n
-CONFIG_PLATFORM_PB926=y
-
-
-
-#
-# Platform Drivers
-#
-CONFIG_DRIVER_UART_PL011=y
-CONFIG_DRIVER_TIMER_SP804=y
-CONFIG_DRIVER_IRQ_PL190=y
-
-
-CONFIG_CONTAINERS=1
-
-#
-# Container Setup
-#
-
-#
-# Container 0 Parameters
-#
-
-#
-# Container 0 Type
-#
-CONFIG_CONT0_TYPE_LINUX=n
-CONFIG_CONT0_TYPE_BARE=n
-CONFIG_CONT0_TYPE_POSIX=n
-CONFIG_CONT0_TYPE_TEST=y
-
-
-#
-# Container 0 Options
-#
-CONFIG_CONT0_OPT_NAME="caps"
-
-#
-# Container 0 Default Pager Parameters
-#
-CONFIG_CONT0_PAGER_LMA=0x40000
-CONFIG_CONT0_PAGER_VMA=0x10000000
-
-
-#
-# Container 0 Physical Memory Regions
-#
-CONFIG_CONT0_PHYSMEM_REGIONS=1
-CONFIG_CONT0_PHYS0_START=0x40000
-CONFIG_CONT0_PHYS0_END=0x200000
-
-
-#
-# Container 0 Virtual Memory Regions
-#
-CONFIG_CONT0_VIRTMEM_REGIONS=1
-CONFIG_CONT0_VIRT0_START=0x10000000
-CONFIG_CONT0_VIRT0_END=0x20000000
-
-
-
-
-
-#
-# That's all, folks!

config/configuration.py

@@ -188,8 +188,6 @@ class configuration:
                     self.containers[id].type = "posix"
                 elif param2 == "BAREMETAL":
                     self.containers[id].type = "baremetal"
-                elif param2 == "TEST":
-                    self.containers[id].type = "test"
     # Extract parameters for containers
     def get_container_parameters(self, name, val):
         matchobj = re.match(r"(CONFIG_CONT){1}([0-9]){1}(\w+)", name)

config/projpaths.py

@@ -30,8 +30,6 @@ LINUX_ATAGSDIR = join(LINUXDIR, 'atags')
 POSIXDIR = join(PROJROOT, 'conts/posix')
 POSIX_BOOTDESCDIR = join(POSIXDIR, 'bootdesc')
 
-TESTDIR = join(PROJROOT, 'conts/test')
-
 projpaths = {   \
     'LINUX_ATAGSDIR'  : LINUX_ATAGSDIR, \
     'LINUX_ROOTFSDIR' : LINUX_ROOTFSDIR, \