Changeset 09e3c59 in rtems-testing for rtems


Ignore:
Timestamp:
Nov 9, 2017, 9:16:32 PM (21 months ago)
Author:
Joel Sherrill <joel@…>
Branches:
8895273c193787f84c4585a10f6d6aceb3b25dc4
Children:
3b635c6
Parents:
7c6e19d
Message:

rtems-testing: Clean up from taking upstream changes for RTEMS 5

Location:
rtems
Files:
5 edited

Legend:

Unmodified
Added
Removed
  • rtems/bit_all_bsps

    r7c6e19d r09e3c59  
    9595  # leave out nios2 tic4x
    9696  CPUs=
    97   for c in arm avr bfin h8300 i386 lm32 m32c m32r m68k mips moxie \
     97  for c in arm avr bfin epiphany h8300 i386 lm32 m32c m32r m68k mips moxie \
    9898           nios2 or1k powerpc sh sparc sparc64 v850
    9999  do
  • rtems/bit_all_confs

    r7c6e19d r09e3c59  
    1111  posix_f=$3
    1212  cxx_f=$4
    13   itron_f=$5
    1413  mp_f=$6
     14  smp_f=$6
    1515
    1616  cp user.cfg user.cfg.back
     
    2020      -e "s/ENABLE_RTEMS_POSIX=.*$/ENABLE_RTEMS_POSIX=${posix_f}/" \
    2121      -e "s/ENABLE_RTEMS_CXX=.*$/ENABLE_RTEMS_CXX=${cxx_f}/" \
    22       -e "s/ENABLE_RTEMS_ITRON=.*$/ENABLE_RTEMS_ITRON=${itron_f}/" \
    2322      -e "s/ENABLE_RTEMS_MP=.*$/ENABLE_RTEMS_MP=${mp_f}/" \
     23      -e "s/ENABLE_RTEMS_SMP=.*$/ENABLE_RTEMS_SMP=${smp_f}/" \
    2424   <user.cfg.back >user.cfg
    2525}
     
    3434start=`date`
    3535
    36 for test_l in samples ; do   # note yes is left out
     36for test_l in yes ; do   # yes or samples; leave yes out for speed
    3737for tcpip_l in no yes ; do
    3838for posix_l in no yes ; do
    39 for cxx_l in no yes ; do
    40 for itron_l in no ; do       # note yes is left out
     39for cxx_l in yes ; do        # note no is left out
    4140for mp_l in no yes ; do
    42   fix_usercfg $test_l $tcpip_l $posix_l $cxx_l $itron_l $mp_l
     41for smp_l in no yes ; do
     42  fix_usercfg $test_l $tcpip_l $posix_l $cxx_l $mp_l $smp_l
    4343  echo
    4444  echo ===============================================
     
    4848  echo
    4949  outf="log/ALLCONFS-${target}-${bsp}"
    50   outf="${outf}-${test_l}_tests-${tcpip_l}net-${posix_l}posix"
    51   outf="${outf}-${itron_l}itron-${cxx_l}cxx"
     50  outf="${outf}-${test_l}tests-${tcpip_l}net-${posix_l}posix"
     51  outf="${outf}-${cxx_l}cxx"
    5252  outf="${outf}-${mp_l}mp"
     53  outf="${outf}-${smp_l}smp"
     54  outf="${outf}.log"
    5355  outf=`echo ${outf} | sed -e 's/yes//g'`
    5456  echo "./bit_rtems ${target} ${bsp} >${outf} 2>&1"
    5557  ./bit_rtems ${target} ${bsp} >${outf} 2>&1
     58done # smp
    5659done # mp
    5760done # cxx
    58 done # itron
    5961done # posix
    6062done # tcpip
  • rtems/bit_rtems

    r7c6e19d r09e3c59  
    3535BUILD_PIECE=rtems
    3636
     37# Include user configurable information
     38test -r ./user.cfg || \
     39  check_fatal 1 "Cannot find user configuration (user.cfg)"
     40. ./user.cfg
     41
    3742# Include shared setup
    3843if [ ! -r ./common.sh ] ; then
     
    4146fi
    4247. `echo $0 | sed -e 's/bit_rtems/common.sh/'`
    43 
    44 # Include user configurable information
    45 test -r ./user.cfg || \
    46   check_fatal 1 "Cannot find user configuration (user.cfg)"
    47 . ./user.cfg
    4848
    4949# Now set some internal variables based on the user configuration
     
    5858export PATH=$PATH:${INSTALL_POINT}/bin
    5959echo $PATH
     60type ${target}-gcc
    6061
    6162#
     
    335336    #or1k)          # RTEMS PR XXX
    336337    #   ENABLE_RTEMS_CXX="--disable-cxx" ;;
    337     avr|bfin|m32c|m32r|tic4x)
     338    #avr|bfin|lm32|m32r|moxie|tic4x|v850)
     339    m32c)           # m32c does not have C++ support in GCC
    338340       ENABLE_RTEMS_CXX="--disable-cxx" ;;
    339341    *) ENABLE_RTEMS_CXX="--enable-cxx" ;;
     
    538540  if [ X${BSP_TO_TEST} != X ] ; then
    539541    mkdir -p ../ticker-executables
    540     cp `find . -name ticker.${exeext}` \
     542    #cp `find . -name ticker.${exeext}` \
     543    #    ../ticker-executables/${CPU}-${BSP_TO_TEST}-ticker.${exeext}
     544    cp `find . -name ticker.exe` \
    541545        ../ticker-executables/${CPU}-${BSP_TO_TEST}-ticker.${exeext}
    542546  fi
  • rtems/common.sh

    r7c6e19d r09e3c59  
    4242  echo
    4343  echo "CPU-rtems5 is used as the GNU target."
     44  echo
     45  echo "Formats without a -XXX suffix are the preferred target."
     46  echo
     47  echo "CPU-rtems${RTEMS_VERSION} is used as the GNU target."
    4448}
    4549
     
    8892 
    8993# insert the os version
    90 target=`echo $target | sed -e 's/-rtems$/-rtems5/' -e 's/-rtemself$/-rtemself5/'`
     94target=`echo $target | sed -e "s/-rtems$/-rtems${RTEMS_VERSION}/"`
    9195
    9296#
  • rtems/user.cfg

    r7c6e19d r09e3c59  
    1818INSTALL_POINT=/home/joel/rtems-work/bsp-install/
    1919
     20#RTEMS_VERSION=4.11
     21RTEMS_VERSION=4.12
     22#RTEMS_VERSION=4.10
     23
    2024#
    2125# RTEMS Configuration Information
     
    3640# associated clients and servers.  This is automatically disabled
    3741# for BSPs that have no networking support.
    38 ENABLE_RTEMS_TCPIP=yes
     42ENABLE_RTEMS_TCPIP=no
    3943
    4044# Set this to yes if you want to enable the RTEMS uITRON 3.0 API
     
    4852
    4953# Set this to yes if you want to enable SMP support.
    50 ENABLE_RTEMS_SMP=yes
     54ENABLE_RTEMS_SMP=no
    5155
    5256# Set this to yes if you want to enable C++ support including
     
    5862
    5963# Set this to yes if you want to build the full set of RTEMS
    60 # tests appropriate for your configuration.  Or set it to
     64# #tests appropriate for your configuration.  Or set it to
    6165# samples if you just want the samples
    62 # ENABLE_RTEMS_TESTS=samples
     66# ENABLE_RTEMS_TESTS=no
    6367# ENABLE_RTEMS_TESTS=samples
    6468ENABLE_RTEMS_TESTS=yes
Note: See TracChangeset for help on using the changeset viewer.