Changeset 32f2629b in rtems for testsuites


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

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

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

Update #3382

Location:
testsuites/benchmarks
Files:
3 deleted
2 edited

Legend:

Unmodified
Added
Removed
  • testsuites/benchmarks/Makefile.am

    r18f77699 r32f2629b  
     1#
     2# Benchmarks
     3#
     4
    15ACLOCAL_AMFLAGS = -I ../aclocal
    26
    3 _SUBDIRS =
    4 _SUBDIRS += dhrystone
    5 _SUBDIRS += linpack
    6 _SUBDIRS += whetstone
     7include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg
     8include $(top_srcdir)/../automake/compile.am
    79
    8 include $(top_srcdir)/../automake/subdirs.am
     10benchmarks =
     11benchmark_screens =
     12benchmark_docs =
     13
     14support_includes = -I$(top_srcdir)/../support/include
     15
     16if TEST_dhrystone
     17benchmarks += dhrystone
     18benchmark_screens += dhrystone/dhrystone.scn
     19benchmark_docs += dhrystone/dhrystone.doc
     20dhrystone_SOURCES = dhrystone/init.c dhrystone/dhry_1.c \
     21        dhrystone/dhry_2.c
     22dhrystone_CPPFLAGS = $(AM_CPPFLAGS) $(TEST_FLAGS_dhrystone) \
     23        $(support_includes)
     24endif
     25
     26if TEST_linpack
     27benchmarks += linpack
     28benchmark_screens += linpack/linpack.scn
     29benchmark_docs += linpack/linpack.doc
     30linpack_SOURCES = linpack/init.c linpack/linpack-pc.c
     31linpack_CPPFLAGS = $(AM_CPPFLAGS) $(TEST_FLAGS_linpack) \
     32        $(support_includes)
     33linpack_LDADD = -lm
     34endif
     35
     36if TEST_whetstone
     37benchmarks += whetstone
     38benchmark_screens += whetstone/whetstone.scn
     39benchmark_docs += whetstone/whetstone.doc
     40whetstone_SOURCES = whetstone/init.c whetstone/whetstone.c
     41whetstone_CPPFLAGS = $(AM_CPPFLAGS) $(TEST_FLAGS_whetstone) \
     42        $(support_includes)
     43whetstone_LDADD = -lm
     44endif
     45
     46rtems_tests_PROGRAMS = $(benchmarks)
     47dist_rtems_tests_DATA = $(benchmark_screens) $(benchmark_docs)
     48
    949include $(top_srcdir)/../automake/local.am
  • testsuites/benchmarks/configure.ac

    r18f77699 r32f2629b  
    2323RTEMS_CHECK_CUSTOM_BSP(RTEMS_BSP)
    2424
    25 # Explicitly list all Makefiles here
    26 AC_CONFIG_FILES([Makefile
    27 dhrystone/Makefile
    28 linpack/Makefile
    29 whetstone/Makefile
    30 ])
     25# BSP Test configuration
     26RTEMS_TEST_CHECK([dhrystone])
     27RTEMS_TEST_CHECK([linpack])
     28RTEMS_TEST_CHECK([whetstone])
     29
     30AC_CONFIG_FILES([Makefile])
    3131AC_OUTPUT
Note: See TracChangeset for help on using the changeset viewer.