From 397df7acd8f2b865a81cdfe193cfbb0ccc069521 Mon Sep 17 00:00:00 2001 From: Sebastian Huber Date: Thu, 26 Apr 2018 16:15:01 +0200 Subject: tests: Remove difftest and sorttimes tools Close #3418. --- configure.ac | 6 -- testsuites/tools/Makefile.am | 6 -- testsuites/tools/configure.ac | 21 ---- testsuites/tools/generic/Makefile.am | 5 - testsuites/tools/generic/configure.ac | 24 ----- testsuites/tools/generic/difftest.in | 113 -------------------- testsuites/tools/generic/sorttimes.in | 189 ---------------------------------- 7 files changed, 364 deletions(-) delete mode 100644 testsuites/tools/Makefile.am delete mode 100644 testsuites/tools/configure.ac delete mode 100644 testsuites/tools/generic/Makefile.am delete mode 100644 testsuites/tools/generic/configure.ac delete mode 100644 testsuites/tools/generic/difftest.in delete mode 100644 testsuites/tools/generic/sorttimes.in diff --git a/configure.ac b/configure.ac index 2d0a2056b3..c245c5ab74 100644 --- a/configure.ac +++ b/configure.ac @@ -43,12 +43,6 @@ test -z "$RTEMS_CC" && AC_MSG_ERROR([no acceptable cc found in \$PATH]) RTEMS_BUILD_CONFIG_SUBDIRS([tools/build]) RTEMS_BUILD_CONFIG_SUBDIRS([tools/cpu]) -case $enable_tests in -yes | samples ) - RTEMS_BUILD_CONFIG_SUBDIRS([testsuites/tools]) - ;; -esac - # Some BSPs carelessly apply these tools as build-tools AS_IF([test $host != $build],[ RTEMS_HOST_CONFIG_SUBDIRS([tools/build]) diff --git a/testsuites/tools/Makefile.am b/testsuites/tools/Makefile.am deleted file mode 100644 index 6033081ace..0000000000 --- a/testsuites/tools/Makefile.am +++ /dev/null @@ -1,6 +0,0 @@ -ACLOCAL_AMFLAGS = -I ../../aclocal - -SUBDIRS = @subdirs@ - -include $(top_srcdir)/../../automake/subdirs.am -include $(top_srcdir)/../../automake/host.am diff --git a/testsuites/tools/configure.ac b/testsuites/tools/configure.ac deleted file mode 100644 index e7ec106608..0000000000 --- a/testsuites/tools/configure.ac +++ /dev/null @@ -1,21 +0,0 @@ -## Process this file with autoconf to produce a configure script. - -AC_PREREQ([2.69]) -AC_INIT([rtems-c-src-tests-tools],[_RTEMS_VERSION],[https://devel.rtems.org/newticket]) -AC_CONFIG_SRCDIR([generic]) -RTEMS_TOP([../..],[..]) -RTEMS_SOURCE_TOP -RTEMS_BUILD_TOP - -RTEMS_CANONICAL_TARGET_CPU - -AM_INIT_AUTOMAKE([no-define foreign subdir-objects 1.12.2]) -AM_MAINTAINER_MODE - -RTEMS_TOOLPATHS -AC_SUBST(program_prefix) -AC_CONFIG_SUBDIRS(generic) - -# Explicitly list all Makefiles here -AC_CONFIG_FILES([Makefile]) -AC_OUTPUT diff --git a/testsuites/tools/generic/Makefile.am b/testsuites/tools/generic/Makefile.am deleted file mode 100644 index 2b4a6fcef3..0000000000 --- a/testsuites/tools/generic/Makefile.am +++ /dev/null @@ -1,5 +0,0 @@ -ACLOCAL_AMFLAGS = -I ../../../aclocal - -bin_SCRIPTS = difftest sorttimes - -include $(top_srcdir)/../../../automake/host.am diff --git a/testsuites/tools/generic/configure.ac b/testsuites/tools/generic/configure.ac deleted file mode 100644 index 0f775f3631..0000000000 --- a/testsuites/tools/generic/configure.ac +++ /dev/null @@ -1,24 +0,0 @@ -## Process this file with autoconf to produce a configure script. - -AC_PREREQ([2.69]) -AC_INIT([rtems-c-src-tests-tools-generic],[_RTEMS_VERSION],[https://devel.rtems.org/newticket]) -AC_CONFIG_SRCDIR([sorttimes.in]) -RTEMS_TOP(../../..) -RTEMS_SOURCE_TOP -RTEMS_BUILD_TOP - -RTEMS_CANONICAL_TARGET_CPU - -AM_INIT_AUTOMAKE([no-define foreign subdir-objects 1.12.2]) -AM_MAINTAINER_MODE - -RTEMS_PATH_KSH - -RTEMS_TOOLPATHS -AC_SUBST(program_prefix) - -# Explicitly list all Makefiles here -AC_CONFIG_FILES([Makefile -difftest -sorttimes]) -AC_OUTPUT diff --git a/testsuites/tools/generic/difftest.in b/testsuites/tools/generic/difftest.in deleted file mode 100644 index 246ff663f8..0000000000 --- a/testsuites/tools/generic/difftest.in +++ /dev/null @@ -1,113 +0,0 @@ -#!@KSH@ -p -# -# Check test results against official output from the src tree -# - -# XXX: do not run size.exe with this; it asks questions we don't answer - -# how to do arith in bash -# i=$((i * 2)) -# b=$((b + 1)) - -# progname=`basename $0` -progname=${0##*/} # fast basename hack for ksh, bash - -USAGE=\ -"usage: $progname [ -opts ] test [ test ... ] - -v -- verbose - -l logdir -- specify log directory (default is 'logdir') -" - -# log an error to stderr -prerr() -{ - echo "$*" >&2 -} - -fatal() { - [ "$1" ] && prerr $* - prerr "$USAGE" - exit 1 -} - -warn() { - [ "$1" ] && prerr $* -} - -# -# process the options -# -# defaults for getopt vars -# - -verbose="" -logdir=log - -while getopts v12o:l: OPT -do - case "$OPT" in - v) - verbose="yes";; - l) - logdir="$OPTARG";; - *) - fatal;; - esac -done -shiftcount=`expr $OPTIND - 1` -shift $shiftcount - -args=$* - -# -# Run the tests -# - -test -d $logdir || fatal "No log directory: ./$logdir" - -tests="$args" -if [ ! "$tests" ] -then - cd $logdir - set -- `ls -1 sp* mp??_? psx* mp*_?_g 2>/dev/null | grep -v info` - cd .. - tests="$*" -fi - -for t in $tests -do - logfile=$t - - if [ ! -f $logdir/$logfile ] - then - continue - fi - - echo $logfile - echo - - case $t in - mp*) - mptest=`echo $t | sed 's/_.//'` - node=`echo $t | sed 's/...._//'` - tmp_scn_file=mptests/node$node/$mptest.scn;; - sp*) - tmp_scn_file=sptests/$t.scn;; - psx*) - tmp_scn_file=psxtests/$t.scn;; - *) - fatal "unknown test $t";; - esac - - scn_file=`echo $tmp_scn_file | sed -e s/_g//` - sed -e '/^$/d' < $logdir/$logfile | diff -b screens/$scn_file - - echo - echo -done - -exit 0 - -# Local Variables: *** -# mode:ksh *** -# End: *** - diff --git a/testsuites/tools/generic/sorttimes.in b/testsuites/tools/generic/sorttimes.in deleted file mode 100644 index 3fe4fb6a62..0000000000 --- a/testsuites/tools/generic/sorttimes.in +++ /dev/null @@ -1,189 +0,0 @@ -#!@KSH@ -p -# -# This script takes the output from the Timing Test Suite, reorders -# it, and adds headers so it is in the same order as is printed in -# the supplement. - -usage() -{ - echo "${progname} file [more files]" -} - -header() -{ - echo - echo $* - echo -} - -lookup() -{ - grep "$*" $files - -} - -progname=$0 - -if [ $# -eq 0 ] ; then - usage - exit 0 -fi - -files=$* - -header Context Switch -lookup context switch: self -lookup context switch: to another task -lookup context switch: no floating point contexts -lookup fp context switch: restore 1st FP task -lookup fp context switch: save initialized, restore initialized -lookup fp context switch: save idle, restore initialized -lookup fp context switch: save idle, restore idle - -header Task Manager -lookup rtems_task_create -lookup rtems_task_ident -lookup rtems_task_start -lookup rtems_task_restart: calling task -lookup rtems_task_restart: suspended task -- returns to caller -lookup rtems_task_restart: blocked task -- returns to caller -lookup rtems_task_restart: ready task -- returns to caller -lookup rtems_task_restart: suspended task -- preempts caller -lookup rtems_task_restart: blocked task -- preempts caller -lookup rtems_task_restart: ready task -- preempts caller -lookup rtems_task_delete: calling task -lookup rtems_task_delete: suspended task -lookup rtems_task_delete: blocked task -lookup rtems_task_delete: ready task -lookup rtems_task_suspend: calling task -lookup rtems_task_suspend: returns to caller -lookup rtems_task_resume: task readied -- returns to caller -lookup rtems_task_resume: task readied -- preempts caller -lookup rtems_task_set_priority: obtain current priority -lookup rtems_task_set_priority: returns to caller -lookup rtems_task_set_priority: preempts caller -lookup rtems_task_mode: obtain current mode -lookup rtems_task_mode: no reschedule -lookup rtems_task_mode: reschedule -- returns to caller -lookup rtems_task_mode: reschedule -- preempts caller -lookup rtems_task_wake_after: yield -- returns to caller -lookup rtems_task_wake_after: yields -- preempts caller -lookup rtems_task_wake_when - -header Interrupt Manager -lookup interrupt entry overhead: returns to nested interrupt -lookup interrupt entry overhead: returns to interrupted task -lookup interrupt entry overhead: returns to preempting task -lookup interrupt exit overhead: returns to nested interrupt -lookup interrupt exit overhead: returns to interrupted task -lookup interrupt exit overhead: returns to preempting task - -header Clock Manager -lookup rtems_clock_set -lookup rtems_clock_get -lookup rtems_clock_tick - -header Timer Manager -lookup rtems_timer_create -lookup rtems_timer_ident -lookup rtems_timer_delete: inactive -lookup rtems_timer_delete: active -lookup rtems_timer_fire_after: inactive -lookup rtems_timer_fire_after: active -lookup rtems_timer_fire_when: inactive -lookup rtems_timer_fire_when: active -lookup rtems_timer_reset: inactive -lookup rtems_timer_reset: active -lookup rtems_timer_cancel: inactive -lookup rtems_timer_cancel: active - -header Semaphore Manager -lookup rtems_semaphore_create -lookup rtems_semaphore_ident -lookup rtems_semaphore_delete -lookup rtems_semaphore_obtain: available -lookup rtems_semaphore_obtain: not available -- NO_WAIT -lookup rtems_semaphore_obtain: not available -- caller blocks -lookup rtems_semaphore_release: no waiting tasks -lookup rtems_semaphore_release: task readied -- returns to caller -lookup rtems_semaphore_release: task readied -- preempts caller - -header Message Queue Manager -lookup rtems_message_queue_create -lookup rtems_message_queue_ident -lookup rtems_message_queue_delete -lookup rtems_message_queue_send: no waiting tasks -lookup rtems_message_queue_send: task readied -- returns to caller -lookup rtems_message_queue_send: task readied -- preempts caller -lookup rtems_message_queue_urgent: no waiting tasks -lookup rtems_message_queue_urgent: task readied -- returns to caller -lookup rtems_message_queue_urgent: task readied -- preempts caller -lookup rtems_message_queue_broadcast: no waiting tasks -lookup rtems_message_queue_broadcast: task readied -- returns to caller -lookup rtems_message_queue_broadcast: task readied -- preempts caller -lookup rtems_message_queue_receive: available -lookup rtems_message_queue_receive: not available -- NO_WAIT -lookup rtems_message_queue_receive: not available -- caller blocks -lookup rtems_message_queue_flush: no messages flushed -lookup rtems_message_queue_flush: messages flushed - -header Event Manager -lookup rtems_event_send: no task readied -lookup rtems_event_send: task readied -- returns to caller -lookup rtems_event_send: task readied -- preempts caller -lookup rtems_event_receive: obtain current events -lookup rtems_event_receive: available -lookup rtems_event_receive: not available -- NO_WAIT -lookup rtems_event_receive: not available -- caller blocks - -header Signal Manager -lookup rtems_signal_catch -lookup rtems_signal_send: returns to caller -lookup rtems_signal_send: signal to self -lookup exit ASR overhead: returns to calling task -lookup exit ASR overhead: returns to preempting task - -header Partition Manager -lookup rtems_partition_create -lookup rtems_partition_ident -lookup rtems_partition_delete -lookup rtems_partition_get_buffer: available -lookup rtems_partition_get_buffer: not available -lookup rtems_partition_return_buffer - -header Region Manager -lookup rtems_region_create -lookup rtems_region_ident -lookup rtems_region_delete -lookup rtems_region_get_segment: available -lookup rtems_region_get_segment: not available -- NO_WAIT -lookup rtems_region_get_segment: not available -- caller blocks -lookup rtems_region_return_segment: no waiting tasks -lookup rtems_region_return_segment: task readied -- returns to caller -lookup rtems_region_return_segment: task readied -- preempts caller - -header Dual-Ported Memory Manager -lookup rtems_port_create -lookup rtems_port_ident -lookup rtems_port_delete -lookup rtems_port_internal_to_external -lookup rtems_port_external_to_internal - -header IO Manager -lookup rtems_io_initialize -lookup rtems_io_open -lookup rtems_io_close -lookup rtems_io_read -lookup rtems_io_write -lookup rtems_io_control - -header Rate Monotonic Manager -lookup rtems_rate_monotonic_create -lookup rtems_rate_monotonic_ident -lookup rtems_rate_monotonic_cancel -lookup rtems_rate_monotonic_delete: active -lookup rtems_rate_monotonic_delete: inactive -lookup rtems_rate_monotonic_period: obtain status -lookup rtems_rate_monotonic_period: initiate period -- returns to caller -lookup rtems_rate_monotonic_period: conclude periods -- caller blocks -exit 0 -- cgit v1.2.3