Compare commits
5 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
e91a588370 | ||
|
|
29e657d585 | ||
|
|
4413c7d75e | ||
|
|
48b15417a6 | ||
|
|
1ac8bf7479 |
@@ -56,7 +56,7 @@ ciscriptsdir = os.path.abspath(os.path.dirname(sys.argv[0]))
|
||||
if os.path.basename(ciscriptsdir) == 'appveyor':
|
||||
ciscriptsdir = ciscriptsdir.rstrip(os.pathsep+'appveyor')
|
||||
|
||||
if 'BASE' not in os.environ or os.environ['BASE'] == 'SELF':
|
||||
if 'BASE' in os.environ and os.environ['BASE'] == 'SELF':
|
||||
building_base = True
|
||||
places['EPICS_BASE'] = '.'
|
||||
else:
|
||||
@@ -537,7 +537,7 @@ def build(args):
|
||||
def test(args):
|
||||
setup_for_build(args)
|
||||
print('{0}Running the main module tests{1}'.format(ANSI_YELLOW, ANSI_RESET))
|
||||
call_make(['tapfiles'], parallel=0)
|
||||
call_make(['tapfiles'])
|
||||
call_make(['test-results'], parallel=0, silent=True)
|
||||
|
||||
def doExec(args):
|
||||
|
||||
@@ -6,13 +6,21 @@ set -e
|
||||
|
||||
CACHEDIR=${CACHEDIR:-${HOME}/.cache}
|
||||
|
||||
eval $(grep "EPICS_BASE=" ${CACHEDIR}/RELEASE.local)
|
||||
if [ "$BASE" = "SELF" ]
|
||||
then
|
||||
EPICS_BASE=$CURDIR
|
||||
else
|
||||
eval $(grep "EPICS_BASE=" ${CACHEDIR}/RELEASE.local)
|
||||
fi
|
||||
export EPICS_BASE
|
||||
|
||||
[ -z "$EPICS_HOST_ARCH" -a -f $EPICS_BASE/src/tools/EpicsHostArch.pl ] && EPICS_HOST_ARCH=$(perl $EPICS_BASE/src/tools/EpicsHostArch.pl)
|
||||
[ -z "$EPICS_HOST_ARCH" -a -f $EPICS_BASE/startup/EpicsHostArch.pl ] && EPICS_HOST_ARCH=$(perl $EPICS_BASE/startup/EpicsHostArch.pl)
|
||||
export EPICS_HOST_ARCH
|
||||
|
||||
# Base 3.15 doesn't have -qemu target architecture and needs an extra define
|
||||
[ -e $EPICS_BASE/configure/os/CONFIG.Common.RTEMS-pc386-qemu ] || EXTRA_QEMU=RTEMS_QEMU_FIXUPS=YES
|
||||
|
||||
# use array variable to get the quoting right while using separate words for arguments
|
||||
[ -n "$EXTRA0" ] && EXTRA[0]="$EXTRA0"
|
||||
[ -n "$EXTRA1" ] && EXTRA[1]="$EXTRA1"
|
||||
@@ -21,13 +29,13 @@ export EPICS_HOST_ARCH
|
||||
[ -n "$EXTRA4" ] && EXTRA[4]="$EXTRA4"
|
||||
[ -n "$EXTRA5" ] && EXTRA[5]="$EXTRA5"
|
||||
|
||||
make -j2 "${EXTRA[@]}"
|
||||
make -j2 $EXTRA_QEMU "${EXTRA[@]}"
|
||||
|
||||
ret=0
|
||||
|
||||
if [ "$TEST" != "NO" ]
|
||||
then
|
||||
make tapfiles || ret=$?
|
||||
make -j2 tapfiles || ret=$?
|
||||
|
||||
make -sk test-results
|
||||
fi
|
||||
|
||||
@@ -71,7 +71,8 @@ then
|
||||
mod_uc=${mod^^}
|
||||
eval add_dependency $mod_uc \${${mod_uc}:=master}
|
||||
done
|
||||
[ -e ./configure ] && cp ${CACHEDIR}/RELEASE.local ./configure/RELEASE.local
|
||||
[ -d ./configure ] && target=./configure/RELEASE.local || target=./RELEASE.local
|
||||
cp ${CACHEDIR}/RELEASE.local $target
|
||||
|
||||
fold_end check.out.dependencies
|
||||
fi
|
||||
@@ -183,8 +184,10 @@ EOF
|
||||
RTEMS_VERSION=$RTEMS
|
||||
RTEMS_BASE=$HOME/.rtems
|
||||
EOF
|
||||
# Base 3.15 doesn't have -qemu target architecture
|
||||
[ -e $EPICS_BASE/configure/os/CONFIG.Common.RTEMS-pc386-qemu ] && QEMU=-qemu
|
||||
cat << EOF >> $EPICS_BASE/configure/CONFIG_SITE
|
||||
CROSS_COMPILER_TARGET_ARCHS += RTEMS-pc386-qemu
|
||||
CROSS_COMPILER_TARGET_ARCHS += RTEMS-pc386$QEMU
|
||||
EOF
|
||||
fi
|
||||
|
||||
|
||||
Reference in New Issue
Block a user