Changeset d027e6bb in rtems for testsuites


Ignore:
Timestamp:
Apr 9, 2018, 3:44:01 AM (20 months ago)
Author:
Chris Johns <chrisj@…>
Branches:
master
Children:
8074fa0b
Parents:
590a5809
git-author:
Chris Johns <chrisj@…> (04/09/18 03:44:01)
git-committer:
Chris Johns <chrisj@…> (04/09/18 22:24:54)
Message:

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

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

Update #3382

Location:
testsuites/samples
Files:
16 deleted
2 edited
4 moved

Legend:

Unmodified
Added
Removed
  • testsuites/samples/Makefile.am

    r590a5809 rd027e6bb  
     1#
     2# Samples
     3#
     4
    15ACLOCAL_AMFLAGS = -I ../aclocal
    26
    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
     7include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg
     8include $(top_srcdir)/../automake/compile.am
    139
    14 if MPTESTS
    15 ## base_mp is a sample multiprocessing test
    16 _SUBDIRS += base_mp
     10samples =
     11sample_screens =
     12sample_docs =
     13
     14support_includes = -I$(top_srcdir)/../support/include
     15
     16if HAS_MP
     17if TEST_base_mp
     18# base_mp is a sample multiprocessing test
     19samples += base_mp_node1
     20sample_screens += base_mp/base_mp-node1.scn
     21sample_docs += base_mp/base_mp-node1.doc
     22base_mp_node1_SOURCES = base_mp/init.c base_mp/apptask.c base_mp/system.h
     23base_mp_node1_CPPFLAGS = -DNODE_NUMBER=1 $(AM_CPPFLAGS) $(TEST_FLAGS_base_mp) \
     24        $(support_includes)
     25samples += base_mp_node2
     26sample_screens += base_mp/base_mp-node2.scn
     27sample_docs += base_mp/base_mp-node2.doc
     28base_mp_node2_SOURCES = base_mp/init.c base_mp/apptask.c base_mp/system.h
     29base_mp_node2_CPPFLAGS = -DNODE_NUMBER=2 $(AM_CPPFLAGS) $(TEST_FLAGS_base_mp) \
     30        $(support_includes)
     31endif
     32endif
     33
     34if TEST_base_sp
     35samples += base_sp
     36sample_screens += base_sp/base_sp.scn
     37sample_docs += base_sp/base_sp.doc
     38base_sp_SOURCES = base_sp/init.c base_sp/apptask.c base_sp/system.h
     39base_sp_CPPFLAGS = $(AM_CPPFLAGS) $(TEST_FLAGS_base_sp) \
     40        $(support_includes)
     41endif
     42
     43if TEST_capture
     44samples += capture
     45sample_screens += capture/capture.scn
     46sample_docs += capture/capture.doc
     47capture_SOURCES = capture/init.c capture/test1.c capture/system.h
     48capture_CPPFLAGS = $(AM_CPPFLAGS) $(TEST_FLAGS_capture) \
     49        $(support_includes)
    1750endif
    1851
    1952if CXXTESTS
    20 _SUBDIRS += cdtest
    21 _SUBDIRS += iostream
     53if TEST_cdtest
     54samples += cdtest
     55sample_screens += cdtest/cdtest.scn
     56cdtest_SOURCES = cdtest/init.c cdtest/main.cc cdtest/system.h
     57cdtest_CPPFLAGS = $(AM_CPPFLAGS) $(TEST_FLAGS_cdtest) \
     58        $(support_includes)
     59endif
     60endif
     61
     62if CXXTESTS
     63if TEST_iostream
     64samples += cxx_iostream
     65sample_screens += iostream/iostream.scn
     66sample_docs += iostream/iostream.doc
     67cxx_iostream_SOURCES = iostream/init.cc iostream/system.h
     68cxx_iostream_CPPFLAGS = $(AM_CPPFLAGS) $(TEST_FLAGS_cxx_iostream)
     69endif
     70endif
     71
     72if TEST_fileio
     73samples += fileio
     74sample_docs += fileio/fileio.doc
     75fileio_SOURCES = fileio/init.c fileio/system.h
     76fileio_CPPFLAGS = $(AM_CPPFLAGS) $(TEST_FLAGS_fileio) \
     77        $(support_includes)
     78endif
     79
     80if TEST_hello
     81samples += hello
     82sample_screens += hello/hello.scn
     83sample_docs += hello/hello.doc
     84hello_SOURCES = hello/init.c
     85hello_CPPFLAGS = $(AM_CPPFLAGS) $(TEST_FLAGS_hello) \
     86        $(support_includes)
    2287endif
    2388
    2489if NETTESTS
    25 ## loopback tests a network loopback interface
    26 _SUBDIRS += loopback
    27 if HAS_SMP
    28 else
    29 _SUBDIRS += pppd
     90if TEST_loopback
     91samples += loopback
     92sample_screens += loopback/loopback.scn
     93loopback_SOURCES = loopback/init.c
     94loopback_CPPFLAGS = $(AM_CPPFLAGS) $(TEST_FLAGS_loopback) \
     95        $(support_includes) -I$(RTEMS_SOURCE_ROOT)/cpukit/libnetworking
    3096endif
    3197endif
    3298
    33 include $(top_srcdir)/../automake/subdirs.am
     99if TEST_minimum
     100samples += minimum
     101sample_screens += minimum/minimum.scn
     102sample_docs += minimum/minimum.doc
     103minimum_SOURCES = minimum/init.c
     104minimum_CPPFLAGS = $(AM_CPPFLAGS) $(TEST_FLAGS_minimum)
     105endif
     106
     107if TEST_nsecs
     108samples += nsecs
     109sample_screens += nsecs/nsecs.scn
     110sample_docs += nsecs/nsecs.doc
     111nsecs_SOURCES = nsecs/init.c nsecs/empty.c
     112nsecs_CPPFLAGS = $(AM_CPPFLAGS) $(TEST_FLAGS_nsecs) \
     113        $(support_includes)
     114endif
     115
     116if TEST_paranoia
     117samples += paranoia
     118sample_screens += paranoia/paranoia.scn
     119sample_docs += paranoia/paranoia.doc
     120paranoia_SOURCES = paranoia/init.c paranoia/paranoia.c \
     121        paranoia/system.h
     122paranoia_CPPFLAGS = $(AM_CPPFLAGS) $(TEST_FLAGS_paranoia) \
     123        $(support_includes) -DCYGNUS -DNOMAIN -DNOSIGNAL
     124paranoia_LDADD = -lm
     125endif
     126
     127if NETTESTS
     128if NO_SMP
     129if TEST_pppd
     130samples += pppd
     131pppd_SOURCES = pppd/init.c pppd/pppdapp.c pppd/netconfig.h \
     132        pppd/system.h
     133pppd_CPPFLAGS = $(AM_CPPFLAGS) $(TEST_FLAGS_pppd) $(support_includes) \
     134        -I$(RTEMS_SOURCE_ROOT)/cpukit/libnetworking
     135pppd_LDADD = -lpppd
     136endif
     137endif
     138endif
     139
     140if TEST_ticker
     141samples += ticker
     142sample_screens += ticker/ticker.scn
     143sample_docs += ticker/ticker.doc
     144ticker_SOURCES = ticker/init.c ticker/tasks.c ticker/system.h
     145ticker_CPPFLAGS = $(AM_CPPFLAGS) $(TEST_FLAGS_ticker) \
     146        $(support_includes)
     147endif
     148
     149if TEST_unlimited
     150samples += unlimited
     151sample_screens += unlimited/unlimited.scn
     152sample_docs += unlimited/unlimited.doc
     153unlimited_SOURCES = unlimited/init.c unlimited/test1.c \
     154        unlimited/test2.c unlimited/test3.c unlimited/system.h
     155unlimited_CPPFLAGS = $(AM_CPPFLAGS) $(TEST_FLAGS_unlimited) \
     156        $(support_includes)
     157endif
     158
     159rtems_tests_PROGRAMS = $(samples)
     160dist_rtems_tests_DATA = $(sample_screens) $(sample_docs)
     161
    34162include $(top_srcdir)/../automake/local.am
  • testsuites/samples/configure.ac

    r590a5809 rd027e6bb  
    5555AM_CONDITIONAL([CXXTESTS],[test $CXXTESTS = "yes"])
    5656AM_CONDITIONAL(NETTESTS,test "$rtems_cv_RTEMS_NETWORKING" = "yes")
    57 AM_CONDITIONAL(MPTESTS,test "$rtems_cv_RTEMS_MULTIPROCESSING" = "yes")
     57AM_CONDITIONAL(HAS_MP,test "$rtems_cv_RTEMS_MULTIPROCESSING" = "yes")
     58AM_CONDITIONAL(NO_SMP,test "$rtems_cv_RTEMS_SMP" != "yes")
    5859AM_CONDITIONAL(HAS_SMP,test "$rtems_cv_RTEMS_SMP" = "yes")
    5960
     
    6162AC_CHECK_SIZEOF([time_t])
    6263
    63 # Explicitly list all Makefiles here
    64 AC_CONFIG_FILES([Makefile
    65 base_mp/Makefile
    66 base_mp/node1/Makefile
    67 base_mp/node2/Makefile
    68 base_sp/Makefile
    69 capture/Makefile
    70 cdtest/Makefile
    71 fileio/Makefile
    72 hello/Makefile
    73 iostream/Makefile
    74 loopback/Makefile
    75 minimum/Makefile
    76 nsecs/Makefile
    77 paranoia/Makefile
    78 pppd/Makefile
    79 ticker/Makefile
    80 unlimited/Makefile
    81 ])
     64# BSP Test configuration
     65RTEMS_TEST_CHECK([base_mp])
     66RTEMS_TEST_CHECK([base_sp])
     67RTEMS_TEST_CHECK([capture])
     68RTEMS_TEST_CHECK([cdtest])
     69RTEMS_TEST_CHECK([iostream])
     70RTEMS_TEST_CHECK([fileio])
     71RTEMS_TEST_CHECK([hello])
     72RTEMS_TEST_CHECK([loopback])
     73RTEMS_TEST_CHECK([minimum])
     74RTEMS_TEST_CHECK([nsecs])
     75RTEMS_TEST_CHECK([paranoia])
     76RTEMS_TEST_CHECK([pppd])
     77RTEMS_TEST_CHECK([ticker])
     78RTEMS_TEST_CHECK([unlimited])
     79
     80AC_CONFIG_FILES([Makefile])
    8281AC_OUTPUT
Note: See TracChangeset for help on using the changeset viewer.