diff options
author | Ralf Corsepius <ralf.corsepius@rtems.org> | 2005-11-11 09:12:26 +0000 |
---|---|---|
committer | Ralf Corsepius <ralf.corsepius@rtems.org> | 2005-11-11 09:12:26 +0000 |
commit | fcc85d2deeec61e3edb70c4e4187512f79981881 (patch) | |
tree | 49e2229ec0b10292617d80372cd530d3396278a9 /testsuites/mptests/mp14 | |
parent | Fix typo in previous patch. (diff) | |
download | rtems-fcc85d2deeec61e3edb70c4e4187512f79981881.tar.bz2 |
Hard-code node number.
Diffstat (limited to 'testsuites/mptests/mp14')
-rw-r--r-- | testsuites/mptests/mp14/node1/Makefile.am | 21 | ||||
-rw-r--r-- | testsuites/mptests/mp14/node2/Makefile.am | 21 |
2 files changed, 20 insertions, 22 deletions
diff --git a/testsuites/mptests/mp14/node1/Makefile.am b/testsuites/mptests/mp14/node1/Makefile.am index eb6904bc66..55cff477e9 100644 --- a/testsuites/mptests/mp14/node1/Makefile.am +++ b/testsuites/mptests/mp14/node1/Makefile.am @@ -2,8 +2,7 @@ ## $Id$ ## -NODE = 1 -PGM = $(ARCH)/mp14-node$(NODE).exe +PGM = $(ARCH)/mp14-node1.exe MANAGERS = io mp event partition semaphore timer message @@ -11,7 +10,7 @@ noinst_LIBRARIES = lib.a lib_a_SOURCES = ../exit.c ../init.c ../delay.c ../evtask1.c ../evtmtask.c \ ../pttask1.c ../smtask1.c ../msgtask1.c ../system.h -DOCS = mp14-node$(NODE).doc mp14-node$(NODE).scn +DOCS = mp14-node1.doc mp14-node1.scn OBJS = $(lib_a_OBJECTS) @@ -26,23 +25,23 @@ $(project_bspdir)/tests/$(dirstamp): @$(mkdir_p) $(project_bspdir)/tests @: > $(project_bspdir)/tests/$(dirstamp) -$(project_bspdir)/tests/mp14--node$(NODE).exe: $(PGM) $(project_bspdir)/tests/$(dirstamp) +$(project_bspdir)/tests/mp14--node1.exe: $(PGM) $(project_bspdir)/tests/$(dirstamp) $(INSTALL_PROGRAM) $< $@ -$(project_bspdir)/tests/screens/mptests/node$(NODE)/$(dirstamp): - @$(mkdir_p) $(project_bspdir)/tests/screens/mptests/node$(NODE) - @: > $(project_bspdir)/tests/screens/mptests/node$(NODE)/$(dirstamp) +$(project_bspdir)/tests/screens/mptests/node1/$(dirstamp): + @$(mkdir_p) $(project_bspdir)/tests/screens/mptests/node1 + @: > $(project_bspdir)/tests/screens/mptests/node1/$(dirstamp) -$(project_bspdir)/tests/screens/mptests/node$(NODE)/mp14-node$(NODE).scn: mp14-node$(NODE).scn $(project_bspdir)/tests/screens/mptests/node$(NODE)/$(dirstamp) +$(project_bspdir)/tests/screens/mptests/node1/mp14-node1.scn: mp14-node1.scn $(project_bspdir)/tests/screens/mptests/node1/$(dirstamp) $(INSTALL_DATA) $< $@ TMPINSTALL_FILES = \ -$(project_bspdir)/tests/mp14--node$(NODE).exe \ -$(project_bspdir)/tests/screens/mptests/node$(NODE)/mp14-node$(NODE).scn +$(project_bspdir)/tests/mp14--node1.exe \ +$(project_bspdir)/tests/screens/mptests/node1/mp14-node1.scn $(PGM): ${ARCH}/$(dirstamp) -AM_CPPFLAGS += -DNODE_NUMBER=$(NODE) -I$(srcdir)/.. +AM_CPPFLAGS += -DNODE_NUMBER=1 -I$(srcdir)/.. AM_CPPFLAGS += -DMAX_LONG_TEST_DURATION=$(MAX_LONG_TEST_DURATION) if HAS_MP diff --git a/testsuites/mptests/mp14/node2/Makefile.am b/testsuites/mptests/mp14/node2/Makefile.am index 3fcabfb276..af933fad29 100644 --- a/testsuites/mptests/mp14/node2/Makefile.am +++ b/testsuites/mptests/mp14/node2/Makefile.am @@ -2,8 +2,7 @@ ## $Id$ ## -NODE = 2 -PGM = $(ARCH)/mp14-node$(NODE).exe +PGM = $(ARCH)/mp14-node2.exe MANAGERS = io mp event partition semaphore timer message @@ -11,7 +10,7 @@ noinst_LIBRARIES = lib.a lib_a_SOURCES = ../exit.c ../init.c ../delay.c ../evtask1.c ../evtmtask.c \ ../pttask1.c ../smtask1.c ../msgtask1.c ../system.h -DOCS = mp14-node$(NODE).doc mp14-node$(NODE).scn +DOCS = mp14-node2.doc mp14-node2.scn OBJS = $(lib_a_OBJECTS) @@ -26,23 +25,23 @@ $(project_bspdir)/tests/$(dirstamp): @$(mkdir_p) $(project_bspdir)/tests @: > $(project_bspdir)/tests/$(dirstamp) -$(project_bspdir)/tests/mp14--node$(NODE).exe: $(PGM) $(project_bspdir)/tests/$(dirstamp) +$(project_bspdir)/tests/mp14--node2.exe: $(PGM) $(project_bspdir)/tests/$(dirstamp) $(INSTALL_PROGRAM) $< $@ -$(project_bspdir)/tests/screens/mptests/node$(NODE)/$(dirstamp): - @$(mkdir_p) $(project_bspdir)/tests/screens/mptests/node$(NODE) - @: > $(project_bspdir)/tests/screens/mptests/node$(NODE)/$(dirstamp) +$(project_bspdir)/tests/screens/mptests/node2/$(dirstamp): + @$(mkdir_p) $(project_bspdir)/tests/screens/mptests/node2 + @: > $(project_bspdir)/tests/screens/mptests/node2/$(dirstamp) -$(project_bspdir)/tests/screens/mptests/node$(NODE)/mp14-node$(NODE).scn: mp14-node$(NODE).scn $(project_bspdir)/tests/screens/mptests/node$(NODE)/$(dirstamp) +$(project_bspdir)/tests/screens/mptests/node2/mp14-node2.scn: mp14-node2.scn $(project_bspdir)/tests/screens/mptests/node2/$(dirstamp) $(INSTALL_DATA) $< $@ TMPINSTALL_FILES = \ -$(project_bspdir)/tests/mp14--node$(NODE).exe \ -$(project_bspdir)/tests/screens/mptests/node$(NODE)/mp14-node$(NODE).scn +$(project_bspdir)/tests/mp14--node2.exe \ +$(project_bspdir)/tests/screens/mptests/node2/mp14-node2.scn $(PGM): ${ARCH}/$(dirstamp) -AM_CPPFLAGS += -DNODE_NUMBER=$(NODE) -I$(srcdir)/.. +AM_CPPFLAGS += -DNODE_NUMBER=2 -I$(srcdir)/.. AM_CPPFLAGS += -DMAX_LONG_TEST_DURATION=$(MAX_LONG_TEST_DURATION) if HAS_MP |