From b28702630e7301f92940eb5e017de85465d400c5 Mon Sep 17 00:00:00 2001 From: Joel Sherrill Date: Sat, 11 Jun 2011 17:23:50 +0000 Subject: 2011-06-11 Joel Sherrill * Makefile.am, configure.ac: runtest for this BSP obsoleted by rtems-testing/sim-scripts support. Please use those scripts. * tools/.cvsignore, tools/Makefile.am, tools/configure.ac, tools/runtest.in: Removed. --- c/src/lib/libbsp/avr/avrtest/ChangeLog | 7 + c/src/lib/libbsp/avr/avrtest/Makefile.am | 2 - c/src/lib/libbsp/avr/avrtest/configure.ac | 2 - c/src/lib/libbsp/avr/avrtest/tools/.cvsignore | 9 - c/src/lib/libbsp/avr/avrtest/tools/Makefile.am | 26 --- c/src/lib/libbsp/avr/avrtest/tools/configure.ac | 23 --- c/src/lib/libbsp/avr/avrtest/tools/runtest.in | 227 ------------------------ 7 files changed, 7 insertions(+), 289 deletions(-) delete mode 100644 c/src/lib/libbsp/avr/avrtest/tools/.cvsignore delete mode 100644 c/src/lib/libbsp/avr/avrtest/tools/Makefile.am delete mode 100644 c/src/lib/libbsp/avr/avrtest/tools/configure.ac delete mode 100644 c/src/lib/libbsp/avr/avrtest/tools/runtest.in (limited to 'c/src/lib/libbsp/avr') diff --git a/c/src/lib/libbsp/avr/avrtest/ChangeLog b/c/src/lib/libbsp/avr/avrtest/ChangeLog index aad21e89bd..a73b514cef 100644 --- a/c/src/lib/libbsp/avr/avrtest/ChangeLog +++ b/c/src/lib/libbsp/avr/avrtest/ChangeLog @@ -1,3 +1,10 @@ +2011-06-11 Joel Sherrill + + * Makefile.am, configure.ac: runtest for this BSP obsoleted by + rtems-testing/sim-scripts support. Please use those scripts. + * tools/.cvsignore, tools/Makefile.am, tools/configure.ac, + tools/runtest.in: Removed. + 2011-02-25 Ralf Corsépius * tools/configure.ac: Remove RTEMS_CANONICAL_TARGET_CPU. diff --git a/c/src/lib/libbsp/avr/avrtest/Makefile.am b/c/src/lib/libbsp/avr/avrtest/Makefile.am index ad3d4ca55d..d042643781 100644 --- a/c/src/lib/libbsp/avr/avrtest/Makefile.am +++ b/c/src/lib/libbsp/avr/avrtest/Makefile.am @@ -19,8 +19,6 @@ nodist_include_bsp_HEADERS = ../../shared/include/bootcard.h DISTCLEANFILES = include/bspopts.h noinst_PROGRAMS = -SUBDIRS = . tools - nodist_include_HEADERS += ../../shared/include/coverhd.h EXTRA_DIST = start/start.S diff --git a/c/src/lib/libbsp/avr/avrtest/configure.ac b/c/src/lib/libbsp/avr/avrtest/configure.ac index bd61af3b40..de2dcbdaec 100644 --- a/c/src/lib/libbsp/avr/avrtest/configure.ac +++ b/c/src/lib/libbsp/avr/avrtest/configure.ac @@ -11,8 +11,6 @@ RTEMS_CANONICAL_TARGET_CPU AM_INIT_AUTOMAKE([no-define nostdinc foreign 1.11.1]) RTEMS_BSP_CONFIGURE -RTEMS_CONFIG_BUILD_SUBDIRS(tools) - RTEMS_PROG_CC_FOR_TARGET RTEMS_CANONICALIZE_TOOLS RTEMS_PROG_CCAS diff --git a/c/src/lib/libbsp/avr/avrtest/tools/.cvsignore b/c/src/lib/libbsp/avr/avrtest/tools/.cvsignore deleted file mode 100644 index 074184bf59..0000000000 --- a/c/src/lib/libbsp/avr/avrtest/tools/.cvsignore +++ /dev/null @@ -1,9 +0,0 @@ -aclocal.m4 -autom4te*.cache -config.cache -config.log -config.status -configure -Makefile -Makefile.in -runtest diff --git a/c/src/lib/libbsp/avr/avrtest/tools/Makefile.am b/c/src/lib/libbsp/avr/avrtest/tools/Makefile.am deleted file mode 100644 index 0a5f8b2d7b..0000000000 --- a/c/src/lib/libbsp/avr/avrtest/tools/Makefile.am +++ /dev/null @@ -1,26 +0,0 @@ -## -## $Id$ -## - -ACLOCAL_AMFLAGS = -I ../../../../../aclocal - -transform = -bsptools_bindir = ${exec_prefix}/@RTEMS_BSP@/tests -bsptools_bin_SCRIPTS = runtest - -all-local: $(TMPINSTALL_FILES) - -TMPINSTALL_FILES = - -$(PROJECT_ROOT)/@RTEMS_BSP@/tests/$(dirstamp): - @$(MKDIR_P) $(PROJECT_ROOT)/@RTEMS_BSP@/tests - @: > $(PROJECT_ROOT)/@RTEMS_BSP@/tests/$(dirstamp) -TMPINSTALL_FILES += $(PROJECT_ROOT)/@RTEMS_BSP@/tests/$(dirstamp) - -$(PROJECT_ROOT)/@RTEMS_BSP@/tests/runtest: runtest $(PROJECT_ROOT)/@RTEMS_BSP@/tests/$(dirstamp) - $(INSTALL_SCRIPT) $< $(PROJECT_ROOT)/@RTEMS_BSP@/tests/runtest -TMPINSTALL_FILES += $(PROJECT_ROOT)/@RTEMS_BSP@/tests/runtest - -CLEANFILES = $(TMPINSTALL_FILES) - -include $(top_srcdir)/../../../../../automake/host.am diff --git a/c/src/lib/libbsp/avr/avrtest/tools/configure.ac b/c/src/lib/libbsp/avr/avrtest/tools/configure.ac deleted file mode 100644 index 213051963b..0000000000 --- a/c/src/lib/libbsp/avr/avrtest/tools/configure.ac +++ /dev/null @@ -1,23 +0,0 @@ -## Process this file with autoconf to produce a configure script. -## -## $Id$ - -AC_PREREQ([2.68]) -AC_INIT([rtems-c-src-lib-libbsp-avr-avrtest-tools],[_RTEMS_VERSION],[http://www.rtems.org/bugzilla]) -AC_CONFIG_SRCDIR([runtest.in]) -RTEMS_TOP(../../../../../../..) - -AM_INIT_AUTOMAKE([no-define foreign 1.11.1]) -AM_MAINTAINER_MODE - -RTEMS_ENV_RTEMSBSP - -RTEMS_PATH_KSH - -RTEMS_PROJECT_ROOT -RTEMS_TOOLPATHS - -# Explicitly list all Makefiles here -AC_CONFIG_FILES([Makefile -runtest]) -AC_OUTPUT diff --git a/c/src/lib/libbsp/avr/avrtest/tools/runtest.in b/c/src/lib/libbsp/avr/avrtest/tools/runtest.in deleted file mode 100644 index b3e48312d4..0000000000 --- a/c/src/lib/libbsp/avr/avrtest/tools/runtest.in +++ /dev/null @@ -1,227 +0,0 @@ -#!@KSH@ -p -# -# $Id$ -# -# Run rtems tests on the M32C simulator includeed with GDB -# - -# progname=`basename $0` -progname=${0##*/} # fast basename hack for ksh, bash - -USAGE=\ -"usage: $progname [ -opts ] test [ test ... ] - -o options -- specify options to be passed to simulator - -v -- verbose - -l logdir -- specify log directory (default is 'logdir') - - Specify test as 'test' or 'test.exe' or 'test.ralf'. - All multiprocessing tests *must* be specified simply as 'mp01', etc. -" - -# export everything -set -a - -# log an error to stderr -prerr() -{ - echo "$*" >&2 -} - -fatal() { - [ "$1" ] && prerr $* - prerr "$USAGE" - exit 1 -} - -warn() { - [ "$1" ] && prerr $* -} - -# print args, 1 per line -ml_echo() -{ - for l - do - echo "$l" - done -} - -# run at normal and signalled exit -test_exit() -{ - exit_code=$1 - - rm -f ${statfile}* ${logfile}.tmp* - [ "$sim_pid" ] && kill -9 $sim_pid - - exit $exit_code -} - -# -# process the options -# -# defaults for getopt vars -# -# max_run_time is defaulted to 3 minutes -# - -verbose="" -extra_options="" -stdio_setup="yes" -run_to_completion="yes" -logdir=log -update_on_tick="no" -max_run_time=$((30)) -using_print_buffer="yes" - -while getopts vhr12o:c:sl:t OPT -do - case "$OPT" in - v) - verbose="yes";; - l) - logdir="$OPTARG";; - o) - extra_options="$OPTARG";; - *) - fatal;; - esac -done - -let $((shiftcount = $OPTIND - 1)) -shift $shiftcount - -args=$* - -# -# Run the tests -# - -tests="$args" -if [ ! "$tests" ] -then - set -- `ls -1 *.exe *.ralf 2>/dev/null` - tests="$*" -fi - -[ -d $logdir ] || - mkdir $logdir || fatal "could not create log directory ($logdir)" - -# where the tmp files go -statfile=/tmp/stats$$ - -trap "test_exit" 1 2 3 13 14 15 - -for tfile in $tests -do - - echo $tfile | grep "exe$" >/dev/null - if [ $? -eq 0 ] ; then - ext=.exe - else - ext=.ralf - fi - tname=`basename $tfile ${ext}` - TEST_TYPE="single" - - case $tname in - capture* | monitor* | termios* | fileio* | pppd*) - if [ $run_to_completion = "yes" ] - then - warn "Skipping $tname; it is interactive" - continue - fi - ;; - *-node2*) - fatal "MP tests not supported" - warn "Skipping $tname; 'runtest' runs both nodes when for *-node1" - continue;; - *-node1*) - warn "Running both nodes associated with $tname" - variant=`echo $tname | sed 's/.*-node[12]//' | sed "s/${ext}/"` - tname=`echo $tname | sed 's/-node.*//'` - TEST_TYPE="mp" - ;; - sp39*|sp41*) - warn "Skipping $tname; it does not complete long on sis" - continue - ;; - minimum*|stackchk*|*fatal*|termio*) - warn "Skipping $tname; it locks up or takes a VERY long time to run" - continue - ;; - esac - - # Change the title bar to indicate which test we are running - # The simulator screen doesn't provide any indication - - logfile=$logdir/$tname - infofile=$logfile.info - - rm -f ${statfile}* ${logfile}.tmp* - - date=`date` - echo "Starting $tname at $date" - - # Spin off the simulator in the background - # @target_alias@-run ${tfile} >${logfile}.tmp 2>&1 & - /home/joel/work-gnat/svn/m32c-install/bin/m32c-elf-run ${tfile} >${logfile}.tmp 2>&1 & - sim_pid=$! - - # Make sure it won't run forever... - { - time_run=0 - while [ $time_run -lt $max_run_time ] - do - # sleep 1s at a time waiting for job to finish or timer to expire - # if job has exited, then we exit, too. - sleep 1 - if kill -0 $sim_pid 2>/dev/null - then - grep "Memory exception " ${logfile}.tmp >/dev/null - if [ $? -eq 0 ] ; then - break - fi - - time_run=$((time_run + 1)) - else - exit 0 - fi - done - - kill -2 $sim_pid 2>/dev/null - { sleep 5; kill -9 $sim_pid 2>/dev/null; } & - } & - - wait $sim_pid - status=$? - if [ $status -ne 0 ] - then - ran_too_long="yes" - else - ran_too_long="no" - fi - - sim_pid="" - - # fix up the printf output from the test - case $TEST_TYPE in - mp) - fatal "MP not supported" - ;; - *) - output_it=1 - cat ${logfile}.tmp > ${logfile} - ;; - esac - - rm -f ${logfile}.tmp* - -done - -test_exit 0 - -# Local Variables: *** -# mode:ksh *** -# End: *** - -- cgit v1.2.3