diff --git a/containers/SConscript b/containers/SConscript index ee976ff..f8e0351 100644 --- a/containers/SConscript +++ b/containers/SConscript @@ -71,9 +71,8 @@ tasksEnvironment['posixServicesDirectory'] = 'containers/' + posixServicesDirect #### taskNameList = [ f.name for f in Glob(posixServicesDirectory + '*') if f.name not in taskLibraryNames + ['bootdesc'] ] #### imageOrderData = [(taskName, []) for taskName in taskNameList] -taskOrder = ('mm0', 'fs0', 'test0') - -#execfile('containers/' + posixServicesDirectory + '/taskOrder.py') +# Have to know the build is in build/containers, can't use '#' here. +execfile('../../containers/' + posixServicesDirectory + '/taskOrder.py') imageOrderData = [(taskName, []) for taskName in taskOrder] imageOrderData[0][1].append(startAxf) tasks = [] diff --git a/containers/posix/taskOrder.py b/containers/posix/taskOrder.py index b6550ec..34a8a13 100644 --- a/containers/posix/taskOrder.py +++ b/containers/posix/taskOrder.py @@ -19,4 +19,11 @@ # A sequence determining the order of tasks in the packing. +#### +#### TODO: Why do the tests only run when the load order is mm0, fs0, test0 -- any other order and the tests +#### do not run. Worse if test0 is not last then there are problems with the compilation du to issues with +#### linker scripts. +#### + taskOrder = ('mm0', 'fs0', 'test0') +#taskOrder = ('fs0', 'mm0', 'test0')