Changeset 0b520cb in rtems


Ignore:
Timestamp:
Nov 6, 2019, 6:28:29 PM (5 months ago)
Author:
Sebastian Huber <sebastian.huber@…>
Branches:
master
Children:
b88c7583
Parents:
786ae3f
git-author:
Sebastian Huber <sebastian.huber@…> (11/06/19 18:28:29)
git-committer:
Sebastian Huber <sebastian.huber@…> (11/12/19 08:36:21)
Message:

mptests: Avoid build system defined defines

Update #3818.

Location:
testsuites/mptests
Files:
26 added
1 edited
13 moved

Legend:

Unmodified
Added
Removed
  • testsuites/mptests/Makefile.am

    r786ae3f r0b520cb  
    2020mp_screens += mp01/mp01-node1.scn
    2121mp_docs += mp01/mp01-node1.doc
    22 mp01_node1_SOURCES = mp01/init.c mp01/task1.c mp01/system.h
    23 mp01_node1_CPPFLAGS = -DNODE_NUMBER=1 $(AM_CPPFLAGS) $(TEST_FLAGS_mp01) \
     22mp01_node1_SOURCES = mp01/init1.c mp01/task1.c mp01/system.h
     23mp01_node1_CPPFLAGS = $(AM_CPPFLAGS) $(TEST_FLAGS_mp01) \
    2424        $(support_includes)
    2525mp_tests += mp01_node2
    2626mp_screens += mp01/mp01-node2.scn
    2727mp_docs += mp01/mp01-node2.doc
    28 mp01_node2_SOURCES = mp01/init.c mp01/task1.c mp01/system.h
    29 mp01_node2_CPPFLAGS = -DNODE_NUMBER=2 $(AM_CPPFLAGS) $(TEST_FLAGS_mp01) \
     28mp01_node2_SOURCES = mp01/init2.c mp01/task1.c mp01/system.h
     29mp01_node2_CPPFLAGS = $(AM_CPPFLAGS) $(TEST_FLAGS_mp01) \
    3030        $(support_includes)
    3131endif
     
    3737mp_screens += mp03/mp03-node1.scn
    3838mp_docs += mp03/mp03-node1.doc
    39 mp03_node1_SOURCES = mp03/init.c mp03/task1.c mp03/delay.c mp03/system.h
    40 mp03_node1_CPPFLAGS = -DNODE_NUMBER=1 $(AM_CPPFLAGS) $(TEST_FLAGS_mp03) \
     39mp03_node1_SOURCES = mp03/init1.c mp03/task1.c mp03/delay.c mp03/system.h
     40mp03_node1_CPPFLAGS = $(AM_CPPFLAGS) $(TEST_FLAGS_mp03) \
    4141        $(support_includes)
    4242mp_tests += mp03_node2
    4343mp_screens += mp03/mp03-node2.scn
    4444mp_docs += mp03/mp03-node2.doc
    45 mp03_node2_SOURCES = mp03/init.c mp03/task1.c mp03/delay.c mp03/system.h
    46 mp03_node2_CPPFLAGS = -DNODE_NUMBER=2 $(AM_CPPFLAGS) $(TEST_FLAGS_mp03) \
     45mp03_node2_SOURCES = mp03/init2.c mp03/task1.c mp03/delay.c mp03/system.h
     46mp03_node2_CPPFLAGS = $(AM_CPPFLAGS) $(TEST_FLAGS_mp03) \
    4747        $(support_includes)
    4848endif
     
    5454mp_screens += mp04/mp04-node1.scn
    5555mp_docs += mp04/mp04-node1.doc
    56 mp04_node1_SOURCES = mp04/init.c mp04/task1.c mp04/system.h
    57 mp04_node1_CPPFLAGS = -DNODE_NUMBER=1 $(AM_CPPFLAGS) $(TEST_FLAGS_mp04) \
     56mp04_node1_SOURCES = mp04/init1.c mp04/task1.c mp04/system.h
     57mp04_node1_CPPFLAGS = $(AM_CPPFLAGS) $(TEST_FLAGS_mp04) \
    5858        $(support_includes)
    5959mp_tests += mp04_node2
    6060mp_screens += mp04/mp04-node2.scn
    6161mp_docs += mp04/mp04-node2.doc
    62 mp04_node2_SOURCES = mp04/init.c mp04/task1.c mp04/system.h
    63 mp04_node2_CPPFLAGS = -DNODE_NUMBER=2 $(AM_CPPFLAGS) $(TEST_FLAGS_mp04) \
     62mp04_node2_SOURCES = mp04/init2.c mp04/task1.c mp04/system.h
     63mp04_node2_CPPFLAGS = $(AM_CPPFLAGS) $(TEST_FLAGS_mp04) \
    6464        $(support_includes)
    6565endif
     
    7171mp_screens += mp05/mp05-node1.scn
    7272mp_docs += mp05/mp05-node1.doc
    73 mp05_node1_SOURCES = mp05/init.c mp05/task1.c mp05/asr.c mp05/system.h
    74 mp05_node1_CPPFLAGS = -DNODE_NUMBER=1 $(AM_CPPFLAGS) $(TEST_FLAGS_mp05) \
     73mp05_node1_SOURCES = mp05/init1.c mp05/task1.c mp05/asr.c mp05/system.h
     74mp05_node1_CPPFLAGS = $(AM_CPPFLAGS) $(TEST_FLAGS_mp05) \
    7575        $(support_includes)
    7676mp_tests += mp05_node2
    7777mp_screens += mp05/mp05-node2.scn
    7878mp_docs += mp05/mp05-node2.doc
    79 mp05_node2_SOURCES = mp05/init.c mp05/task1.c mp05/asr.c mp05/system.h
    80 mp05_node2_CPPFLAGS = -DNODE_NUMBER=2 $(AM_CPPFLAGS) $(TEST_FLAGS_mp05) \
     79mp05_node2_SOURCES = mp05/init2.c mp05/task1.c mp05/asr.c mp05/system.h
     80mp05_node2_CPPFLAGS = $(AM_CPPFLAGS) $(TEST_FLAGS_mp05) \
    8181        $(support_includes)
    8282endif
     
    8888mp_screens += mp06/mp06-node1.scn
    8989mp_docs += mp06/mp06-node1.doc
    90 mp06_node1_SOURCES = mp06/init.c mp06/task1.c mp06/system.h
    91 mp06_node1_CPPFLAGS = -DNODE_NUMBER=1 $(AM_CPPFLAGS) $(TEST_FLAGS_mp06) \
     90mp06_node1_SOURCES = mp06/init1.c mp06/task1.c mp06/system.h
     91mp06_node1_CPPFLAGS = $(AM_CPPFLAGS) $(TEST_FLAGS_mp06) \
    9292        $(support_includes)
    9393mp_tests += mp06_node2
    9494mp_screens += mp06/mp06-node2.scn
    9595mp_docs += mp06/mp06-node2.doc
    96 mp06_node2_SOURCES = mp06/init.c mp06/task1.c mp06/system.h
    97 mp06_node2_CPPFLAGS = -DNODE_NUMBER=2 $(AM_CPPFLAGS) $(TEST_FLAGS_mp06) \
     96mp06_node2_SOURCES = mp06/init2.c mp06/task1.c mp06/system.h
     97mp06_node2_CPPFLAGS = $(AM_CPPFLAGS) $(TEST_FLAGS_mp06) \
    9898        $(support_includes)
    9999endif
     
    105105mp_screens += mp07/mp07-node1.scn
    106106mp_docs += mp07/mp07-node1.doc
    107 mp07_node1_SOURCES = mp07/init.c mp07/task1.c mp07/system.h
    108 mp07_node1_CPPFLAGS = -DNODE_NUMBER=1 $(AM_CPPFLAGS) $(TEST_FLAGS_mp07) \
     107mp07_node1_SOURCES = mp07/init1.c mp07/task1.c mp07/system.h
     108mp07_node1_CPPFLAGS = $(AM_CPPFLAGS) $(TEST_FLAGS_mp07) \
    109109        $(support_includes)
    110110mp_tests += mp07_node2
    111111mp_screens += mp07/mp07-node2.scn
    112112mp_docs += mp07/mp07-node2.doc
    113 mp07_node2_SOURCES = mp07/init.c mp07/task1.c mp07/system.h
    114 mp07_node2_CPPFLAGS = -DNODE_NUMBER=2 $(AM_CPPFLAGS) $(TEST_FLAGS_mp07) \
     113mp07_node2_SOURCES = mp07/init2.c mp07/task1.c mp07/system.h
     114mp07_node2_CPPFLAGS = $(AM_CPPFLAGS) $(TEST_FLAGS_mp07) \
    115115        $(support_includes)
    116116endif
     
    122122mp_screens += mp08/mp08-node1.scn
    123123mp_docs += mp08/mp08-node1.doc
    124 mp08_node1_SOURCES = mp08/init.c mp08/task1.c mp08/system.h
    125 mp08_node1_CPPFLAGS = -DNODE_NUMBER=1 $(AM_CPPFLAGS) $(TEST_FLAGS_mp08) \
     124mp08_node1_SOURCES = mp08/init1.c mp08/task1.c mp08/system.h
     125mp08_node1_CPPFLAGS = $(AM_CPPFLAGS) $(TEST_FLAGS_mp08) \
    126126        $(support_includes)
    127127mp_tests += mp08_node2
    128128mp_screens += mp08/mp08-node2.scn
    129129mp_docs += mp08/mp08-node2.doc
    130 mp08_node2_SOURCES = mp08/init.c mp08/task1.c mp08/system.h
    131 mp08_node2_CPPFLAGS = -DNODE_NUMBER=2 $(AM_CPPFLAGS) $(TEST_FLAGS_mp08) \
     130mp08_node2_SOURCES = mp08/init2.c mp08/task1.c mp08/system.h
     131mp08_node2_CPPFLAGS = $(AM_CPPFLAGS) $(TEST_FLAGS_mp08) \
    132132        $(support_includes)
    133133endif
     
    139139mp_screens += mp09/mp09-node1.scn
    140140mp_docs += mp09/mp09-node1.doc
    141 mp09_node1_SOURCES = mp09/init.c mp09/task1.c mp09/recvmsg.c \
     141mp09_node1_SOURCES = mp09/init1.c mp09/task1.c mp09/recvmsg.c \
    142142        mp09/sendmsg.c mp09/system.h
    143 mp09_node1_CPPFLAGS = -DNODE_NUMBER=1 $(AM_CPPFLAGS) $(TEST_FLAGS_mp09) \
     143mp09_node1_CPPFLAGS = $(AM_CPPFLAGS) $(TEST_FLAGS_mp09) \
    144144        $(support_includes)
    145145mp_tests += mp09_node2
    146146mp_screens += mp09/mp09-node2.scn
    147147mp_docs += mp09/mp09-node2.doc
    148 mp09_node2_SOURCES = mp09/init.c mp09/task1.c mp09/recvmsg.c \
     148mp09_node2_SOURCES = mp09/init2.c mp09/task1.c mp09/recvmsg.c \
    149149        mp09/sendmsg.c mp09/system.h
    150 mp09_node2_CPPFLAGS = -DNODE_NUMBER=2 $(AM_CPPFLAGS) $(TEST_FLAGS_mp09) \
     150mp09_node2_CPPFLAGS = $(AM_CPPFLAGS) $(TEST_FLAGS_mp09) \
    151151        $(support_includes)
    152152endif
     
    158158mp_screens += mp10/mp10-node1.scn
    159159mp_docs += mp10/mp10-node1.doc
    160 mp10_node1_SOURCES = mp10/init.c mp10/task1.c mp10/task2.c mp10/task3.c \
     160mp10_node1_SOURCES = mp10/init1.c mp10/task1.c mp10/task2.c mp10/task3.c \
    161161        mp10/system.h
    162 mp10_node1_CPPFLAGS = -DNODE_NUMBER=1 $(AM_CPPFLAGS) $(TEST_FLAGS_mp10) \
     162mp10_node1_CPPFLAGS = $(AM_CPPFLAGS) $(TEST_FLAGS_mp10) \
    163163        $(support_includes)
    164164mp_tests += mp10_node2
    165165mp_screens += mp10/mp10-node2.scn
    166166mp_docs += mp10/mp10-node2.doc
    167 mp10_node2_SOURCES = mp10/init.c mp10/task1.c mp10/task2.c mp10/task3.c \
     167mp10_node2_SOURCES = mp10/init2.c mp10/task1.c mp10/task2.c mp10/task3.c \
    168168        mp10/system.h
    169 mp10_node2_CPPFLAGS = -DNODE_NUMBER=2 $(AM_CPPFLAGS) $(TEST_FLAGS_mp10) \
     169mp10_node2_CPPFLAGS = $(AM_CPPFLAGS) $(TEST_FLAGS_mp10) \
    170170        $(support_includes)
    171171endif
     
    177177mp_screens += mp11/mp11-node1.scn
    178178mp_docs += mp11/mp11-node1.doc
    179 mp11_node1_SOURCES = mp11/init.c mp11/system.h
    180 mp11_node1_CPPFLAGS = -DNODE_NUMBER=1 $(AM_CPPFLAGS) $(TEST_FLAGS_mp11) \
     179mp11_node1_SOURCES = mp11/init1.c mp11/system.h
     180mp11_node1_CPPFLAGS = $(AM_CPPFLAGS) $(TEST_FLAGS_mp11) \
    181181        $(support_includes)
    182182mp_tests += mp11_node2
    183183mp_screens += mp11/mp11-node2.scn
    184184mp_docs += mp11/mp11-node2.doc
    185 mp11_node2_SOURCES = mp11/init.c mp11/system.h
    186 mp11_node2_CPPFLAGS = -DNODE_NUMBER=2 $(AM_CPPFLAGS) $(TEST_FLAGS_mp11) \
     185mp11_node2_SOURCES = mp11/init2.c mp11/system.h
     186mp11_node2_CPPFLAGS = $(AM_CPPFLAGS) $(TEST_FLAGS_mp11) \
    187187        $(support_includes)
    188188endif
     
    194194mp_screens += mp12/mp12-node1.scn
    195195mp_docs += mp12/mp12-node1.doc
    196 mp12_node1_SOURCES = mp12/init.c mp12/system.h
    197 mp12_node1_CPPFLAGS = -DNODE_NUMBER=1 $(AM_CPPFLAGS) $(TEST_FLAGS_mp12) \
     196mp12_node1_SOURCES = mp12/init1.c mp12/system.h
     197mp12_node1_CPPFLAGS = $(AM_CPPFLAGS) $(TEST_FLAGS_mp12) \
    198198        $(support_includes)
    199199mp_tests += mp12_node2
    200200mp_screens += mp12/mp12-node2.scn
    201201mp_docs += mp12/mp12-node2.doc
    202 mp12_node2_SOURCES = mp12/init.c mp12/system.h
    203 mp12_node2_CPPFLAGS = -DNODE_NUMBER=2 $(AM_CPPFLAGS) $(TEST_FLAGS_mp12) \
     202mp12_node2_SOURCES = mp12/init2.c mp12/system.h
     203mp12_node2_CPPFLAGS = $(AM_CPPFLAGS) $(TEST_FLAGS_mp12) \
    204204        $(support_includes)
    205205endif
     
    211211mp_screens += mp13/mp13-node1.scn
    212212mp_docs += mp13/mp13-node1.doc
    213 mp13_node1_SOURCES = mp13/init.c mp13/task1.c mp13/task2.c mp13/system.h
    214 mp13_node1_CPPFLAGS = -DNODE_NUMBER=1 $(AM_CPPFLAGS) $(TEST_FLAGS_mp13) \
     213mp13_node1_SOURCES = mp13/init1.c mp13/task1.c mp13/task2.c mp13/system.h
     214mp13_node1_CPPFLAGS = $(AM_CPPFLAGS) $(TEST_FLAGS_mp13) \
    215215        $(support_includes)
    216216mp_tests += mp13_node2
    217217mp_screens += mp13/mp13-node2.scn
    218218mp_docs += mp13/mp13-node2.doc
    219 mp13_node2_SOURCES = mp13/init.c mp13/task1.c mp13/task2.c mp13/system.h
    220 mp13_node2_CPPFLAGS = -DNODE_NUMBER=2 $(AM_CPPFLAGS) $(TEST_FLAGS_mp13) \
     219mp13_node2_SOURCES = mp13/init2.c mp13/task1.c mp13/task2.c mp13/system.h
     220mp13_node2_CPPFLAGS = $(AM_CPPFLAGS) $(TEST_FLAGS_mp13) \
    221221        $(support_includes)
    222222endif
     
    228228mp_screens += mp14/mp14-node1.scn
    229229mp_docs += mp14/mp14-node1.doc
    230 mp14_node1_SOURCES = mp14/init.c mp14/exit.c mp14/delay.c \
     230mp14_node1_SOURCES = mp14/init1.c mp14/exit.c mp14/delay.c \
    231231        mp14/evtask1.c mp14/evtmtask.c mp14/pttask1.c mp14/smtask1.c \
    232232        mp14/msgtask1.c mp14/system.h
    233 mp14_node1_CPPFLAGS = -DNODE_NUMBER=1 $(AM_CPPFLAGS) $(TEST_FLAGS_mp14) \
     233mp14_node1_CPPFLAGS = $(AM_CPPFLAGS) $(TEST_FLAGS_mp14) \
    234234        $(support_includes)
    235235mp_tests += mp14_node2
    236236mp_screens += mp14/mp14-node2.scn
    237237mp_docs += mp14/mp14-node2.doc
    238 mp14_node2_SOURCES = mp14/init.c mp14/exit.c mp14/delay.c \
     238mp14_node2_SOURCES = mp14/init2.c mp14/exit.c mp14/delay.c \
    239239        mp14/evtask1.c mp14/evtmtask.c mp14/pttask1.c mp14/smtask1.c \
    240240        mp14/msgtask1.c mp14/system.h
    241 mp14_node2_CPPFLAGS = -DNODE_NUMBER=2 $(AM_CPPFLAGS) $(TEST_FLAGS_mp14) \
     241mp14_node2_CPPFLAGS = $(AM_CPPFLAGS) $(TEST_FLAGS_mp14) \
    242242        $(support_includes)
    243243endif
Note: See TracChangeset for help on using the changeset viewer.