Changeset 258bda3 in rtems


Ignore:
Timestamp:
Apr 3, 2017, 10:11:24 PM (3 years ago)
Author:
Chris Johns <chrisj@…>
Branches:
master
Children:
b3bfc242
Parents:
d2a45a58
git-author:
Chris Johns <chrisj@…> (04/03/17 22:11:24)
git-committer:
Chris Johns <chrisj@…> (04/03/17 22:24:22)
Message:

testsuite: Add a common test configuration. Fix configure.ac and Makefile.am errors.

  • Add a top level test configuration file for test states that are common to all BSPs. This saves adding a test configuration (tcfg) file for every BSP.
  • Add the test states 'user-input' and 'benchmark'. This lets 'rtems-test' stop the test rather than waiting for a timeout or letting a benchmark run without the user asking for it to run.
  • Implement rtems-test-check in Python to make it faster. The shell script had grown to a point it was noticably slowing the build down.
  • Fix the configure.ac and Makefile.am files for a number of the test directories. The files are difficiult to keep in sync with the number of tests and mistakes can happen such as tests being left out of the build. The test fsrofs01 is an example. Also a there was a mix of SUBDIRS and _SUBDIRS being used and only _SUBDIRS should be used.
  • Fix the test fsrofs01 so it compiles.

Closes #2963.

Files:
3 added
1 deleted
26 edited

Legend:

