Changeset 590a5809 in rtems for testsuites


Ignore:
Timestamp:
Apr 9, 2018, 3:43:30 AM (20 months ago)
Author:
Chris Johns <chrisj@…>
Branches:
master
Children:
d027e6bb
Parents:
dfc57eb
git-author:
Chris Johns <chrisj@…> (04/09/18 03:43:30)
git-committer:
Chris Johns <chrisj@…> (04/09/18 22:24:54)
Message:

testsuite/irhealstone: Merged nested Makefile.am files into one Makefile.am

This change is part of the testsuite Makefile.am reorganization.

Update #3382

Location:
testsuites/rhealstone
Files:
6 deleted
2 edited

Legend:

Unmodified
Added
Removed
  • testsuites/rhealstone/Makefile.am

    rdfc57eb r590a5809  
     1#
     2# Real-time Benchmarking
     3#
     4
    15ACLOCAL_AMFLAGS = -I ../aclocal
    26
    3 _SUBDIRS  =
    4 _SUBDIRS += rhdeadlockbrk
    5 _SUBDIRS += rhilatency
    6 _SUBDIRS += rhmlatency
    7 _SUBDIRS += rhsemshuffle
    8 _SUBDIRS += rhtaskpreempt
    9 _SUBDIRS += rhtaskswitch
     7include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg
     8include $(top_srcdir)/../automake/compile.am
    109
    11 include $(top_srcdir)/../automake/subdirs.am
     10rhealstones =
     11rhealstone_screens =
     12rhealstone_docs =
     13
     14support_includes = -I$(top_srcdir)/../support/include
     15
     16if TEST_rhdeadlockbrk
     17rhealstones += rhdeadlockbrk
     18rhealstone_docs += rhdeadlockbrk/rhdeadlockbrk.adoc
     19rhdeadlockbrk_SOURCES = rhdeadlockbrk/deadlockbrk.c \
     20        ../tmtests/include/timesys.h
     21rhdeadlockbrk_CPPFLAGS = $(AM_CPPFLAGS) $(TEST_FLAGS_rhdeadlockbrk) \
     22        $(support_includes) -I$(top_srcdir)/../tmtests/include
     23endif
     24
     25if TEST_rhilatency
     26rhealstones += rhilatency
     27rhealstone_docs += rhilatency/rhilatency.adoc
     28rhilatency_SOURCES = rhilatency/ilatency.c \
     29        ../tmtests/include/timesys.h
     30rhilatency_CPPFLAGS = $(AM_CPPFLAGS) $(TEST_FLAGS_rhilatency) \
     31        $(support_includes) -I$(top_srcdir)/../tmtests/include
     32endif
     33
     34if TEST_rhmlatency
     35rhealstones += rhmlatency
     36rhealstone_docs += rhmlatency/rhmlatency.adoc
     37rhmlatency_SOURCES = rhmlatency/mlatency.c \
     38        ../tmtests/include/timesys.h
     39rhmlatency_CPPFLAGS = $(AM_CPPFLAGS) $(TEST_FLAGS_rhmlatency) \
     40        $(support_includes) -I$(top_srcdir)/../tmtests/include
     41endif
     42
     43if TEST_rhsemshuffle
     44rhealstones += rhsemshuffle
     45rhealstone_docs += rhsemshuffle/rhsemshuffle.adoc
     46rhsemshuffle_SOURCES = rhsemshuffle/semshuffle.c \
     47        ../tmtests/include/timesys.h
     48rhsemshuffle_CPPFLAGS = $(AM_CPPFLAGS) $(TEST_FLAGS_rhsemshuffle) \
     49        $(support_includes) -I$(top_srcdir)/../tmtests/include
     50endif
     51
     52if TEST_rhtaskpreempt
     53rhealstones += rhtaskpreempt
     54rhealstone_docs += rhtaskpreempt/rhtaskpreempt.adoc
     55rhtaskpreempt_SOURCES = rhtaskpreempt/taskpreempt.c \
     56        ../tmtests/include/timesys.h
     57rhtaskpreempt_CPPFLAGS = $(AM_CPPFLAGS) $(TEST_FLAGS_rhtaskpreempt) \
     58        $(support_includes) -I$(top_srcdir)/../tmtests/include
     59endif
     60
     61if TEST_rhtaskswitch
     62rhealstones += rhtaskswitch
     63rhealstone_docs += rhtaskswitch/rhtaskswitch.adoc
     64rhtaskswitch_SOURCES = rhtaskswitch/taskswitch.c \
     65        ../tmtests/include/timesys.h
     66rhtaskswitch_CPPFLAGS = $(AM_CPPFLAGS) $(TEST_FLAGS_rhtaskswitch) \
     67        $(support_includes) -I$(top_srcdir)/../tmtests/include
     68endif
     69
     70rtems_tests_PROGRAMS = $(rhealstones)
     71dist_rtems_tests_DATA = $(rhealstone_screens) $(rhealstone_docs)
     72
    1273include $(top_srcdir)/../automake/local.am
  • testsuites/rhealstone/configure.ac

    rdfc57eb r590a5809  
    2626RTEMS_CHECK_CUSTOM_BSP(RTEMS_BSP)
    2727
    28 # Explicitly list all Makefiles here
    29 AC_CONFIG_FILES([Makefile
    30 rhdeadlockbrk/Makefile
    31 rhilatency/Makefile
    32 rhmlatency/Makefile
    33 rhsemshuffle/Makefile
    34 rhtaskpreempt/Makefile
    35 rhtaskswitch/Makefile
    36 ])
     28# BSP Test configuration
     29RTEMS_TEST_CHECK([rhdeadlockbrk])
     30RTEMS_TEST_CHECK([rhilatency])
     31RTEMS_TEST_CHECK([rhmlatency])
     32RTEMS_TEST_CHECK([rhsemshuffle])
     33RTEMS_TEST_CHECK([rhtaskpreempt])
     34RTEMS_TEST_CHECK([rhtaskswitch])
     35
     36AC_CONFIG_FILES([Makefile])
    3737AC_OUTPUT
Note: See TracChangeset for help on using the changeset viewer.