michaelh/zephyr
1
0
Fork 0
Code Releases Activity

TCF: especify ARCH when building

Browse source 
Some test cases and samples require ARCH being specified. In TCF, that
information is carried by the BSP variable.

This is a workaround hack to a historical carry over that should be
removed once the extra work to do so is completed (ZEP-754). Tagged as
such.

Change-Id: I640efce3e65f46473443c5413807cdc7cdfd8be8
Jira: ZEP-760
Signed-off-by: Inaky Perez-Gonzalez <inaky.perez-gonzalez@intel.com>
This commit is contained in:
Inaky Perez-Gonzalez 2016-08-30 12:34:27 -07:00 • committed by Anas Nashif
commit c8fbb40fd7
1 changed files with 14 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

21
defaults.tc
View file

@ -52,6 +52,13 @@
# different testcase names (especially those coming from # different testcase names (especially those coming from
# testcase.ini) files can collide with each other. # testcase.ini) files can collide with each other.
# #
# - HACK: ARCH is specified, when it should not be needed to, because
# of current limitations of the Zephyr build system on resolving
# ARCH from the BOARD specification. This is an historical carry
# over that eventually should be cleared
# (https://jira.zephyrproject.org/browse/ZEP-690 and
# https://jira.zephyrproject.org/browse/ZEP-754).
#
# Thus is the `%(tchash)s` substitution, which is a unique hash # Thus is the `%(tchash)s` substitution, which is a unique hash
# for a combination of the testcase name, the target and the # for a combination of the testcase name, the target and the
# bsp_model. # bsp_model.
@ -62,7 +69,7 @@
# rm -f %(srcdir)s/outdir-%(tchash)s-%(board)s/.config; \ # rm -f %(srcdir)s/outdir-%(tchash)s-%(board)s/.config; \
# mkdir -p %(srcdir)s/outdir-%(tchash)s-%(board)s; \ # mkdir -p %(srcdir)s/outdir-%(tchash)s-%(board)s; \
# make -j -C %(srcdir)s/ %(extra_args)s \ # make -j -C %(srcdir)s/ %(extra_args)s \
# BOARD=%(board)s O=outdir-%(tchash)s-%(board)s \ # BOARD=%(board)s ARCH=%(bsp)s O=outdir-%(tchash)s-%(board)s \
# initconfig # initconfig
# #
# Once we have the configuration generated, for Sanity Check test # Once we have the configuration generated, for Sanity Check test
@ -93,7 +100,7 @@
# @build [ type == "arduino101" and quark_se_stub == 'yes' and bsp_model == 'arc' ] \ # @build [ type == "arduino101" and quark_se_stub == 'yes' and bsp_model == 'arc' ] \
# rm -f %(srcdir_abs)s/outdir-%(tchash)s-stub-x86-arduino_101/.config; \ # rm -f %(srcdir_abs)s/outdir-%(tchash)s-stub-x86-arduino_101/.config; \
# make -j -C $ZEPHYR_BASE/samples/stub \ # make -j -C $ZEPHYR_BASE/samples/stub \
# BOARD=arduino_101 \ # BOARD=arduino_101 ARCH=x86 \
# O=%(srcdir_abs)s/outdir-%(tchash)s-stub-x86-arduino_101 # O=%(srcdir_abs)s/outdir-%(tchash)s-stub-x86-arduino_101
# #
# @images [ type == "arduino101" and quark_se_stub == 'yes' and bsp_model == 'arc'] \ # @images [ type == "arduino101" and quark_se_stub == 'yes' and bsp_model == 'arc'] \
@ -104,7 +111,7 @@
# @build [ type == "ah" and quark_se_stub == 'yes' and bsp_model == 'arc' ] \ # @build [ type == "ah" and quark_se_stub == 'yes' and bsp_model == 'arc' ] \
# rm -f %(srcdir_abs)s/outdir-%(tchash)s-stub-x86-quark_se_devboard/.config; \ # rm -f %(srcdir_abs)s/outdir-%(tchash)s-stub-x86-quark_se_devboard/.config; \
# make -j -C $ZEPHYR_BASE/samples/stub \ # make -j -C $ZEPHYR_BASE/samples/stub \
# BOARD=quark_se_devboard \ # BOARD=quark_se_devboard ARCH=x86 \
# O=%(srcdir_abs)s/outdir-%(tchash)s-stub-x86-quark_se_devboard # O=%(srcdir_abs)s/outdir-%(tchash)s-stub-x86-quark_se_devboard
# #
# @images [ type == "ah" and quark_se_stub == 'yes' and bsp_model == 'arc'] \ # @images [ type == "ah" and quark_se_stub == 'yes' and bsp_model == 'arc'] \
@ -115,7 +122,7 @@
# @build [ type == "ma" and quark_se_stub == 'yes' and bsp_model == 'arc' ] \ # @build [ type == "ma" and quark_se_stub == 'yes' and bsp_model == 'arc' ] \
# rm -f %(srcdir_abs)s/outdir-%(tchash)s-stub-x86-quark_se_devboard/.config; \ # rm -f %(srcdir_abs)s/outdir-%(tchash)s-stub-x86-quark_se_devboard/.config; \
# make -j -C $ZEPHYR_BASE/samples/stub \ # make -j -C $ZEPHYR_BASE/samples/stub \
# BOARD=quark_se_devboard \ # BOARD=quark_se_devboard ARCH=x86 \
# O=%(srcdir_abs)s/outdir-%(tchash)s-stub-x86-quark_se_devboard # O=%(srcdir_abs)s/outdir-%(tchash)s-stub-x86-quark_se_devboard
# #
# @images [ type == "ma" and quark_se_stub == 'yes' and bsp_model == 'arc'] \ # @images [ type == "ma" and quark_se_stub == 'yes' and bsp_model == 'arc'] \
@ -131,7 +138,7 @@
# sed -i 's/^CONFIG_ARC_INIT.*//' \ # sed -i 's/^CONFIG_ARC_INIT.*//' \
# %(srcdir)s/outdir-%(tchash)s-%(board)s/.config; \ # %(srcdir)s/outdir-%(tchash)s-%(board)s/.config; \
# make -j -C %(srcdir)s/ %(extra_args)s \ # make -j -C %(srcdir)s/ %(extra_args)s \
# BOARD=%(board)s O=outdir-%(tchash)s-%(board)s \ # BOARD=%(board)s ARCH=%(bsp)s O=outdir-%(tchash)s-%(board)s \
# olddefconfig # olddefconfig
# (2.3) If we are running both cores at the same time, make sure # (2.3) If we are running both cores at the same time, make sure
@ -141,7 +148,7 @@
# echo CONFIG_ARC_INIT=y >> \ # echo CONFIG_ARC_INIT=y >> \
# %(srcdir)s/outdir-%(tchash)s-%(board)s/.config; \ # %(srcdir)s/outdir-%(tchash)s-%(board)s/.config; \
# make -j -C %(srcdir)s %(extra_args)s \ # make -j -C %(srcdir)s %(extra_args)s \
# BOARD=%(board)s O=outdir-%(tchash)s-%(board)s \ # BOARD=%(board)s ARCH=%(bsp)s O=outdir-%(tchash)s-%(board)s \
# %(extra_args)s olddefconfig # %(extra_args)s olddefconfig
# (2.4) Now the basic build and deploy commands that apply to all the # (2.4) Now the basic build and deploy commands that apply to all the
@ -159,7 +166,7 @@
# @build \ # @build \
# make -j -C %(srcdir)s %(extra_args)s \ # make -j -C %(srcdir)s %(extra_args)s \
# KCPPFLAGS=-DTC_RUNID=%(runid)s:%(tchash)s \ # KCPPFLAGS=-DTC_RUNID=%(runid)s:%(tchash)s \
# BOARD=%(board)s O=outdir-%(tchash)s-%(board)s # BOARD=%(board)s ARCH=%(bsp)s O=outdir-%(tchash)s-%(board)s
# #
# And deploy the kernel we just built # And deploy the kernel we just built
# #