From 09e3c59a34433796dd003fa427543c68ef556087 Mon Sep 17 00:00:00 2001 From: Joel Sherrill Date: Thu, 9 Nov 2017 15:16:32 -0600 Subject: rtems-testing: Clean up from taking upstream changes for RTEMS 5 --- rtems/bit_all_bsps | 2 +- rtems/bit_all_confs | 20 +++++++++++--------- rtems/bit_rtems | 18 +++++++++++------- rtems/common.sh | 6 +++++- rtems/user.cfg | 12 ++++++++---- sim-scripts/Makefile | 2 +- sim-scripts/sis.in | 3 ++- sim-scripts/tsim-support | 6 ++++-- 8 files changed, 43 insertions(+), 26 deletions(-) diff --git a/rtems/bit_all_bsps b/rtems/bit_all_bsps index 6df79f5..2d7655f 100755 --- a/rtems/bit_all_bsps +++ b/rtems/bit_all_bsps @@ -94,7 +94,7 @@ if [ $# -ne 0 ] ; then else # leave out nios2 tic4x CPUs= - for c in arm avr bfin h8300 i386 lm32 m32c m32r m68k mips moxie \ + for c in arm avr bfin epiphany h8300 i386 lm32 m32c m32r m68k mips moxie \ nios2 or1k powerpc sh sparc sparc64 v850 do if [ -r ${RTEMS}/cpukit/score/cpu/${c} ] ; then diff --git a/rtems/bit_all_confs b/rtems/bit_all_confs index 3bc5c39..0eea934 100755 --- a/rtems/bit_all_confs +++ b/rtems/bit_all_confs @@ -10,8 +10,8 @@ fix_usercfg() tcpip_f=$2 posix_f=$3 cxx_f=$4 - itron_f=$5 mp_f=$6 + smp_f=$6 cp user.cfg user.cfg.back @@ -19,8 +19,8 @@ fix_usercfg() -e "s/ENABLE_RTEMS_TCPIP=.*$/ENABLE_RTEMS_TCPIP=${tcpip_f}/" \ -e "s/ENABLE_RTEMS_POSIX=.*$/ENABLE_RTEMS_POSIX=${posix_f}/" \ -e "s/ENABLE_RTEMS_CXX=.*$/ENABLE_RTEMS_CXX=${cxx_f}/" \ - -e "s/ENABLE_RTEMS_ITRON=.*$/ENABLE_RTEMS_ITRON=${itron_f}/" \ -e "s/ENABLE_RTEMS_MP=.*$/ENABLE_RTEMS_MP=${mp_f}/" \ + -e "s/ENABLE_RTEMS_SMP=.*$/ENABLE_RTEMS_SMP=${smp_f}/" \ user.cfg } @@ -33,13 +33,13 @@ target=$1 bsp=$2 start=`date` -for test_l in samples ; do # note yes is left out +for test_l in yes ; do # yes or samples; leave yes out for speed for tcpip_l in no yes ; do for posix_l in no yes ; do -for cxx_l in no yes ; do -for itron_l in no ; do # note yes is left out +for cxx_l in yes ; do # note no is left out for mp_l in no yes ; do - fix_usercfg $test_l $tcpip_l $posix_l $cxx_l $itron_l $mp_l +for smp_l in no yes ; do + fix_usercfg $test_l $tcpip_l $posix_l $cxx_l $mp_l $smp_l echo echo =============================================== echo @@ -47,15 +47,17 @@ for mp_l in no yes ; do grep ^ENABLE user.cfg echo outf="log/ALLCONFS-${target}-${bsp}" - outf="${outf}-${test_l}_tests-${tcpip_l}net-${posix_l}posix" - outf="${outf}-${itron_l}itron-${cxx_l}cxx" + outf="${outf}-${test_l}tests-${tcpip_l}net-${posix_l}posix" + outf="${outf}-${cxx_l}cxx" outf="${outf}-${mp_l}mp" + outf="${outf}-${smp_l}smp" + outf="${outf}.log" outf=`echo ${outf} | sed -e 's/yes//g'` echo "./bit_rtems ${target} ${bsp} >${outf} 2>&1" ./bit_rtems ${target} ${bsp} >${outf} 2>&1 +done # smp done # mp done # cxx -done # itron done # posix done # tcpip done # test diff --git a/rtems/bit_rtems b/rtems/bit_rtems index 4020c16..9cf039b 100755 --- a/rtems/bit_rtems +++ b/rtems/bit_rtems @@ -34,6 +34,11 @@ args=$* # The argument to the "--target" argument of configure. BUILD_PIECE=rtems +# Include user configurable information +test -r ./user.cfg || \ + check_fatal 1 "Cannot find user configuration (user.cfg)" +. ./user.cfg + # Include shared setup if [ ! -r ./common.sh ] ; then echo "Cannot find shared shell script support (common.sh)" @@ -41,11 +46,6 @@ if [ ! -r ./common.sh ] ; then fi . `echo $0 | sed -e 's/bit_rtems/common.sh/'` -# Include user configurable information -test -r ./user.cfg || \ - check_fatal 1 "Cannot find user configuration (user.cfg)" -. ./user.cfg - # Now set some internal variables based on the user configuration verbose=yes testing=no @@ -57,6 +57,7 @@ fi export PATH=$PATH:${INSTALL_POINT}/bin echo $PATH +type ${target}-gcc # # Remove the build directory @@ -334,7 +335,8 @@ if [ ${ENABLE_RTEMS_CXX} = yes ] ; then ENABLE_RTEMS_CXX="--disable-cxx" ;; #or1k) # RTEMS PR XXX # ENABLE_RTEMS_CXX="--disable-cxx" ;; - avr|bfin|m32c|m32r|tic4x) + #avr|bfin|lm32|m32r|moxie|tic4x|v850) + m32c) # m32c does not have C++ support in GCC ENABLE_RTEMS_CXX="--disable-cxx" ;; *) ENABLE_RTEMS_CXX="--enable-cxx" ;; esac @@ -537,7 +539,9 @@ if [ ${ENABLE_RTEMS_TESTS} = "samples" -o \ # If not multilib, grab the ticker.${exeext} and save it out if [ X${BSP_TO_TEST} != X ] ; then mkdir -p ../ticker-executables - cp `find . -name ticker.${exeext}` \ + #cp `find . -name ticker.${exeext}` \ + # ../ticker-executables/${CPU}-${BSP_TO_TEST}-ticker.${exeext} + cp `find . -name ticker.exe` \ ../ticker-executables/${CPU}-${BSP_TO_TEST}-ticker.${exeext} fi diff --git a/rtems/common.sh b/rtems/common.sh index a7d0711..05a417f 100644 --- a/rtems/common.sh +++ b/rtems/common.sh @@ -41,6 +41,10 @@ print_rtems_cpus() echo "Formats without a -XXX suffix are the preferred target." echo echo "CPU-rtems5 is used as the GNU target." + echo + echo "Formats without a -XXX suffix are the preferred target." + echo + echo "CPU-rtems${RTEMS_VERSION} is used as the GNU target." } # CPU must be set before we run any of this stuff @@ -87,7 +91,7 @@ case ${CPU} in esac # insert the os version -target=`echo $target | sed -e 's/-rtems$/-rtems5/' -e 's/-rtemself$/-rtemself5/'` +target=`echo $target | sed -e "s/-rtems$/-rtems${RTEMS_VERSION}/"` # # Figure out if GNU make is available diff --git a/rtems/user.cfg b/rtems/user.cfg index 6055172..565bda7 100644 --- a/rtems/user.cfg +++ b/rtems/user.cfg @@ -17,6 +17,10 @@ # Solaris: /opt/gnu/rtems INSTALL_POINT=/home/joel/rtems-work/bsp-install/ +#RTEMS_VERSION=4.11 +RTEMS_VERSION=4.12 +#RTEMS_VERSION=4.10 + # # RTEMS Configuration Information # @@ -35,7 +39,7 @@ ENABLE_RTEMS_POSIX=yes # Set this to yes if you want to build the TCP/IP stack and # associated clients and servers. This is automatically disabled # for BSPs that have no networking support. -ENABLE_RTEMS_TCPIP=yes +ENABLE_RTEMS_TCPIP=no # Set this to yes if you want to enable the RTEMS uITRON 3.0 API # implementation. This API is not completely implemented and @@ -47,7 +51,7 @@ ENABLE_RTEMS_ITRON=no ENABLE_RTEMS_MP=no # Set this to yes if you want to enable SMP support. -ENABLE_RTEMS_SMP=yes +ENABLE_RTEMS_SMP=no # Set this to yes if you want to enable C++ support including # the RTEMS Classic API class libraries @@ -57,9 +61,9 @@ ENABLE_RTEMS_CXX=yes ENABLE_KEEP_BUILDING=yes # Set this to yes if you want to build the full set of RTEMS -# tests appropriate for your configuration. Or set it to +# #tests appropriate for your configuration. Or set it to # samples if you just want the samples -# ENABLE_RTEMS_TESTS=samples +# ENABLE_RTEMS_TESTS=no # ENABLE_RTEMS_TESTS=samples ENABLE_RTEMS_TESTS=yes diff --git a/sim-scripts/Makefile b/sim-scripts/Makefile index 4413ede..5a8a5d2 100644 --- a/sim-scripts/Makefile +++ b/sim-scripts/Makefile @@ -4,7 +4,7 @@ GDBSIM_SCRIPTS=bf537Stamp ezkit533 gdbarmsim jmr3904 lm32_evr \ SKYEYE_SCRIPTS=ant5206 bf537Stamp-skyeye csb337 csb350 csb360 edb7312 \ ezkit533-skyeye gumstix rtl22xx smdk2410 leon2-skyeye -TSIM_SCRIPTS=erc32 leon2-tsim leon3-tsim +TSIM_SCRIPTS=erc32-tsim leon2-tsim leon3-tsim QEMU_SCRIPTS=pc386 qemuppc qemu-gumstix qemu-leon2 qemu-lm32_evr qemu-or1k \ uC5282 lm3s6965 realview_pbx_a9_qemu realview_pbx_a9_qemu_smp \ xilinx_zynq_a9_qemu diff --git a/sim-scripts/sis.in b/sim-scripts/sis.in index 9ae084b..927ab7b 100644 --- a/sim-scripts/sis.in +++ b/sim-scripts/sis.in @@ -4,7 +4,8 @@ runARGS() { - echo "-m 64 ${1}" + # echo "-m 64 ${1}" + echo "${1}" } checkBSPFaults() diff --git a/sim-scripts/tsim-support b/sim-scripts/tsim-support index 0185508..aa4da2e 100644 --- a/sim-scripts/tsim-support +++ b/sim-scripts/tsim-support @@ -50,12 +50,14 @@ bspLimit() { testname=$1 case ${testname} in - *stackchk*)limit=15 ;; *stackchk*)limit=20 ;; *fatal*) limit=1 ;; *minimum*) limit=1 ;; *block05*) limit=70 ;; - *crypt*) limit=200 ;; + *crypt*) limit=400 ;; + *linpack*) limit=140 ;; + *linpack*) limit=140 ;; + *sp20*) limit=120 ;; *psxtime*) case ${tsimName} in leon) limit=240 ;; -- cgit v1.2.3