Changeset 487bf65 in rtems-testing


Ignore:
Timestamp:
Mar 13, 2011, 10:16:37 PM (8 years ago)
Author:
Joel Sherrill <joel.sherrill@…>
Branches:
4.11, 8895273c193787f84c4585a10f6d6aceb3b25dc4
Children:
e18f3ef
Parents:
0cd9136
Message:

2011-03-13 Joel Sherrill <joel.sherrilL@…>

  • VERSIONS-COVERAGE, do_coverage, run_coverage: Make improvements so it is easier to run on released RTEMS versions.
Location:
rtems-coverage
Files:
4 edited

Legend:

Unmodified
Added
Removed
  • rtems-coverage/ChangeLog

    r0cd9136 r487bf65  
     12011-03-13      Joel Sherrill <joel.sherrilL@OARcorp.com>
     2
     3        * VERSIONS-COVERAGE, do_coverage, run_coverage: Make improvements so it
     4        is easier to run on released RTEMS versions.
     5
    162011-02-14      Joel Sherrill <joel.sherrilL@OARcorp.com>
    27
  • rtems-coverage/VERSIONS-COVERAGE

    r0cd9136 r487bf65  
    22BASEDIR=${HOME}/test-gcc
    33
    4 
    5 RTEMS_VERSION=4.11
     4RTEMS_VERSION=4.10.0
    65case ${RTEMS_VERSION} in
    76  4.5)  RTEMSDIR=${BASEDIR}/rtems-45
     
    98        DEFAULT_EXEEXT=exe
    109        ;;
    11   4.6)  RTEMSDIR=${BASEDIR}/rtems-46
    12         TARDIR=${BASEDIR}/tarballs/4.6
     10  4.6*|4.7*|4.8*)
     11        RTEMSDIR=${BASEDIR}/rtems-${RTEMS_VERSION}
     12        TARDIR=${BASEDIR}/tarballs/${RTEMS_VERSION}
    1313        DEFAULT_EXEEXT=exe
    14         ;;
    15   4.7)  RTEMSDIR=${BASEDIR}/rtems-47
    16         TARDIR=${BASEDIR}/tarballs/4.7
    17         DEFAULT_EXEEXT=exe
    18         ;;
    19   4.8)  RTEMSDIR=${BASEDIR}/rtems-48
    20         TARDIR=${BASEDIR}/tarballs/4.8
    21         DEFAULT_EXEEXT=exe
    22         ;;
    23   4.9)  RTEMSDIR=${BASEDIR}/rtems-49
    24         TARDIR=${BASEDIR}/tarballs/4.9
    25         DEFAULT_EXEEXT=ralf
    26         ;;
    27   4.10) RTEMSDIR=${BASEDIR}/rtems-410
    28         TARDIR=${BASEDIR}/tarballs/4.10
     14       ;;
     15  4.9*|4.10*)
     16        RTEMSDIR=${BASEDIR}/rtems-${RTEMS_VERSION}
     17        TARDIR=${BASEDIR}/tarballs/${RTEMS_VERSION}
    2918        DEFAULT_EXEEXT=ralf
    3019        ;;
     
    4534
    4635# Calculated
    47 SCRIPTDIR=${BASEDIR}/gcc-testing
     36SCRIPTDIR=${BASEDIR}/rtems-testing
    4837COVBASE=${SCRIPTDIR}/rtems-coverage
    4938COVOARBASE=${SCRIPTDIR}/covoar
  • rtems-coverage/do_coverage

    r0cd9136 r487bf65  
    8585do_posix="yes"
    8686do_optimize_size="no"
    87 do_covmerge="no"
     87do_covoar="no"
    8888do_rtems_update="no"
    8989do_rtems_configure="no"
     
    105105        A)
    106106          do_all="yes"
    107           do_covmerge="yes"
     107          do_covoar="yes"
    108108          do_posix="yes"
    109109          do_rtems_update="yes"
     
    119119        O) outputDir="${OPTARG}";;
    120120        v) verbose=`toggle ${verbose}` ;;
    121         m) do_covmerge=`toggle ${do_covmerge}` ;;
     121        m) do_covoar=`toggle ${do_covoar}` ;;
    122122        P) do_posix=`toggle ${do_posix}` ;;
    123123        S) do_optimize_size=`toggle ${do_optimize_size}` ;;
     
    201201esac
    202202
    203 if [ ${RTEMS_VERSION} = 4.6 -o ${RTEMS_VERSION} = 4.5 ] ; then
    204   TARGET=${CPU}-rtems
    205 else
    206   TARGET=${CPU}-rtems${RTEMS_VERSION}
    207 fi
     203case ${RTEMS_VERSION} in
     204  4.5*)  TARGET=${CPU}-rtems ;;
     205  4.6*)  TARGET=${CPU}-rtems ;;
     206  4.7*)  TARGET=${CPU}-rtems4.7 ;;
     207  4.8*)  TARGET=${CPU}-rtems4.8 ;;
     208  4.9*)  TARGET=${CPU}-rtems4.9 ;;
     209  4.10*) TARGET=${CPU}-rtems4.10 ;;
     210  4.11*) TARGET=${CPU}-rtems4.11 ;;
     211  *)
     212    fatal "Unknown RTEMS Version (${RTEMS_VERSION})" ;;
     213esac
    208214
    209215##### VERBOSE
     
    219225  echo "Developmental Code:   " ${do_developmental}
    220226  echo "do_all:               " ${do_all}
    221   echo "do_covmerge           " ${do_covmerge}
     227  echo "do_covoar             " ${do_covoar}
    222228  echo "do_rtems_update:      " ${do_rtems_update}
    223229  echo "do_rtems_configure:   " ${do_rtems_configure}
     
    257263
    258264if [ ! -d ${RTEMSDIR} ] ; then
    259   echo "Check out RTEMS!!!"
     265  echo "${RTEMSDIR} not found!!!"
    260266  exit 1
    261267fi
     
    460466        cut -d'|' -f1 | sed -e 's/ *$//'
    461467      # echo "========= END $l"
    462     else
    463       echo "${l} is not readable"
     468
     469    # no else
     470      # We keep a complete CURRENT list and some are not in old versions
    464471    fi
    465472  done
     
    469476generate_symbols()
    470477{
    471   if [ ${RTEMS_VERSION} = 4.6 -o ${RTEMS_VERSION} = 4.5 ] ; then
    472     cd ${BASEDIR}/b-${BSP}/${TARGET}/c/${BSP}/exec
    473     check_status $? "could not cd to object directory"
    474 
    475     subd=o-optimize/
    476   else
    477     cd ${BASEDIR}/b-${BSP}/${TARGET}/c/${BSP}/cpukit
    478     check_status $? "could not cd to object directory"
    479 
    480     subd=
    481   fi
    482 
    483   if [ ${RTEMS_VERSION} = 4.5 ] ; then
    484     filter_nm wrapup/rtems/o-optimize/librtems.a
    485     if [ ${do_posix} = "yes" ] ; then
    486       filter_nm wrapup/posix/o-optimize/libposix.a
    487     fi
    488 
    489     if [ ${analyze_developmental} = "yes" ] ; then
    490       filter_nm ../lib/libc/${subd}libcsupport.a
    491       filter_nm ../lib/libmisc/wrapup/${subd}libmisc.a
    492     fi
    493   else  # 4.6 or newer
    494 
    495     # Base set of libraries to analyse.  Do NOT include libscorecpu.a!!!
    496     filter_nm score/${subd}libscore.a
    497     filter_nm sapi/${subd}libsapi.a
    498     filter_nm rtems/${subd}librtems.a
    499 
    500     # Now add the POSIX API onto that
    501     if [ ${do_posix} = "yes" ] ; then
    502       filter_nm posix/${subd}libposix.a
    503     fi
    504 
    505     # Now add developmental libraries
    506     # NOTE: all non-network libraries are listed here.  --joel 5 March 2010
    507     if [ ${analyze_developmental} = "yes" ] ; then
    508       # filter_nm libfs/${subd}librfs.a
    509       # filter_nm libfs/${subd}libdosfs.a
    510       filter_nm libfs/${subd}libdevfs.a
    511       filter_nm libfs/${subd}libimfs.a
    512       filter_nm libcsupport/${subd}libcsupport.a
    513       # filter_nm libi2c/${subd}libi2c.a
    514       # filter_nm zlib/${subd}libz.a
    515       # filter_nm libmd/${subd}libmd.a
    516       # filter_nm libmisc/${subd}libshell.a
    517       filter_nm libmisc/${subd}libbspcmdline.a
    518       filter_nm libmisc/${subd}libcpuuse.a
    519       # filter_nm libmisc/${subd}libuuid.a
    520       filter_nm libmisc/${subd}libstackchk.a
    521       # filter_nm libmisc/${subd}libmw-fb.a
    522       # NEVER INCLUDE libdummy.a!!!
    523       # filter_nm libmisc/${subd}libdummy.a
    524       # filter_nm libmisc/${subd}libfsmount.a
    525       filter_nm libmisc/${subd}libstringto.a
    526       filter_nm libmisc/${subd}libdevnull.a
    527       # filter_nm libmisc/${subd}libcapture.a
    528       filter_nm libmisc/${subd}libdumpbuf.a
    529       # filter_nm libmisc/${subd}libmonitor.a
    530       # filter_nm libmisc/${subd}libserdbg.a
    531       # filter_nm libmisc/${subd}libuntar.a
    532       # filter_nm libblock/${subd}libblock.a
    533     fi
    534   fi
     478  case ${RTEMS_VERSION} in
     479    4.5*|4.6*)
     480      cd ${BASEDIR}/b-${BSP}/${TARGET}/c/${BSP}/exec
     481      check_status $? "could not cd to object directory"
     482      subd=o-optimize/
     483      ;;
     484    *)
     485      cd ${BASEDIR}/b-${BSP}/${TARGET}/c/${BSP}/cpukit
     486      check_status $? "could not cd to object directory"
     487      subd=
     488      ;;
     489  esac
     490
     491  case ${RTEMS_VERSION} in
     492    4.5*)
     493      filter_nm wrapup/rtems/o-optimize/librtems.a
     494      if [ ${do_posix} = "yes" ] ; then
     495        filter_nm wrapup/posix/o-optimize/libposix.a
     496      fi
     497
     498      if [ ${analyze_developmental} = "yes" ] ; then
     499        filter_nm ../lib/libc/${subd}libcsupport.a
     500        filter_nm ../lib/libmisc/wrapup/${subd}libmisc.a
     501      fi
     502      ;;
     503    *) # 4.6 or newer
     504      # Base set of libraries to analyse.  Do NOT include libscorecpu.a!!!
     505      filter_nm score/${subd}libscore.a
     506      filter_nm sapi/${subd}libsapi.a
     507      filter_nm rtems/${subd}librtems.a
     508
     509      # Now add the POSIX API onto that
     510      if [ ${do_posix} = "yes" ] ; then
     511        filter_nm posix/${subd}libposix.a
     512      fi
     513
     514      # Now add developmental libraries
     515      # NOTE: all non-network libraries are listed here.  --joel 5 March 2010
     516      if [ ${analyze_developmental} = "yes" ] ; then
     517        # filter_nm libfs/${subd}librfs.a
     518        # filter_nm libfs/${subd}libdosfs.a
     519        filter_nm libfs/${subd}libdevfs.a
     520        filter_nm libfs/${subd}libimfs.a
     521        filter_nm libcsupport/${subd}libcsupport.a
     522        # filter_nm libi2c/${subd}libi2c.a
     523        # filter_nm zlib/${subd}libz.a
     524        # filter_nm libmd/${subd}libmd.a
     525        # filter_nm libmisc/${subd}libshell.a
     526        filter_nm libmisc/${subd}libbspcmdline.a
     527        filter_nm libmisc/${subd}libcpuuse.a
     528        # filter_nm libmisc/${subd}libuuid.a
     529        filter_nm libmisc/${subd}libstackchk.a
     530        # filter_nm libmisc/${subd}libmw-fb.a
     531        # NEVER INCLUDE libdummy.a!!!
     532        # filter_nm libmisc/${subd}libdummy.a
     533        # filter_nm libmisc/${subd}libfsmount.a
     534        filter_nm libmisc/${subd}libstringto.a
     535        filter_nm libmisc/${subd}libdevnull.a
     536        # filter_nm libmisc/${subd}libcapture.a
     537        filter_nm libmisc/${subd}libdumpbuf.a
     538        # filter_nm libmisc/${subd}libmonitor.a
     539        # filter_nm libmisc/${subd}libserdbg.a
     540        # filter_nm libmisc/${subd}libuntar.a
     541        # filter_nm libblock/${subd}libblock.a
     542      fi
     543      ;;
     544    esac
    535545}
    536546
     
    563573
    564574# If requested, update and build the coverage support tools
    565 if [ ${do_covmerge} = "yes" ] ; then
    566   echo "Updating and building covmerge..."
     575if [ ${do_covoar} = "yes" ] ; then
     576  echo "Updating and building covoar..."
    567577
    568578  cd ${COVBASE}/../covoar
    569   check_status $? "cd covmerge"
     579  check_status $? "cd covoar"
    570580
    571581  cvs up -Pd 2>&1 | grep -v ^cvs
    572582  make clean all
    573   check_status $? "build covmerge"
     583  check_status $? "build covoar"
    574584
    575585  make
    576   check_status $? "make covmerge"
    577 else
    578   echo "Skipping Updating and building covmerge..."
     586  check_status $? "make covoar"
     587else
     588  echo "Skipping Updating and building covoar..."
    579589fi
    580590
     
    647657  check_status $? "cd b-${BSP}"
    648658
    649   if [ ${RTEMS_VERSION} = 4.6 -o ${RTEMS_VERSION} = 4.5 ] ; then
    650     sleep 5  # 4.5 on chroot'ed env needs this for some reason
    651     make >b.log 2>&1
    652   else
    653     cpus=`/usr/bin/getconf _NPROCESSORS_ONLN`
    654     make -j${cpus} >b.log 2>&1
    655   fi
     659  case ${RTEMS_VERSION} in
     660    4.5*|4.6*)
     661      sleep 5  # 4.5 on chroot'ed env needs this for some reason
     662      make >b.log 2>&1
     663      ;;
     664    *)
     665      cpus=`/usr/bin/getconf _NPROCESSORS_ONLN`
     666      make -j${cpus} >b.log 2>&1
     667      ;;
     668  esac
    656669  check_status $? "Building RTEMS for ${BSP}"
    657670else
  • rtems-coverage/run_coverage

    r0cd9136 r487bf65  
    7474  time ${COVBASE}/do_coverage -A -v -u -m ${SAVE} ${PUBLISH} ${*} -B ${bsp}
    7575  check_status $? "FAILED ${bsp}"
    76   rm -rf b-* *-tests
     76  rm -rf b-${bsp} ${bsp}-tests
    7777}
    7878
Note: See TracChangeset for help on using the changeset viewer.