Unmodified
Added
Removed
  • testsuites/automake/subdirs.am

    rd2a45a58 r258bda3  
     1## Borrowed from automake/subdir.am which borrowed automake-1.4 and adapted to RTEMS
     2
     3## NOTE: This is a temporary work-around until automake is removed from RTEMS.
     4##   It is a hack within many hacks and is designed to keep the source as clean
     5##   as possible.
     6
     7all-local:
     8        @set fnord $(MAKEFLAGS); amf=$$2; \
     9        dot_seen=no; \
     10        target=`echo $@ | sed s/-recursive//`; \
     11        if test "$$target" = "all-local-am"; then \
     12          target="all-am"; \
     13        fi; \
     14        if test "$$target" = "all-local"; then \
     15          target="all"; \
     16        fi; \
     17        tcheck="$(top_srcdir)/../../tools/build/rtems-test-check-py"; \
     18        tdata="$(top_srcdir)/../../c/src/lib/libbsp/$(RTEMS_CPU)/$(RTEMS_BSP_FAMILY)/make/custom/$(RTEMS_BSP)-testsuite.tcfg"; \
     19        if test -f "$$tdata"; then \
     20          vtdata="$(RTEMS_CPU)/$(RTEMS_BSP_FAMILY)/make/custom/$(RTEMS_BSP)-testsuite.tcfg"; \
     21        else \
     22          vtdata="all tests"; \
     23        fi; \
     24        echo "BSP Testsuite Data: $$vtdata"; \
     25        if test -f $$tcheck; then \
     26          list=`$$tcheck exclude $$tdata $(top_srcdir)/.. $(RTEMS_BSP) $(_SUBDIRS)`; \
     27        else \
     28          list=$(_SUBDIRS); \
     29        fi; \
     30        for subdir in $$list; do \
     31          echo "Making $$target in $$subdir"; \
     32          if test "$$subdir" != "."; then \
     33            if test -f $$tcheck; then \
     34              test_FLAGS=`$$tcheck flags $$tdata $(top_srcdir)/.. $(RTEMS_BSP) $$subdir`; \
     35            fi; \
     36            local_target="$$target"; \
     37            if test -z "$$test_FLAGS"; then \
     38                echo "BSP Testsuite Flags: $$subdir: PASS"; \
     39            else \
     40                echo "BSP Testsuite Flags: $$subdir: $$test_FLAGS"; \
     41            fi; \
     42            (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) TEST_FLAGS="$$test_FLAGS" $$local_target) \
     43             || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \
     44          fi; \
     45        done; test -z "$$fail"
  • testsuites/benchmarks/Makefile.am

    rd2a45a58 r258bda3  
    11ACLOCAL_AMFLAGS = -I ../aclocal
    22
    3 SUBDIRS =
    4 SUBDIRS += linpack
    5 SUBDIRS += whetstone
    6 SUBDIRS += dhrystone
     3_SUBDIRS =
     4_SUBDIRS += dhrystone
     5_SUBDIRS += linpack
     6_SUBDIRS += whetstone
    77
    88include $(top_srcdir)/../automake/subdirs.am
  • testsuites/benchmarks/configure.ac

    rd2a45a58 r258bda3  
    2323# Explicitly list all Makefiles here
    2424AC_CONFIG_FILES([Makefile
     25dhrystone/Makefile
    2526linpack/Makefile
    2627whetstone/Makefile
    27 dhrystone/Makefile
    2828])
    2929AC_OUTPUT
  • testsuites/fstests/Makefile.am

    rd2a45a58 r258bda3  
    11ACLOCAL_AMFLAGS = -I ../aclocal
    22
    3 _SUBDIRS =
    4 _SUBDIRS += fsjffs2gc01
    5 _SUBDIRS += fsimfsconfig03
    6 _SUBDIRS += fsimfsconfig02
    7 _SUBDIRS += fsimfsconfig01
     3_SUBDIRS  =
     4_SUBDIRS += fsbdpart01
     5_SUBDIRS += fsdosfsformat01
    86_SUBDIRS += fsdosfsname01
    97_SUBDIRS += fsdosfsname02
     8_SUBDIRS += fsdosfssync01
    109_SUBDIRS += fsdosfswrite01
    11 _SUBDIRS += fsdosfsformat01
    1210_SUBDIRS += fsfseeko01
    13 _SUBDIRS += fsdosfssync01
     11_SUBDIRS += fsimfsconfig01
     12_SUBDIRS += fsimfsconfig02
     13_SUBDIRS += fsimfsconfig03
     14_SUBDIRS += fsimfsgeneric01
     15_SUBDIRS += fsjffs2gc01
     16_SUBDIRS += fsnofs01
     17_SUBDIRS += fsrfsbitmap01
     18_SUBDIRS += fsrofs01
    1419_SUBDIRS += imfs_fserror
    1520_SUBDIRS += imfs_fslink
     
    3136_SUBDIRS += mdosfs_fspatheval
    3237_SUBDIRS += mdosfs_fsrdwr
     38_SUBDIRS += mdosfs_fsscandir01
    3339_SUBDIRS += mdosfs_fsstatvfs
    34 _SUBDIRS += mdosfs_fsscandir01
    3540_SUBDIRS += mdosfs_fstime
    3641_SUBDIRS += mimfs_fserror
     
    3944_SUBDIRS += mimfs_fspermission
    4045_SUBDIRS += mimfs_fsrdwr
     46_SUBDIRS += mimfs_fsrename
    4147_SUBDIRS += mimfs_fsscandir01
    4248_SUBDIRS += mimfs_fssymlink
    4349_SUBDIRS += mimfs_fstime
    44 _SUBDIRS += mimfs_fsrename
    4550_SUBDIRS += mrfs_fserror
     51_SUBDIRS += mrfs_fsfpathconf
    4652_SUBDIRS += mrfs_fslink
    4753_SUBDIRS += mrfs_fspatheval
     
    5157_SUBDIRS += mrfs_fssymlink
    5258_SUBDIRS += mrfs_fstime
    53 _SUBDIRS += mrfs_fsfpathconf
    54 _SUBDIRS += fsrfsbitmap01
    55 _SUBDIRS += fsnofs01
    56 _SUBDIRS += fsimfsgeneric01
    57 _SUBDIRS += fsbdpart01
    5859
    5960EXTRA_DIST =
     
    6465EXTRA_DIST += support/fstest.h
    6566
    66 include $(top_srcdir)/../automake/test-subdirs.am
     67include $(top_srcdir)/../automake/subdirs.am
    6768include $(top_srcdir)/../automake/local.am
  • testsuites/fstests/configure.ac

    rd2a45a58 r258bda3  
    7878# Explicitly list all Makefiles here
    7979AC_CONFIG_FILES([Makefile
    80 fsjffs2gc01/Makefile
    81 fsimfsconfig03/Makefile
    82 fsimfsconfig02/Makefile
    83 fsimfsconfig01/Makefile
     80fsbdpart01/Makefile
     81fsdosfsformat01/Makefile
    8482fsdosfsname01/Makefile
    8583fsdosfsname02/Makefile
     84fsdosfssync01/Makefile
    8685fsdosfswrite01/Makefile
    87 fsdosfsformat01/Makefile
    8886fsfseeko01/Makefile
    89 fsdosfssync01/Makefile
     87fsimfsconfig01/Makefile
     88fsimfsconfig02/Makefile
     89fsimfsconfig03/Makefile
     90fsimfsgeneric01/Makefile
     91fsjffs2gc01/Makefile
     92fsnofs01/Makefile
     93fsrfsbitmap01/Makefile
     94fsrofs01/Makefile
    9095imfs_fserror/Makefile
    9196imfs_fslink/Makefile
     
    115120mimfs_fspermission/Makefile
    116121mimfs_fsrdwr/Makefile
     122mimfs_fsrename/Makefile
    117123mimfs_fsscandir01/Makefile
    118124mimfs_fssymlink/Makefile
    119125mimfs_fstime/Makefile
    120 mimfs_fsrename/Makefile
    121126mrfs_fserror/Makefile
     127mrfs_fsfpathconf/Makefile
    122128mrfs_fslink/Makefile
    123129mrfs_fspatheval/Makefile
     
    127133mrfs_fssymlink/Makefile
    128134mrfs_fstime/Makefile
    129 mrfs_fsfpathconf/Makefile
    130 fsrfsbitmap01/Makefile
    131 fsnofs01/Makefile
    132 fsimfsgeneric01/Makefile
    133 fsbdpart01/Makefile
    134 
    135135])
    136136AC_OUTPUT
  • testsuites/fstests/fsrofs01/init.c

    rd2a45a58 r258bda3  
    154154static void Init(rtems_task_argument arg)
    155155{
    156   TEST_BEGIN():
     156  TEST_BEGIN();
    157157
    158158  test_create_file_system();
    159159  test_rofs();
    160160
    161   TEST_END():
     161  TEST_END();
    162162  rtems_test_exit(0);
    163163}
  • testsuites/libtests/Makefile.am

    rd2a45a58 r258bda3  
    11ACLOCAL_AMFLAGS = -I ../aclocal
    22
    3 _SUBDIRS = POSIX
     3_SUBDIRS  =
     4_SUBDIRS += POSIX
     5_SUBDIRS += block01
     6_SUBDIRS += block02
     7_SUBDIRS += block03
     8_SUBDIRS += block04
     9_SUBDIRS += block05
     10_SUBDIRS += block06
     11_SUBDIRS += block07
     12_SUBDIRS += block08
     13_SUBDIRS += block09
     14_SUBDIRS += block10
     15_SUBDIRS += block11
     16_SUBDIRS += block12
     17_SUBDIRS += block13
     18_SUBDIRS += block14
     19_SUBDIRS += block15
     20_SUBDIRS += block16
     21_SUBDIRS += block17
     22_SUBDIRS += bspcmdline01
     23_SUBDIRS += capture01
     24_SUBDIRS += complex
     25_SUBDIRS += cpuuse
     26_SUBDIRS += crypt01
     27_SUBDIRS += defaultconfig01
     28_SUBDIRS += devfs01
     29_SUBDIRS += devfs02
     30_SUBDIRS += devfs03
     31_SUBDIRS += devfs04
     32_SUBDIRS += deviceio01
     33_SUBDIRS += devnullfatal01
     34_SUBDIRS += dumpbuf01
     35_SUBDIRS += exit01
     36_SUBDIRS += exit02
     37_SUBDIRS += flashdisk01
     38_SUBDIRS += gxx01
     39_SUBDIRS += heapwalk
     40_SUBDIRS += i2c01
     41_SUBDIRS += libfdt01
     42_SUBDIRS += malloc02
     43_SUBDIRS += malloc03
     44_SUBDIRS += malloc04
     45_SUBDIRS += malloctest
     46_SUBDIRS += math
     47_SUBDIRS += mathf
     48_SUBDIRS += mathl
     49_SUBDIRS += md501
     50_SUBDIRS += monitor
     51_SUBDIRS += monitor02
     52_SUBDIRS += mouse01
     53_SUBDIRS += newlib01
     54_SUBDIRS += putenvtest
     55_SUBDIRS += pwdgrp01
     56_SUBDIRS += pwdgrp02
     57_SUBDIRS += rbheap01
     58_SUBDIRS += rtmonuse
     59_SUBDIRS += sha
     60_SUBDIRS += shell01
     61_SUBDIRS += sparsedisk01
     62_SUBDIRS += spi01
     63_SUBDIRS += stackchk
     64_SUBDIRS += stackchk01
     65_SUBDIRS += stringto01
     66_SUBDIRS += tar01
     67_SUBDIRS += tar02
     68_SUBDIRS += tar03
     69_SUBDIRS += termios
     70_SUBDIRS += termios01
     71_SUBDIRS += termios02
     72_SUBDIRS += termios03
     73_SUBDIRS += termios04
     74_SUBDIRS += termios05
     75_SUBDIRS += termios06
     76_SUBDIRS += termios07
     77_SUBDIRS += termios08
    478_SUBDIRS += termios09
    5 _SUBDIRS += libfdt01
    6 _SUBDIRS += defaultconfig01
    7 _SUBDIRS += pwdgrp02
    8 _SUBDIRS += shell01
    9 _SUBDIRS += pwdgrp01
    10 _SUBDIRS += crypt01
    11 _SUBDIRS += sha
    12 _SUBDIRS += i2c01
    13 _SUBDIRS += spi01
    14 _SUBDIRS += newlib01
    15 _SUBDIRS += block17
    16 _SUBDIRS += exit02
    17 _SUBDIRS += exit01
     79_SUBDIRS += top
     80_SUBDIRS += tztest
     81_SUBDIRS += uid01
    1882_SUBDIRS += utf8proc01
    19 _SUBDIRS += md501
    20 _SUBDIRS += sparsedisk01
    21 _SUBDIRS += block16
    22 _SUBDIRS += block15
    23 _SUBDIRS += block14
    24 _SUBDIRS += block13
    25 _SUBDIRS += rbheap01
    26 _SUBDIRS += flashdisk01
    27 _SUBDIRS += capture01
    28 
    29 _SUBDIRS += bspcmdline01 cpuuse devfs01 devfs02 devfs03 devfs04 \
    30     deviceio01 devnullfatal01 dumpbuf01 gxx01 top\
    31     malloctest malloc02 malloc03 malloc04 heapwalk \
    32     putenvtest monitor monitor02 rtmonuse stackchk stackchk01 \
    33     termios termios01 termios02 termios03 termios04 termios05 \
    34     termios06 termios07 termios08 \
    35     tztest block01 block02 block03 block04 block05 block06 block07 \
    36     block08 block09 block10 block11 block12 stringto01 \
    37     tar01 tar02 tar03 \
    38     math mathf mathl complex \
    39     mouse01 uid01
    4083
    4184if NETTESTS
     
    4891endif
    4992
     93##
     94## The libdl use use AM's BUILT_SOURCE and this has a weird side effect of
     95## restarting the subdir loop. No idea why.
     96##
    5097if DLTESTS
    5198_SUBDIRS += dl01 dl02 dl03
     
    59106endif
    60107
    61 include $(top_srcdir)/../automake/test-subdirs.am
     108include $(top_srcdir)/../automake/subdirs.am
    62109include $(top_srcdir)/../automake/local.am
  • testsuites/libtests/configure.ac

    rd2a45a58 r258bda3  
    9494# Explicitly list all Makefiles here
    9595AC_CONFIG_FILES([Makefile
    96 networking01/Makefile
    97 libfdt01/Makefile
    98 defaultconfig01/Makefile
    99 pwdgrp02/Makefile
    100 shell01/Makefile
    101 pwdgrp01/Makefile
    102 crypt01/Makefile
    103 sha/Makefile
    104 i2c01/Makefile
    105 spi01/Makefile
    106 newlib01/Makefile
    107 block17/Makefile
    108 exit02/Makefile
    109 exit01/Makefile
    110 utf8proc01/Makefile
    111 md501/Makefile
    112 sparsedisk01/Makefile
    113 block16/Makefile
    114 mghttpd01/Makefile
    115 block15/Makefile
    116 block14/Makefile
    117 block13/Makefile
    118 rbheap01/Makefile
    119 syscall01/Makefile
    120 flashdisk01/Makefile
     96POSIX/Makefile
    12197block01/Makefile
    12298block02/Makefile
     
    131107block11/Makefile
    132108block12/Makefile
     109block13/Makefile
     110block14/Makefile
     111block15/Makefile
     112block16/Makefile
     113block17/Makefile
    133114bspcmdline01/Makefile
     115capture01/Makefile
     116complex/Makefile
    134117cpuuse/Makefile
     118crypt01/Makefile
     119debugger01/Makefile
     120defaultconfig01/Makefile
    135121devfs01/Makefile
    136122devfs02/Makefile
     
    145131dl05/Makefile
    146132dumpbuf01/Makefile
     133exit01/Makefile
     134exit02/Makefile
     135flashdisk01/Makefile
    147136ftp01/Makefile
    148137gxx01/Makefile
    149138heapwalk/Makefile
    150 malloctest/Makefile
     139i2c01/Makefile
     140libfdt01/Makefile
    151141malloc02/Makefile
    152142malloc03/Makefile
    153143malloc04/Makefile
     144malloctest/Makefile
     145math/Makefile
     146mathf/Makefile
     147mathl/Makefile
     148md501/Makefile
     149mghttpd01/Makefile
    154150monitor/Makefile
    155151monitor02/Makefile
    156152mouse01/Makefile
    157 uid01/Makefile
     153networking01/Makefile
     154newlib01/Makefile
    158155putenvtest/Makefile
     156pwdgrp01/Makefile
     157pwdgrp02/Makefile
     158rbheap01/Makefile
    159159rtmonuse/Makefile
     160sha/Makefile
     161shell01/Makefile
     162sparsedisk01/Makefile
     163spi01/Makefile
    160164stackchk/Makefile
    161165stackchk01/Makefile
    162166stringto01/Makefile
     167syscall01/Makefile
    163168tar01/Makefile
    164169tar02/Makefile
     
    176181top/Makefile
    177182tztest/Makefile
    178 capture01/Makefile
    179 POSIX/Makefile
    180 math/Makefile
    181 mathf/Makefile
    182 mathl/Makefile
    183 complex/Makefile
    184 debugger01/Makefile
     183uid01/Makefile
     184utf8proc01/Makefile
    185185])
    186186AC_OUTPUT
  • testsuites/libtests/dl01/Makefile.am

    rd2a45a58 r258bda3  
    3030CLEANFILES += dl-tar.h
    3131
    32 dl01.pre$(EXEEXT): $(dl01_OBJECTS) $(dl01_DEPENDENCIES)
    33         @rm -f dl01.pre$(EXEEXT)
    34         $(make-exe)
    35         rm -f dl01.pre.ralf
    36 
    37 dl01.pre: dl01.pre$(EXEEXT)
    38         mv $< $@
    39 CLEANFILES += dl01.pre
     32dl01.pre: $(dl01_OBJECTS) $(dl01_DEPENDENCIES)
     33        @rm -f dl01.pre
     34        $(LINK_APP)
    4035
    4136dl-sym.o: dl01.pre
  • testsuites/libtests/dl02/Makefile.am

    rd2a45a58 r258bda3  
    3232CLEANFILES += dl-tar.h
    3333
    34 dl02.pre$(EXEEXT): $(dl02_OBJECTS) $(dl02_DEPENDENCIES)
    35         @rm -f dl02.pre$(EXEEXT)
    36         $(make-exe)
    37         rm -f dl02.pre.ralf
    38 
    39 dl02.pre: dl02.pre$(EXEEXT)
    40         mv $< $@
    41 CLEANFILES += dl02.pre
     34dl02.pre: $(dl02_OBJECTS) $(dl02_DEPENDENCIES)
     35        @rm -f dl02.pre
     36        $(LINK_APP)
    4237
    4338dl-sym.o: dl02.pre
  • testsuites/libtests/dl04/Makefile.am

    rd2a45a58 r258bda3  
    3131CLEANFILES += dl-tar.h
    3232
    33 dl04.pre$(EXEEXT): $(dl04_OBJECTS) $(dl04_DEPENDENCIES)
    34         @rm -f dl04.pre$(EXEEXT)
    35         $(make-exe)
    36         rm -f dl04.pre.ralf
    37 
    38 dl04.pre: dl04.pre$(EXEEXT)
    39         mv $< $@
    40 CLEANFILES += dl04.pre
     33dl04.pre: $(dl04_OBJECTS) $(dl04_DEPENDENCIES)
     34        @rm -f dl04.pre
     35        $(LINK_APP)
    4136
    4237dl-sym.o: dl04.pre
  • testsuites/libtests/dl05/Makefile.am

    rd2a45a58 r258bda3  
    3030CLEANFILES += dl-tar.h
    3131
    32 dl05.pre$(EXEEXT): $(dl05_OBJECTS) $(dl05_DEPENDENCIES)
    33         @rm -f dl05.pre$(EXEEXT)
     32dl05.pre: $(dl05_OBJECTS) $(dl05_DEPENDENCIES)
     33        @rm -f dl05.pre
    3434        $(LINK.cc) $(CPU_CFLAGS) $(AM_CFLAGS) $(AM_LDFLAGS) \
    35                     -o $(basename $@)$(EXEEXT) $(LINK_OBJS) $(LINK_LIBS)
    36         rm -f dl05.pre.ralf
    37 
    38 dl05.pre: dl05.pre$(EXEEXT)
    39         mv $< $@
    40 CLEANFILES += dl05.pre
     35                    -o $@ $(LINK_OBJS) $(LINK_LIBS)
    4136
    4237dl-sym.o: dl05.pre
  • testsuites/mptests/Makefile.am

    rd2a45a58 r258bda3  
    11ACLOCAL_AMFLAGS = -I ../aclocal
    22
    3 _SUBDIRS = mp01      mp03 mp04 mp05 mp06 mp07 mp08 mp09 mp10 mp11 mp12 mp13 \
    4     mp14
     3_SUBDIRS  =
     4_SUBDIRS += mp01
     5_SUBDIRS += mp03
     6_SUBDIRS += mp04
     7_SUBDIRS += mp05
     8_SUBDIRS += mp06
     9_SUBDIRS += mp07
     10_SUBDIRS += mp08
     11_SUBDIRS += mp09
     12_SUBDIRS += mp10
     13_SUBDIRS += mp11
     14_SUBDIRS += mp12
     15_SUBDIRS += mp13
     16_SUBDIRS += mp14
    517
    6 include $(top_srcdir)/../automake/test-subdirs.am
     18include $(top_srcdir)/../automake/subdirs.am
    719include $(top_srcdir)/../automake/local.am
  • testsuites/psxtests/Makefile.am

    rd2a45a58 r258bda3  
    11ACLOCAL_AMFLAGS = -I ../aclocal
    22
    3 _SUBDIRS = psxclock
    4 _SUBDIRS += psxthreadname01
     3## Some of the tests need other POSIX features to work while some do not.
     4
     5_SUBDIRS  =
    56if HAS_POSIX
    6 _SUBDIRS += psxhdrs psx01 psx02 psx03 psx04 psx05 psx06 psx07 psx08 psx09 \
    7     psx10 psx11 psx12 psx13 psx14 psx15 psx16 \
    8     psxaio01 psxaio02 psxaio03 \
    9     psxalarm01 psxautoinit01 psxautoinit02 psxbarrier01 \
    10     psxcancel psxcancel01 psxclassic01 psxcleanup psxcleanup01 \
    11     psxconcurrency01 psxcond01 psxcond02 psxconfig01 psxenosys \
    12     psxitimer psxmsgq01 psxmsgq02 psxmsgq03 psxmsgq04 \
    13     psxmutexattr01 psxobj01 psxrwlock01 psxsem01 psxshm01 psxshm02 \
    14     psxsignal01 psxsignal02 psxsignal03 psxsignal04 psxsignal05 psxsignal06 \
    15     psxspin01 psxstrsignal01 psxsysconf \
    16     psxtime psxtimer01 psxtimer02 psxualarm psxusleep psxfatal01 psxfatal02 \
    17     psxintrcritical01 psxstack01 psxstack02 \
    18     psxeintr_join psxgetattrnp01 psxclock01
     7_SUBDIRS += psx01
     8_SUBDIRS += psx02
     9_SUBDIRS += psx03
     10_SUBDIRS += psx04
     11_SUBDIRS += psx05
     12_SUBDIRS += psx06
     13_SUBDIRS += psx07
     14_SUBDIRS += psx08
     15_SUBDIRS += psx09
     16_SUBDIRS += psx10
     17_SUBDIRS += psx11
     18_SUBDIRS += psx12
     19_SUBDIRS += psx14
     20_SUBDIRS += psx15
     21_SUBDIRS += psx16
     22_SUBDIRS += psxaio01
     23_SUBDIRS += psxaio02
     24_SUBDIRS += psxaio03
     25_SUBDIRS += psxalarm01
     26_SUBDIRS += psxautoinit01
     27_SUBDIRS += psxautoinit02
     28_SUBDIRS += psxbarrier01
     29_SUBDIRS += psxcancel
     30_SUBDIRS += psxcancel01
     31_SUBDIRS += psxclassic01
     32_SUBDIRS += psxcleanup
     33_SUBDIRS += psxcleanup01
    1934_SUBDIRS += psxcleanup02
     35endif
     36_SUBDIRS += psxclock
     37if HAS_POSIX
     38_SUBDIRS += psxclock01
     39_SUBDIRS += psxconcurrency01
     40_SUBDIRS += psxcond01
     41_SUBDIRS += psxcond02
     42_SUBDIRS += psxconfig01
     43endif
     44_SUBDIRS += psxdevctl01
     45if HAS_POSIX
     46_SUBDIRS += psxeintr_join
     47_SUBDIRS += psxenosys
     48_SUBDIRS += psxfatal01
     49_SUBDIRS += psxfatal02
     50endif
     51if HAS_POSIX
    2052if HAS_CPLUSPLUS
    2153_SUBDIRS += psxglobalcon01
    2254_SUBDIRS += psxglobalcon02
    2355endif
     56_SUBDIRS += psxhdrs
     57_SUBDIRS += psxintrcritical01
     58_SUBDIRS += psxitimer
    2459endif
    25 
    26 ## File IO tests
    27 _SUBDIRS += psxfile01 psxfile02 psxfilelock01 psxgetrusage01 psxid01 \
    28     psximfs01 psximfs02 psxreaddir psxstat psxmount psx13 psxchroot01 \
    29     psxpasswd01 psxpasswd02 psxpipe01 psxtimes01 psxfchx01
    30 
    31 ## POSIX Devctl tests
    32 _SUBDIRS += psxdevctl01
    33 
    34 ## POSIX Keys are always available
    35 _SUBDIRS += psxkey01 psxkey02 psxkey03 psxkey04 \
    36     psxkey05 psxkey06 psxkey08 psxkey09 psxkey10
    37 ## But some of the tests need other POSIX features
     60_SUBDIRS += psxkey01
     61_SUBDIRS += psxkey02
     62_SUBDIRS += psxkey03
     63_SUBDIRS += psxkey04
     64_SUBDIRS += psxkey05
     65_SUBDIRS += psxkey06
    3866if HAS_POSIX
    3967_SUBDIRS += psxkey07
    4068endif
     69_SUBDIRS += psxkey08
     70_SUBDIRS += psxkey09
     71_SUBDIRS += psxkey10
     72if HAS_POSIX
     73_SUBDIRS += psxmsgq01
     74_SUBDIRS += psxmsgq02
     75_SUBDIRS += psxmsgq03
     76_SUBDIRS += psxmsgq04
     77_SUBDIRS += psxmutexattr01
     78_SUBDIRS += psxobj01
     79endif
     80_SUBDIRS += psxonce01
     81_SUBDIRS += psxrdwrv
     82if HAS_POSIX
     83_SUBDIRS += psxrwlock01
     84_SUBDIRS += psxsem01
     85_SUBDIRS += psxshm01
     86_SUBDIRS += psxshm02
     87_SUBDIRS += psxsignal01
     88_SUBDIRS += psxsignal02
     89_SUBDIRS += psxsignal03
     90_SUBDIRS += psxsignal04
     91_SUBDIRS += psxsignal05
     92_SUBDIRS += psxsignal06
     93_SUBDIRS += psxspin01
     94_SUBDIRS += psxstack01
     95_SUBDIRS += psxstack02
     96_SUBDIRS += psxstrsignal01
     97_SUBDIRS += psxsysconf
     98endif
     99_SUBDIRS += psxthreadname01
     100if HAS_POSIX
     101_SUBDIRS += psxtime
     102_SUBDIRS += psxtimer01
     103_SUBDIRS += psxtimer02
     104_SUBDIRS += psxualarm
     105_SUBDIRS += psxusleep
     106endif
    41107
    42 ## POSIX Once is always available
    43 _SUBDIRS += psxonce01
    44108
    45 _SUBDIRS += psxrdwrv
    46109
    47 include $(top_srcdir)/../automake/test-subdirs.am
     110## File IO tests
     111_SUBDIRS += psx13
     112_SUBDIRS += psxchroot01
     113_SUBDIRS += psxfile01
     114_SUBDIRS += psxfile02
     115_SUBDIRS += psxfilelock01
     116_SUBDIRS += psxgetattrnp01
     117_SUBDIRS += psxgetrusage01
     118_SUBDIRS += psxid01
     119_SUBDIRS += psximfs01
     120_SUBDIRS += psximfs02
     121_SUBDIRS += psxmount
     122_SUBDIRS += psxpasswd01
     123_SUBDIRS += psxpasswd02
     124_SUBDIRS += psxpipe01
     125_SUBDIRS += psxreaddir
     126_SUBDIRS += psxstat
     127_SUBDIRS += psxtimes01
     128_SUBDIRS += psxfchx01
     129
     130include $(top_srcdir)/../automake/subdirs.am
    48131include $(top_srcdir)/../automake/local.am
  • testsuites/psxtests/configure.ac

    rd2a45a58 r258bda3  
    185185psxpasswd02/Makefile
    186186psxpipe01/Makefile
     187psxrdwrv/Makefile
    187188psxreaddir/Makefile
    188 psxrdwrv/Makefile
    189189psxrwlock01/Makefile
    190190psxsem01/Makefile
     
    203203psxstrsignal01/Makefile
    204204psxsysconf/Makefile
     205psxthreadname01/Makefile
    205206psxtime/Makefile
    206207psxtimer01/Makefile
    207208psxtimer02/Makefile
    208209psxtimes01/Makefile
    209 psxthreadname01/Makefile
    210210psxualarm/Makefile
    211211psxusleep/Makefile
  • testsuites/psxtmtests/Makefile.am

    rd2a45a58 r258bda3  
    11ACLOCAL_AMFLAGS = -I ../aclocal
    22
    3 SUBDIRS =
     3_SUBDIRS =
    44
    55if HAS_POSIX
    6 SUBDIRS += psxtmbarrier01
    7 SUBDIRS += psxtmbarrier02
    8 SUBDIRS += psxtmbarrier03
    9 SUBDIRS += psxtmbarrier04
    10 SUBDIRS += psxtmclocknanosleep01
    11 SUBDIRS += psxtmclocknanosleep02
    12 SUBDIRS += psxtmclocknanosleep03
    13 SUBDIRS += psxtmcond01
    14 SUBDIRS += psxtmcond02
    15 SUBDIRS += psxtmcond03
    16 SUBDIRS += psxtmcond04
    17 SUBDIRS += psxtmcond05
    18 SUBDIRS += psxtmcond06
    19 SUBDIRS += psxtmcond07
    20 SUBDIRS += psxtmcond08
    21 SUBDIRS += psxtmcond09
    22 SUBDIRS += psxtmcond10
    23 SUBDIRS += psxtmkey01
    24 SUBDIRS += psxtmkey02
    25 SUBDIRS += psxtmmq01
    26 SUBDIRS += psxtmmutex01
    27 SUBDIRS += psxtmmutex02
    28 SUBDIRS += psxtmmutex03
    29 SUBDIRS += psxtmmutex04
    30 SUBDIRS += psxtmmutex05
    31 SUBDIRS += psxtmmutex06
    32 SUBDIRS += psxtmmutex07
    33 SUBDIRS += psxtmnanosleep01
    34 SUBDIRS += psxtmnanosleep02
    35 SUBDIRS += psxtmrwlock01
    36 SUBDIRS += psxtmrwlock02
    37 SUBDIRS += psxtmrwlock03
    38 SUBDIRS += psxtmrwlock04
    39 SUBDIRS += psxtmrwlock05
    40 SUBDIRS += psxtmrwlock06
    41 SUBDIRS += psxtmrwlock07
    42 SUBDIRS += psxtmsem01
    43 SUBDIRS += psxtmsem02
    44 SUBDIRS += psxtmsem03
    45 SUBDIRS += psxtmsem04
    46 SUBDIRS += psxtmsem05
    47 SUBDIRS += psxtmsleep01
    48 SUBDIRS += psxtmsleep02
    49 SUBDIRS += psxtmthread01
    50 SUBDIRS += psxtmthread02
    51 SUBDIRS += psxtmthread03
    52 SUBDIRS += psxtmthread04
    53 SUBDIRS += psxtmthread05
    54 SUBDIRS += psxtmthread06
     6_SUBDIRS += psxtmbarrier01
     7_SUBDIRS += psxtmbarrier02
     8_SUBDIRS += psxtmbarrier03
     9_SUBDIRS += psxtmbarrier04
     10_SUBDIRS += psxtmclocknanosleep01
     11_SUBDIRS += psxtmclocknanosleep02
     12_SUBDIRS += psxtmclocknanosleep03
     13_SUBDIRS += psxtmcond01
     14_SUBDIRS += psxtmcond02
     15_SUBDIRS += psxtmcond03
     16_SUBDIRS += psxtmcond04
     17_SUBDIRS += psxtmcond05
     18_SUBDIRS += psxtmcond06
     19_SUBDIRS += psxtmcond07
     20_SUBDIRS += psxtmcond08
     21_SUBDIRS += psxtmcond09
     22_SUBDIRS += psxtmcond10
     23_SUBDIRS += psxtmkey01
     24_SUBDIRS += psxtmkey02
     25_SUBDIRS += psxtmmq01
     26_SUBDIRS += psxtmmutex01
     27_SUBDIRS += psxtmmutex02
     28_SUBDIRS += psxtmmutex03
     29_SUBDIRS += psxtmmutex04
     30_SUBDIRS += psxtmmutex05
     31_SUBDIRS += psxtmmutex06
     32_SUBDIRS += psxtmmutex07
     33_SUBDIRS += psxtmnanosleep01
     34_SUBDIRS += psxtmnanosleep02
     35_SUBDIRS += psxtmrwlock01
     36_SUBDIRS += psxtmrwlock02
     37_SUBDIRS += psxtmrwlock03
     38_SUBDIRS += psxtmrwlock04
     39_SUBDIRS += psxtmrwlock05
     40_SUBDIRS += psxtmrwlock06
     41_SUBDIRS += psxtmrwlock07
     42_SUBDIRS += psxtmsem01
     43_SUBDIRS += psxtmsem02
     44_SUBDIRS += psxtmsem03
     45_SUBDIRS += psxtmsem04
     46_SUBDIRS += psxtmsem05
     47_SUBDIRS += psxtmsleep01
     48_SUBDIRS += psxtmsleep02
     49_SUBDIRS += psxtmthread01
     50_SUBDIRS += psxtmthread02
     51_SUBDIRS += psxtmthread03
     52_SUBDIRS += psxtmthread04
     53_SUBDIRS += psxtmthread05
     54_SUBDIRS += psxtmthread06
    5555endif
    5656
    57 DIST_SUBDIRS = $(SUBDIRS)
     57DIST_SUBDIRS = $(_SUBDIRS)
    5858
    5959include $(top_srcdir)/../automake/subdirs.am
  • testsuites/rhealstone/Makefile.am

    rd2a45a58 r258bda3  
    11ACLOCAL_AMFLAGS = -I ../aclocal
    22
    3 SUBDIRS  = rhtaskswitch
    4 SUBDIRS += rhtaskpreempt
    5 SUBDIRS += rhilatency
    6 SUBDIRS += rhmlatency
    7 SUBDIRS += rhsemshuffle
    8 SUBDIRS += rhdeadlockbrk
     3_SUBDIRS  =
     4_SUBDIRS += rhdeadlockbrk
     5_SUBDIRS += rhilatency
     6_SUBDIRS += rhmlatency
     7_SUBDIRS += rhsemshuffle
     8_SUBDIRS += rhtaskpreempt
     9_SUBDIRS += rhtaskswitch
    910
    1011include $(top_srcdir)/../automake/subdirs.am
  • testsuites/rhealstone/configure.ac

    rd2a45a58 r258bda3  
    2626# Explicitly list all Makefiles here
    2727AC_CONFIG_FILES([Makefile
    28 rhtaskswitch/Makefile
    29 rhtaskpreempt/Makefile
     28rhdeadlockbrk/Makefile
    3029rhilatency/Makefile
    3130rhmlatency/Makefile
    3231rhsemshuffle/Makefile
    33 rhdeadlockbrk/Makefile
     32rhtaskpreempt/Makefile
     33rhtaskswitch/Makefile
    3434])
    3535AC_OUTPUT
  • testsuites/samples/Makefile.am

    rd2a45a58 r258bda3  
    11ACLOCAL_AMFLAGS = -I ../aclocal
    22
    3 _SUBDIRS = hello capture ticker base_sp unlimited minimum fileio
     3_SUBDIRS  =
     4_SUBDIRS += base_sp
     5_SUBDIRS += capture
     6_SUBDIRS += fileio
     7_SUBDIRS += hello
     8_SUBDIRS += minimum
     9_SUBDIRS += nsecs
     10_SUBDIRS += paranoia
     11_SUBDIRS += ticker
     12_SUBDIRS += unlimited
    413
    514if MPTESTS
     
    817endif
    918
    10 _SUBDIRS += paranoia
    11 
    12 _SUBDIRS += nsecs
    13 
    1419if CXXTESTS
    15 _SUBDIRS += iostream cdtest
     20_SUBDIRS += cdtest
     21_SUBDIRS += iostream
    1622endif
    1723
     
    2531endif
    2632
    27 include $(top_srcdir)/../automake/test-subdirs.am
     33include $(top_srcdir)/../automake/subdirs.am
    2834include $(top_srcdir)/../automake/local.am
  • testsuites/samples/configure.ac

    rd2a45a58 r258bda3  
    3838  [AC_COMPILE_IFELSE(
    3939    [AC_LANG_PROGRAM(
    40       [[#include <iostream>]], 
     40      [[#include <iostream>]],
    4141      [[std::cout << "hello" << std::endl;]])
    4242    ],
     
    6161# Explicitly list all Makefiles here
    6262AC_CONFIG_FILES([Makefile
    63 base_sp/Makefile
    64 hello/Makefile
    65 loopback/Makefile
    66 minimum/Makefile
    67 fileio/Makefile
    68 nsecs/Makefile
    69 paranoia/Makefile
    70 ticker/Makefile
    71 unlimited/Makefile
    7263base_mp/Makefile
    7364base_mp/node1/Makefile
    7465base_mp/node2/Makefile
     66base_sp/Makefile
     67capture/Makefile
     68cdtest/Makefile
     69fileio/Makefile
     70hello/Makefile
    7571iostream/Makefile
    76 cdtest/Makefile
     72loopback/Makefile
     73minimum/Makefile
     74nsecs/Makefile
     75paranoia/Makefile
    7776pppd/Makefile
    78 capture/Makefile
     77ticker/Makefile
     78unlimited/Makefile
    7979])
    8080AC_OUTPUT
  • testsuites/smptests/Makefile.am

    rd2a45a58 r258bda3  
    11ACLOCAL_AMFLAGS = -I ../aclocal
    22
    3 SUBDIRS =
     3_SUBDIRS =
    44if SMPTESTS
    5 SUBDIRS += smp01
    6 SUBDIRS += smp02
    7 SUBDIRS += smp03
    8 SUBDIRS += smp05
    9 SUBDIRS += smp07
    10 SUBDIRS += smp08
    11 SUBDIRS += smp09
    12 SUBDIRS += smpaffinity01
    13 SUBDIRS += smpatomic01
    14 SUBDIRS += smpcache01
    15 SUBDIRS += smpcapture01
    16 SUBDIRS += smpcapture02
    17 SUBDIRS += smpclock01
    18 SUBDIRS += smpfatal01
    19 SUBDIRS += smpfatal02
    20 SUBDIRS += smpfatal03
    21 SUBDIRS += smpfatal04
    22 SUBDIRS += smpfatal05
    23 SUBDIRS += smpfatal06
    24 SUBDIRS += smpfatal08
    25 SUBDIRS += smpipi01
    26 SUBDIRS += smpload01
    27 SUBDIRS += smplock01
    28 SUBDIRS += smpmigration01
    29 SUBDIRS += smpmigration02
    30 SUBDIRS += smpmrsp01
    31 SUBDIRS += smpmutex01
    32 SUBDIRS += smpmutex02
    33 SUBDIRS += smpschedaffinity01
    34 SUBDIRS += smpschedaffinity02
    35 SUBDIRS += smpschedaffinity03
    36 SUBDIRS += smpschedaffinity04
    37 SUBDIRS += smpschedaffinity05
    38 SUBDIRS += smpscheduler01
    39 SUBDIRS += smpscheduler02
    40 SUBDIRS += smpscheduler03
    41 SUBDIRS += smpscheduler04
    42 SUBDIRS += smpschedsem01
    43 SUBDIRS += smpsignal01
    44 SUBDIRS += smpstrongapa01
    45 SUBDIRS += smpswitchextension01
    46 SUBDIRS += smpthreadlife01
    47 SUBDIRS += smpunsupported01
    48 SUBDIRS += smpwakeafter01
     5_SUBDIRS += smp01
     6_SUBDIRS += smp02
     7_SUBDIRS += smp03
     8_SUBDIRS += smp05
     9_SUBDIRS += smp07
     10_SUBDIRS += smp08
     11_SUBDIRS += smp09
     12_SUBDIRS += smpaffinity01
     13_SUBDIRS += smpatomic01
     14_SUBDIRS += smpcache01
     15_SUBDIRS += smpcapture01
     16_SUBDIRS += smpcapture02
     17_SUBDIRS += smpclock01
     18_SUBDIRS += smpfatal01
     19_SUBDIRS += smpfatal02
     20_SUBDIRS += smpfatal03
     21_SUBDIRS += smpfatal04
     22_SUBDIRS += smpfatal05
     23_SUBDIRS += smpfatal06
     24_SUBDIRS += smpfatal08
     25_SUBDIRS += smpipi01
     26_SUBDIRS += smpload01
     27_SUBDIRS += smplock01
     28_SUBDIRS += smpmigration01
     29_SUBDIRS += smpmigration02
     30_SUBDIRS += smpmrsp01
     31_SUBDIRS += smpmutex01
     32_SUBDIRS += smpmutex02
     33_SUBDIRS += smppsxaffinity01
     34_SUBDIRS += smppsxaffinity02
     35_SUBDIRS += smpschedaffinity03
     36_SUBDIRS += smpschedaffinity04
     37_SUBDIRS += smpschedaffinity05
     38_SUBDIRS += smpschedsem01
     39_SUBDIRS += smpscheduler01
     40_SUBDIRS += smpscheduler02
     41_SUBDIRS += smpscheduler03
     42_SUBDIRS += smpscheduler04
     43_SUBDIRS += smpsignal01
     44_SUBDIRS += smpstrongapa01
     45_SUBDIRS += smpswitchextension01
     46_SUBDIRS += smpthreadlife01
     47_SUBDIRS += smpunsupported01
     48_SUBDIRS += smpwakeafter01
    4949if HAS_POSIX
    50 SUBDIRS += smppsxaffinity01
    51 SUBDIRS += smppsxaffinity02
    52 SUBDIRS += smppsxmutex01
    53 SUBDIRS += smppsxsignal01
     50_SUBDIRS += smppsxaffinity01
     51_SUBDIRS += smppsxaffinity02
     52_SUBDIRS += smppsxmutex01
     53_SUBDIRS += smppsxsignal01
    5454endif
    5555endif
  • testsuites/smptests/configure.ac

    rd2a45a58 r258bda3  
    5454# Explicitly list all Makefiles here
    5555AC_CONFIG_FILES([Makefile
    56 smpmutex02/Makefile
    57 smppsxmutex01/Makefile
    58 smpstrongapa01/Makefile
    5956smp01/Makefile
    6057smp02/Makefile
     
    8481smpmrsp01/Makefile
    8582smpmutex01/Makefile
     83smpmutex02/Makefile
    8684smppsxaffinity01/Makefile
    8785smppsxaffinity02/Makefile
     86smppsxmutex01/Makefile
    8887smppsxsignal01/Makefile
    8988smpschedaffinity01/Makefile
     
    9291smpschedaffinity04/Makefile
    9392smpschedaffinity05/Makefile
     93smpschedsem01/Makefile
    9494smpscheduler01/Makefile
    9595smpscheduler02/Makefile
    9696smpscheduler03/Makefile
    9797smpscheduler04/Makefile
    98 smpschedsem01/Makefile
    9998smpsignal01/Makefile
     99smpstrongapa01/Makefile
    100100smpswitchextension01/Makefile
    101101smpthreadlife01/Makefile
  • testsuites/sptests/Makefile.am

    rd2a45a58 r258bda3  
    8181_SUBDIRS += spcpuset01
    8282
    83 include $(top_srcdir)/../automake/test-subdirs.am
     83include $(top_srcdir)/../automake/subdirs.am
    8484include $(top_srcdir)/../automake/local.am
  • testsuites/support/include/buffer_test_io.h

    rd2a45a58 r258bda3  
    2424 * Test states. No state string is an expected pass.
    2525 */
    26 #if TEST_STATE_EXPECTED_FAIL && \
    27     TEST_INDETERMINATE_FAIL
     26#if (TEST_STATE_EXPECTED_FAIL && TEST_STATE_USER_INPUT) || \
     27    (TEST_STATE_EXPECTED_FAIL && TEST_STATE_INDETERMINATE) || \
     28    (TEST_STATE_EXPECTED_FAIL && TEST_STATE_BENCHMARK) || \
     29    (TEST_STATE_USER_INPUT    && TEST_STATE_INDETERMINATE) || \
     30    (TEST_STATE_USER_INPUT    && TEST_STATE_BENCHMARK) || \
     31    (TEST_STATE_INDETERMINATE && TEST_STATE_BENCHMARK)
    2832  #error Test states must be unique
    2933#endif
     
    3135#if TEST_STATE_EXPECTED_FAIL
    3236  #define TEST_STATE_STRING "*** TEST STATE: EXPECTED-FAIL\n"
    33 #elif TEST_INDETERMINATE_FAIL
     37#elif TEST_STATE_USER_INPUT
     38  #define TEST_STATE_STRING "*** TEST STATE: USER_INPUT\n"
     39#elif TEST_STATE_INDETERMINATE
    3440  #define TEST_STATE_STRING "*** TEST STATE: INDETERMINATE\n"
     41#elif TEST_STATE_BENCHMARK
     42  #define TEST_STATE_STRING "*** TEST STATE: BENCHMARK\n"
    3543#endif
    3644
  • testsuites/tmtests/Makefile.am

    rd2a45a58 r258bda3  
    88_SUBDIRS += tmfine01
    99
    10 include $(top_srcdir)/../automake/test-subdirs.am
     10include $(top_srcdir)/../automake/subdirs.am
    1111include $(top_srcdir)/../automake/local.am
  • tools/build/rtems-test-check

    rd2a45a58 r258bda3  
    5454
    5555#
     56# Read the common settings first.
     57#
     58if [ -f $includepath/testdata/rtems.tcfg ]; then
     59 testdata="$includepath/testdata/rtems.tcfg $testdata"
     60fi
     61
     62#
    5663# If there is no testdata all tests are valid and must pass.
    5764#
    5865
    59 if test -f $testdata; then
     66if [ ! -z "$testdata" ]; then
    6067  excluded_tests=""
    6168  expected_fails=""
     69  user_inputs=""
    6270  indeterminates=""
     71  benchmarks=""
    6372  while [ ! -z "$testdata" ];
    6473  do
    6574    for td in $testdata;
    6675    do
     76      if [ ! -f $td ]; then
     77        continue
     78      fi
    6779      ntd=""
    6880      exec 3<& 0
     
    88100              expected_fails="${expected_fails} $line"
    89101              ;;
     102            user-input)
     103              line=$(echo $line | sed -e 's/user-input://g;s/[[:blank:]]//g')
     104              user_inputs="${user_inputs} $line"
     105              ;;
    90106            indeterminate)
    91107              line=$(echo $line | sed -e 's/indeterminate://g;s/[[:blank:]]//g')
    92108              indeterminates="${indeterminates} $line"
     109              ;;
     110            benchmark)
     111              line=$(echo $line | sed -e 's/benchmark://g;s/[[:blank:]]//g')
     112              benchmarks="${benchmarks} $line"
    93113              ;;
    94114            *)
     
    120140        ;;
    121141      flags)
    122         allow="no"
    123         for et in ${expected_fails};
     142        allow="yes"
     143        for et in ${excluded_tests};
    124144        do
    125145          if test ${t} = ${et}; then
    126             allow="yes"
     146            allow="no"
    127147          fi
    128148        done
    129         if test ${allow} = yes; then
    130           output="-DTEST_STATE_EXPECTED_FAIL=1"
    131         fi
    132         allow="no"
    133         for it in ${indeterminates};
    134         do
    135           if test ${t} = ${it}; then
    136             allow="yes"
    137           fi
    138         done
    139         if test ${allow} = yes; then
    140           output="${output} -DTEST_STATE_INDETERMINATE=1"
    141         fi
     149        if test ${allow} = yes; then
     150          allow="no"
     151          for et in ${expected_fails};
     152          do
     153            if test ${t} = ${et}; then
     154              allow="yes"
     155            fi
     156          done
     157          if test ${allow} = yes; then
     158            output="-DTEST_STATE_EXPECTED_FAIL=1"
     159          fi
     160          allow="no"
     161          for ut in ${user_inputs};
     162          do
     163            if test ${t} = ${ut}; then
     164              allow="yes"
     165            fi
     166          done
     167          if test ${allow} = yes; then
     168            output="-DTEST_STATE_USER_INPUT=1"
     169          fi
     170          allow="no"
     171          for it in ${indeterminates};
     172          do
     173            if test ${t} = ${it}; then
     174              allow="yes"
     175            fi
     176          done
     177          if test ${allow} = yes; then
     178            output="${output} -DTEST_STATE_INDETERMINATE=1"
     179          fi
     180          allow="no"
     181          for bt in ${benchmarks};
     182          do
     183            if test ${t} = ${bt}; then
     184              allow="yes"
     185            fi
     186          done
     187          if test ${allow} = yes; then
     188            output="${output} -DTEST_STATE_BENCHMARK=1"
     189          fi
     190        fi
    142191        ;;
    143192      *)
Note: See TracChangeset for help on using the changeset viewer.