Changeset 3206879f in rtems for testsuites


Ignore:
Timestamp:
Apr 9, 2018, 3:41:08 AM (20 months ago)
Author:
Chris Johns <chrisj@…>
Branches:
master
Children:
2a99a6a
Parents:
8967e5f
git-author:
Chris Johns <chrisj@…> (04/09/18 03:41:08)
git-committer:
Chris Johns <chrisj@…> (04/09/18 22:24:54)
Message:

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

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

Update #3382

Location:
testsuites/mptests
Files:
26 deleted
2 edited
52 moved

Legend:

Unmodified
Added
Removed
  • testsuites/mptests/Makefile.am

    r8967e5f r3206879f  
     1#
     2# Multiple Processor Teststuite
     3#
     4
    15ACLOCAL_AMFLAGS = -I ../aclocal
    26
    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
    17 
    18 include $(top_srcdir)/../automake/subdirs.am
     7include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg
     8include $(top_srcdir)/../automake/compile.am
     9
     10mp_tests =
     11mp_screens =
     12mp_docs =
     13mp_lib =
     14
     15support_includes = -I$(top_srcdir)/../support/include
     16
     17if HAS_MP
     18if TEST_mp01
     19mp_tests += mp01_node1
     20mp_screens += mp01/mp01-node1.scn
     21mp_docs += mp01/mp01-node1.doc
     22mp01_node1_SOURCES = mp01/init.c mp01/task1.c mp01/system.h
     23mp01_node1_CPPFLAGS = -DNODE_NUMBER=1 $(AM_CPPFLAGS) $(TEST_FLAGS_mp01) \
     24        $(support_includes)
     25mp_tests += mp01_node2
     26mp_screens += mp01/mp01-node2.scn
     27mp_docs += mp01/mp01-node2.doc
     28mp01_node2_SOURCES = mp01/init.c mp01/task1.c mp01/system.h
     29mp01_node2_CPPFLAGS = -DNODE_NUMBER=2 $(AM_CPPFLAGS) $(TEST_FLAGS_mp01) \
     30        $(support_includes)
     31endif
     32endif
     33
     34if HAS_MP
     35if TEST_mp03
     36mp_tests += mp03_node1
     37mp_screens += mp03/mp03-node1.scn
     38mp_docs += mp03/mp03-node1.doc
     39mp03_node1_SOURCES = mp03/init.c mp03/task1.c mp03/delay.c mp03/system.h
     40mp03_node1_CPPFLAGS = -DNODE_NUMBER=1 $(AM_CPPFLAGS) $(TEST_FLAGS_mp03) \
     41        $(support_includes)
     42mp_tests += mp03_node2
     43mp_screens += mp03/mp03-node2.scn
     44mp_docs += mp03/mp03-node2.doc
     45mp03_node2_SOURCES = mp03/init.c mp03/task1.c mp03/delay.c mp03/system.h
     46mp03_node2_CPPFLAGS = -DNODE_NUMBER=2 $(AM_CPPFLAGS) $(TEST_FLAGS_mp03) \
     47        $(support_includes)
     48endif
     49endif
     50
     51if HAS_MP
     52if TEST_mp04
     53mp_tests += mp04_node1
     54mp_screens += mp04/mp04-node1.scn
     55mp_docs += mp04/mp04-node1.doc
     56mp04_node1_SOURCES = mp04/init.c mp04/task1.c mp04/system.h
     57mp04_node1_CPPFLAGS = -DNODE_NUMBER=1 $(AM_CPPFLAGS) $(TEST_FLAGS_mp04) \
     58        $(support_includes)
     59mp_tests += mp04_node2
     60mp_screens += mp04/mp04-node2.scn
     61mp_docs += mp04/mp04-node2.doc
     62mp04_node2_SOURCES = mp04/init.c mp04/task1.c mp04/system.h
     63mp04_node2_CPPFLAGS = -DNODE_NUMBER=2 $(AM_CPPFLAGS) $(TEST_FLAGS_mp04) \
     64        $(support_includes)
     65endif
     66endif
     67
     68if HAS_MP
     69if TEST_mp05
     70mp_tests += mp05_node1
     71mp_screens += mp05/mp05-node1.scn
     72mp_docs += mp05/mp05-node1.doc
     73mp05_node1_SOURCES = mp05/init.c mp05/task1.c mp05/asr.c mp05/system.h
     74mp05_node1_CPPFLAGS = -DNODE_NUMBER=1 $(AM_CPPFLAGS) $(TEST_FLAGS_mp05) \
     75        $(support_includes)
     76mp_tests += mp05_node2
     77mp_screens += mp05/mp05-node2.scn
     78mp_docs += mp05/mp05-node2.doc
     79mp05_node2_SOURCES = mp05/init.c mp05/task1.c mp05/asr.c mp05/system.h
     80mp05_node2_CPPFLAGS = -DNODE_NUMBER=2 $(AM_CPPFLAGS) $(TEST_FLAGS_mp05) \
     81        $(support_includes)
     82endif
     83endif
     84
     85if HAS_MP
     86if TEST_mp06
     87mp_tests += mp06_node1
     88mp_screens += mp06/mp06-node1.scn
     89mp_docs += mp06/mp06-node1.doc
     90mp06_node1_SOURCES = mp06/init.c mp06/task1.c mp06/system.h
     91mp06_node1_CPPFLAGS = -DNODE_NUMBER=1 $(AM_CPPFLAGS) $(TEST_FLAGS_mp06) \
     92        $(support_includes)
     93mp_tests += mp06_node2
     94mp_screens += mp06/mp06-node2.scn
     95mp_docs += mp06/mp06-node2.doc
     96mp06_node2_SOURCES = mp06/init.c mp06/task1.c mp06/system.h
     97mp06_node2_CPPFLAGS = -DNODE_NUMBER=2 $(AM_CPPFLAGS) $(TEST_FLAGS_mp06) \
     98        $(support_includes)
     99endif
     100endif
     101
     102if HAS_MP
     103if TEST_mp07
     104mp_tests += mp07_node1
     105mp_screens += mp07/mp07-node1.scn
     106mp_docs += mp07/mp07-node1.doc
     107mp07_node1_SOURCES = mp07/init.c mp07/task1.c mp07/system.h
     108mp07_node1_CPPFLAGS = -DNODE_NUMBER=1 $(AM_CPPFLAGS) $(TEST_FLAGS_mp07) \
     109        $(support_includes)
     110mp_tests += mp07_node2
     111mp_screens += mp07/mp07-node2.scn
     112mp_docs += mp07/mp07-node2.doc
     113mp07_node2_SOURCES = mp07/init.c mp07/task1.c mp07/system.h
     114mp07_node2_CPPFLAGS = -DNODE_NUMBER=2 $(AM_CPPFLAGS) $(TEST_FLAGS_mp07) \
     115        $(support_includes)
     116endif
     117endif
     118
     119if HAS_MP
     120if TEST_mp08
     121mp_tests += mp08_node1
     122mp_screens += mp08/mp08-node1.scn
     123mp_docs += mp08/mp08-node1.doc
     124mp08_node1_SOURCES = mp08/init.c mp08/task1.c mp08/system.h
     125mp08_node1_CPPFLAGS = -DNODE_NUMBER=1 $(AM_CPPFLAGS) $(TEST_FLAGS_mp08) \
     126        $(support_includes)
     127mp_tests += mp08_node2
     128mp_screens += mp08/mp08-node2.scn
     129mp_docs += mp08/mp08-node2.doc
     130mp08_node2_SOURCES = mp08/init.c mp08/task1.c mp08/system.h
     131mp08_node2_CPPFLAGS = -DNODE_NUMBER=2 $(AM_CPPFLAGS) $(TEST_FLAGS_mp08) \
     132        $(support_includes)
     133endif
     134endif
     135
     136if HAS_MP
     137if TEST_mp09
     138mp_tests += mp09_node1
     139mp_screens += mp09/mp09-node1.scn
     140mp_docs += mp09/mp09-node1.doc
     141mp09_node1_SOURCES = mp09/init.c mp09/task1.c mp09/recvmsg.c \
     142        mp09/sendmsg.c mp09/system.h
     143mp09_node1_CPPFLAGS = -DNODE_NUMBER=1 $(AM_CPPFLAGS) $(TEST_FLAGS_mp09) \
     144        $(support_includes)
     145mp_tests += mp09_node2
     146mp_screens += mp09/mp09-node2.scn
     147mp_docs += mp09/mp09-node2.doc
     148mp09_node2_SOURCES = mp09/init.c mp09/task1.c mp09/recvmsg.c \
     149        mp09/sendmsg.c mp09/system.h
     150mp09_node2_CPPFLAGS = -DNODE_NUMBER=2 $(AM_CPPFLAGS) $(TEST_FLAGS_mp09) \
     151        $(support_includes)
     152endif
     153endif
     154
     155if HAS_MP
     156if TEST_mp10
     157mp_tests += mp10_node1
     158mp_screens += mp10/mp10-node1.scn
     159mp_docs += mp10/mp10-node1.doc
     160mp10_node1_SOURCES = mp10/init.c mp10/task1.c mp10/task2.c mp10/task3.c \
     161        mp10/system.h
     162mp10_node1_CPPFLAGS = -DNODE_NUMBER=1 $(AM_CPPFLAGS) $(TEST_FLAGS_mp10) \
     163        $(support_includes)
     164mp_tests += mp10_node2
     165mp_screens += mp10/mp10-node2.scn
     166mp_docs += mp10/mp10-node2.doc
     167mp10_node2_SOURCES = mp10/init.c mp10/task1.c mp10/task2.c mp10/task3.c \
     168        mp10/system.h
     169mp10_node2_CPPFLAGS = -DNODE_NUMBER=2 $(AM_CPPFLAGS) $(TEST_FLAGS_mp10) \
     170        $(support_includes)
     171endif
     172endif
     173
     174if HAS_MP
     175if TEST_mp11
     176mp_tests += mp11_node1
     177mp_screens += mp11/mp11-node1.scn
     178mp_docs += mp11/mp11-node1.doc
     179mp11_node1_SOURCES = mp11/init.c mp11/system.h
     180mp11_node1_CPPFLAGS = -DNODE_NUMBER=1 $(AM_CPPFLAGS) $(TEST_FLAGS_mp11) \
     181        $(support_includes)
     182mp_tests += mp11_node2
     183mp_screens += mp11/mp11-node2.scn
     184mp_docs += mp11/mp11-node2.doc
     185mp11_node2_SOURCES = mp11/init.c mp11/system.h
     186mp11_node2_CPPFLAGS = -DNODE_NUMBER=2 $(AM_CPPFLAGS) $(TEST_FLAGS_mp11) \
     187        $(support_includes)
     188endif
     189endif
     190
     191if HAS_MP
     192if TEST_mp12
     193mp_tests += mp12_node1
     194mp_screens += mp12/mp12-node1.scn
     195mp_docs += mp12/mp12-node1.doc
     196mp12_node1_SOURCES = mp12/init.c mp12/system.h
     197mp12_node1_CPPFLAGS = -DNODE_NUMBER=1 $(AM_CPPFLAGS) $(TEST_FLAGS_mp12) \
     198        $(support_includes)
     199mp_tests += mp12_node2
     200mp_screens += mp12/mp12-node2.scn
     201mp_docs += mp12/mp12-node2.doc
     202mp12_node2_SOURCES = mp12/init.c mp12/system.h
     203mp12_node2_CPPFLAGS = -DNODE_NUMBER=2 $(AM_CPPFLAGS) $(TEST_FLAGS_mp12) \
     204        $(support_includes)
     205endif
     206endif
     207
     208if HAS_MP
     209if TEST_mp13
     210mp_tests += mp13_node1
     211mp_screens += mp13/mp13-node1.scn
     212mp_docs += mp13/mp13-node1.doc
     213mp13_node1_SOURCES = mp13/init.c mp13/task1.c mp13/task2.c mp13/system.h
     214mp13_node1_CPPFLAGS = -DNODE_NUMBER=1 $(AM_CPPFLAGS) $(TEST_FLAGS_mp13) \
     215        $(support_includes)
     216mp_tests += mp13_node2
     217mp_screens += mp13/mp13-node2.scn
     218mp_docs += mp13/mp13-node2.doc
     219mp13_node2_SOURCES = mp13/init.c mp13/task1.c mp13/task2.c mp13/system.h
     220mp13_node2_CPPFLAGS = -DNODE_NUMBER=2 $(AM_CPPFLAGS) $(TEST_FLAGS_mp13) \
     221        $(support_includes)
     222endif
     223endif
     224
     225if HAS_MP
     226if TEST_mp14
     227mp_tests += mp14_node1
     228mp_screens += mp14/mp14-node1.scn
     229mp_docs += mp14/mp14-node1.doc
     230mp14_node1_SOURCES = mp14/init.c mp14/exit.c mp14/delay.c \
     231        mp14/evtask1.c mp14/evtmtask.c mp14/pttask1.c mp14/smtask1.c \
     232        mp14/msgtask1.c mp14/system.h
     233mp14_node1_CPPFLAGS = -DNODE_NUMBER=1 $(AM_CPPFLAGS) $(TEST_FLAGS_mp14) \
     234        $(support_includes) -DMAX_LONG_TEST_DURATION=$(MAX_LONG_TEST_DURATION)
     235mp_tests += mp14_node2
     236mp_screens += mp14/mp14-node2.scn
     237mp_docs += mp14/mp14-node2.doc
     238mp14_node2_SOURCES = mp14/init.c mp14/exit.c mp14/delay.c \
     239        mp14/evtask1.c mp14/evtmtask.c mp14/pttask1.c mp14/smtask1.c \
     240        mp14/msgtask1.c mp14/system.h
     241mp14_node2_CPPFLAGS = -DNODE_NUMBER=2 $(AM_CPPFLAGS) $(TEST_FLAGS_mp14) \
     242        $(support_includes) -DMAX_LONG_TEST_DURATION=$(MAX_LONG_TEST_DURATION)
     243endif
     244endif
     245
     246rtems_tests_PROGRAMS = $(mp_tests)
     247dist_rtems_tests_DATA = $(mp_screens) $(mp_docs)
     248
    19249include $(top_srcdir)/../automake/local.am
  • testsuites/mptests/configure.ac

    r8967e5f r3206879f  
    3333[The longest length of time a "long running" test should run])
    3434
    35 # Explicitly list all Makefiles here
    36 AC_CONFIG_FILES([Makefile
    37 mp01/Makefile
    38 mp01/node1/Makefile
    39 mp01/node2/Makefile
    40 mp03/Makefile
    41 mp03/node1/Makefile
    42 mp03/node2/Makefile
    43 mp04/Makefile
    44 mp04/node1/Makefile
    45 mp04/node2/Makefile
    46 mp05/Makefile
    47 mp05/node1/Makefile
    48 mp05/node2/Makefile
    49 mp06/Makefile
    50 mp06/node1/Makefile
    51 mp06/node2/Makefile
    52 mp07/Makefile
    53 mp07/node1/Makefile
    54 mp07/node2/Makefile
    55 mp08/Makefile
    56 mp08/node1/Makefile
    57 mp08/node2/Makefile
    58 mp09/Makefile
    59 mp09/node1/Makefile
    60 mp09/node2/Makefile
    61 mp10/Makefile
    62 mp10/node1/Makefile
    63 mp10/node2/Makefile
    64 mp11/Makefile
    65 mp11/node1/Makefile
    66 mp11/node2/Makefile
    67 mp12/Makefile
    68 mp12/node1/Makefile
    69 mp12/node2/Makefile
    70 mp13/Makefile
    71 mp13/node1/Makefile
    72 mp13/node2/Makefile
    73 mp14/Makefile
    74 mp14/node1/Makefile
    75 mp14/node2/Makefile
    76 ])
     35# BSP Test configuration
     36RTEMS_TEST_CHECK([mp01])
     37RTEMS_TEST_CHECK([mp03])
     38RTEMS_TEST_CHECK([mp04])
     39RTEMS_TEST_CHECK([mp05])
     40RTEMS_TEST_CHECK([mp06])
     41RTEMS_TEST_CHECK([mp07])
     42RTEMS_TEST_CHECK([mp08])
     43RTEMS_TEST_CHECK([mp09])
     44RTEMS_TEST_CHECK([mp10])
     45RTEMS_TEST_CHECK([mp11])
     46RTEMS_TEST_CHECK([mp12])
     47RTEMS_TEST_CHECK([mp13])
     48RTEMS_TEST_CHECK([mp14])
     49
     50AC_CONFIG_FILES([Makefile])
    7751AC_OUTPUT
Note: See TracChangeset for help on using the changeset viewer.