@@ -27,17 +27,7 @@ prepare_env() {
2727 : > $test_log
2828
2929 TOOLCHAIN_CACHE_FOLDER=" .cache/toolchain"
30- ARC_DEV_GNU_ROOT=" /u/arcgnu_verif/gnu_builds"
31- ARC_DEV_MW_ROOT=" /u/relauto/.TOOLS_ROOT/ToolsCommon/MWDT_eng/"
3230
33- if [ " ${TOOLCHAIN} " == " gnu" ] ; then
34- ARC_DEV_TOOL_ROOT=" ${ARC_DEV_GNU_ROOT} /${TOOLCHAIN_VER} /elf32_le_linux"
35- else
36- ARC_DEV_TOOL_ROOT=" ${ARC_DEV_MW_ROOT} /mwdt_${TOOLCHAIN_VER} /linux/ARC"
37- if [ ! -d $ARC_DEV_TOOL_ROOT ] ; then
38- ARC_DEV_TOOL_ROOT=" ${ARC_DEV_MW_ROOT} /${TOOLCHAIN_VER} /linux/ARC"
39- fi
40- fi
4131 [ " ${TRAVIS} " == " true" ] && {
4232 if [ " ${TOOLCHAIN} " == " gnu" ] ; then
4333 python .ci/toolchain.py -v $TOOLCHAIN_VER -c $TOOLCHAIN_CACHE_FOLDER || die
@@ -46,31 +36,21 @@ prepare_env() {
4636 ARC_DEV_TOOL_ROOT=" ${TOOLCHAIN_CACHE_FOLDER} /${TOOLCHAIN_VER} "
4737 fi
4838 fi
49- elif [ " ${TOOLCHAIN} " == " mw" ] ; then
50- die " Metaware toolchain is not supported in Travis CI now."
51- elif [ " ${TOOLCHAIN} " == " sphinx" ] ; then
52- echo " Toolchain for building document"
5339 else
5440 die " Toolchain ${TOOLCHAIN} not supported in travis ci"
5541 fi
5642 }
5743
5844 if [ -d $ARC_DEV_TOOL_ROOT ] ; then
59- bash .ci/linux_env_set_arc.sh -t $TOOLCHAIN -r $ ARC_DEV_TOOL_ROOT || die
60- [ ! -e " arctool.env " ] && die " arctool.env doesn't exist "
61- source arctool.env || die
62- rm -rf arctool.env || die
45+ REAL_ARC_DEV_ROOT= $( readlink -f ${ ARC_DEV_TOOL_ROOT} )
46+ export ARC_GNU_ROOT= ${REAL_ARC_DEV_ROOT}
47+ export PATH= ${REAL_ARC_DEV_ROOT} /bin: ${PATH}
48+ arc-elf32-gcc -v || die " ARC GNU toolchain is not installed correctly "
6349 else
6450 die " The toolchain path ${ARC_DEV_TOOL_ROOT} does not exist "
6551 fi
6652 git checkout -- . || die
6753
68- if [ " ${TOOLCHAIN} " == " gnu" ] ; then
69- arc-elf32-gcc -v || die " ARC GNU toolchain is not installed correctly"
70- else
71- ccac -v || die " MWDT toolchain is not installed correctly"
72- fi
73-
7454 echo " Using ${TOOLCHAIN} -${TOOLCHAIN_VER} " || die
7555 . apply_embARC_patch.sh
7656}
0 commit comments