diff options
| author | Yuji Mano <yuji.mano@am.sony.com> | 2009-06-15 17:10:30 -0700 |
|---|---|---|
| committer | Yuji Mano <yuji.mano@am.sony.com> | 2009-06-15 17:10:30 -0700 |
| commit | 272470d151ec2d4e9bca5fc76314111f46add4ad (patch) | |
| tree | b76dc3a48d91873d2e4f407c5a50b225c8c24bd2 | |
| parent | fa118c9872cc836e39d12a77993f35b5e6878696 (diff) | |
| download | mars-src-272470d151ec2d4e9bca5fc76314111f46add4ad.tar.gz | |
tests: TPI fixes
| -rw-r--r-- | tests/TPI/TPI_10_001/Makefile | 5 | ||||
| -rw-r--r-- | tests/TPI/TPI_10_002/Makefile | 13 | ||||
| -rw-r--r-- | tests/TPI/TPI_10_002/mpu1.c | 1 | ||||
| -rw-r--r-- | tests/TPI/TPI_10_003/Makefile | 5 | ||||
| -rw-r--r-- | tests/TPI/TPI_10_004/Makefile | 14 | ||||
| -rw-r--r-- | tests/TPI/TPI_10_004/mpu1.c | 1 | ||||
| -rw-r--r-- | tests/TPI/TPI_10_004/mpu2.c | 1 | ||||
| -rw-r--r-- | tests/TPI/TPI_10_005/Makefile | 9 |
8 files changed, 19 insertions, 30 deletions
diff --git a/tests/TPI/TPI_10_001/Makefile b/tests/TPI/TPI_10_001/Makefile index 669d1c3..88a7258 100644 --- a/tests/TPI/TPI_10_001/Makefile +++ b/tests/TPI/TPI_10_001/Makefile @@ -25,9 +25,6 @@ EXTRA_LDFLAGS=-lm top_srcdir = ../.. test_objs = host.o -timeout = 120 -include $(top_srcdir)/scripts/config.mk +include $(top_srcdir)/scripts/config_internal.mk include $(top_srcdir)/scripts/rules_item.mk - -host.o: diff --git a/tests/TPI/TPI_10_002/Makefile b/tests/TPI/TPI_10_002/Makefile index f8f4351..2e2fb2c 100644 --- a/tests/TPI/TPI_10_002/Makefile +++ b/tests/TPI/TPI_10_002/Makefile @@ -21,12 +21,13 @@ # THE SOFTWARE. # -EXTRA_LDFLAGS=-lm -EXTRA_MPU_LDFLAGS+=$(MARS_BUILD)/base/src/mpu/kernel/mutex.o -MPU_INCLUDE_CFLAGS+= -I$(MARS_BUILD)/base/include/host/ -MPU_INCLUDE_CFLAGS+= -I$(MARS_BUILD)/base/src/common/ +EXTRA_LDFLAGS=-lm + top_srcdir = ../.. -test_objs = host.o mpu1.task_eo +test_objs = host.o mpu1.task_eo -include $(top_srcdir)/scripts/config.mk +include $(top_srcdir)/scripts/config_internal.mk include $(top_srcdir)/scripts/rules_item.mk + +mpu1.task: $(MARS_BUILD)/base/src/mpu/kernel/mutex.mpu_o +EXTRA_MPU_LDFLAGS+=$(MARS_BUILD)/base/src/mpu/kernel/mutex.mpu_o diff --git a/tests/TPI/TPI_10_002/mpu1.c b/tests/TPI/TPI_10_002/mpu1.c index b39f766..ee8ba68 100644 --- a/tests/TPI/TPI_10_002/mpu1.c +++ b/tests/TPI/TPI_10_002/mpu1.c @@ -23,7 +23,6 @@ #include <mars_test.h> #include <mars/task.h> -#include <mars/mutex.h> #include <kernel_internal_types.h> #include "common.h" diff --git a/tests/TPI/TPI_10_003/Makefile b/tests/TPI/TPI_10_003/Makefile index 669d1c3..88a7258 100644 --- a/tests/TPI/TPI_10_003/Makefile +++ b/tests/TPI/TPI_10_003/Makefile @@ -25,9 +25,6 @@ EXTRA_LDFLAGS=-lm top_srcdir = ../.. test_objs = host.o -timeout = 120 -include $(top_srcdir)/scripts/config.mk +include $(top_srcdir)/scripts/config_internal.mk include $(top_srcdir)/scripts/rules_item.mk - -host.o: diff --git a/tests/TPI/TPI_10_004/Makefile b/tests/TPI/TPI_10_004/Makefile index f4ae4d7..d7304f8 100644 --- a/tests/TPI/TPI_10_004/Makefile +++ b/tests/TPI/TPI_10_004/Makefile @@ -20,14 +20,14 @@ # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN # THE SOFTWARE. # -EXTRA_LDFLAGS=-lm -EXTRA_MPU_LDFLAGS+=$(MARS_BUILD)/base/src/mpu/kernel/mutex.o -MPU_INCLUDE_CFLAGS+= -I$(MARS_BUILD)/base/src/common/ -MPU_INCLUDE_CFLAGS+= -I$(MARS_BUILD)/base/include/host/ -top_srcdir = ../.. -test_objs = host.o mpu1.task_eo mpu2.task_eo +EXTRA_LDFLAGS=-lm +top_srcdir = ../.. +test_objs = host.o mpu1.task_eo mpu2.task_eo -include $(top_srcdir)/scripts/config.mk +include $(top_srcdir)/scripts/config_internal.mk include $(top_srcdir)/scripts/rules_item.mk + +mpu1.task: $(MARS_BUILD)/base/src/mpu/kernel/mutex.mpu_o +EXTRA_MPU_LDFLAGS+=$(MARS_BUILD)/base/src/mpu/kernel/mutex.mpu_o diff --git a/tests/TPI/TPI_10_004/mpu1.c b/tests/TPI/TPI_10_004/mpu1.c index 01e6ec4..5979590 100644 --- a/tests/TPI/TPI_10_004/mpu1.c +++ b/tests/TPI/TPI_10_004/mpu1.c @@ -23,7 +23,6 @@ #include <mars_test.h> #include <mars/task.h> -#include <mars/mutex.h> #include <kernel_internal_types.h> #include "common.h" #include <unistd.h> diff --git a/tests/TPI/TPI_10_004/mpu2.c b/tests/TPI/TPI_10_004/mpu2.c index 994942f..5ef40fe 100644 --- a/tests/TPI/TPI_10_004/mpu2.c +++ b/tests/TPI/TPI_10_004/mpu2.c @@ -23,7 +23,6 @@ #include <mars_test.h> #include <mars/task.h> -#include <mars/mutex.h> #include <kernel_internal_types.h> #include "common.h" diff --git a/tests/TPI/TPI_10_005/Makefile b/tests/TPI/TPI_10_005/Makefile index 1eb0be8..2e2fb2c 100644 --- a/tests/TPI/TPI_10_005/Makefile +++ b/tests/TPI/TPI_10_005/Makefile @@ -22,15 +22,12 @@ # EXTRA_LDFLAGS=-lm -EXTRA_MPU_LDFLAGS+=$(MARS_BUILD)/base/src/mpu/kernel/mutex.o -MPU_INCLUDE_CFLAGS+= -I$(MARS_BUILD)/base/src/common/ top_srcdir = ../.. test_objs = host.o mpu1.task_eo -timeout = 120 -include $(top_srcdir)/scripts/config.mk +include $(top_srcdir)/scripts/config_internal.mk include $(top_srcdir)/scripts/rules_item.mk -host.o: common.h -mpu1.task_o: common.h +mpu1.task: $(MARS_BUILD)/base/src/mpu/kernel/mutex.mpu_o +EXTRA_MPU_LDFLAGS+=$(MARS_BUILD)/base/src/mpu/kernel/mutex.mpu_o |