aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorYuji Mano <yuji.mano@am.sony.com>2009-03-30 16:15:08 -0700
committerYuji Mano <yuji.mano@am.sony.com>2009-03-30 16:15:08 -0700
commit40288bbf4ce58e892cc2d1ec3c872abb33f67fed (patch)
tree813c1e0a8cf301469dc22daaa429d9e23fed5662
parent71ab714a8b33bed0ad289e6c461deb6743059a0f (diff)
downloadmars-src-40288bbf4ce58e892cc2d1ec3c872abb33f67fed.tar.gz
tests: Update branch-1.1.2v1.1.2
Diffstat
-rw-r--r--tests/TPF/TPF_20_001/Makefile2
-rw-r--r--tests/TPF/TPF_20_002/Makefile2
-rw-r--r--tests/TPF/TPF_30_001/Makefile2
-rw-r--r--tests/TPF/TPF_30_002/Makefile4
-rw-r--r--tests/TPF/TPF_30_002/common.h2
-rw-r--r--tests/TPF/TPF_30_003/Makefile2
-rw-r--r--tests/TPF/TPF_30_004/Makefile2
-rw-r--r--tests/TPF/TPF_40_016/Makefile2
-rw-r--r--tests/TPF/TPF_40_017/Makefile2
-rw-r--r--tests/TPF/TPF_40_022/Makefile2
-rw-r--r--tests/TPF/TPF_40_022/common.h2
-rw-r--r--tests/TPF/TPF_40_023/Makefile2
-rw-r--r--tests/TPF/TPF_40_023/common.h2
-rw-r--r--tests/TPF/TPF_40_024/Makefile2
-rw-r--r--tests/TPF/TPF_40_024/common.h2
-rw-r--r--tests/TPF/TPF_40_025/Makefile2
-rw-r--r--tests/TPF/TPF_40_026/Makefile2
-rw-r--r--tests/TPF/TPF_50_002/Makefile2
-rw-r--r--tests/TPF/TPF_50_002/host.c6
-rw-r--r--tests/TPF/TPF_50_003/Makefile2
-rw-r--r--tests/TPF/TPF_50_004/Makefile2
-rw-r--r--tests/TPF/TPF_50_004/common.h2
-rw-r--r--tests/TPF/TPF_50_005/Makefile2
-rw-r--r--tests/TPF/TPF_60_002/Makefile2
-rw-r--r--tests/TPF/TPF_60_002/common.h2
-rw-r--r--tests/TPF/TPF_60_003/Makefile2
-rw-r--r--tests/TPF/TPF_60_003/common.h2
27 files changed, 30 insertions, 30 deletions
diff --git a/tests/TPF/TPF_20_001/Makefile b/tests/TPF/TPF_20_001/Makefile
index c8d78c3..f92da3b 100644
--- a/tests/TPF/TPF_20_001/Makefile
+++ b/tests/TPF/TPF_20_001/Makefile
@@ -27,7 +27,7 @@ MPU_INCLUDE_CFLAGS+= -I./
top_srcdir = ../..
test_objs = host.o mpu1.task_eo mpu2.task_eo mpu3.task_eo
-timeout = 120
+timeout = 240
include $(top_srcdir)/scripts/config.mk
include $(top_srcdir)/scripts/rules_item.mk
diff --git a/tests/TPF/TPF_20_002/Makefile b/tests/TPF/TPF_20_002/Makefile
index c8d78c3..f92da3b 100644
--- a/tests/TPF/TPF_20_002/Makefile
+++ b/tests/TPF/TPF_20_002/Makefile
@@ -27,7 +27,7 @@ MPU_INCLUDE_CFLAGS+= -I./
top_srcdir = ../..
test_objs = host.o mpu1.task_eo mpu2.task_eo mpu3.task_eo
-timeout = 120
+timeout = 240
include $(top_srcdir)/scripts/config.mk
include $(top_srcdir)/scripts/rules_item.mk
diff --git a/tests/TPF/TPF_30_001/Makefile b/tests/TPF/TPF_30_001/Makefile
index 0bad622..50d3be3 100644
--- a/tests/TPF/TPF_30_001/Makefile
+++ b/tests/TPF/TPF_30_001/Makefile
@@ -27,7 +27,7 @@ MPU_INCLUDE_CFLAGS+= -I./
top_srcdir = ../..
test_objs = host.o mpu1.task_eo
-timeout = 120
+timeout = 300
include $(top_srcdir)/scripts/config.mk
include $(top_srcdir)/scripts/rules_item.mk
diff --git a/tests/TPF/TPF_30_002/Makefile b/tests/TPF/TPF_30_002/Makefile
index 4a5a01a..09ac3d9 100644
--- a/tests/TPF/TPF_30_002/Makefile
+++ b/tests/TPF/TPF_30_002/Makefile
@@ -27,8 +27,8 @@ MPU_INCLUDE_CFLAGS+= -I./
top_srcdir = ../..
test_objs = host.o mpu1.task_eo
-timeout = 240
-
+timeout = 300
+
include $(top_srcdir)/scripts/config.mk
include $(top_srcdir)/scripts/rules_item.mk
include $(top_srcdir)/scripts/rules_tpf.mk
diff --git a/tests/TPF/TPF_30_002/common.h b/tests/TPF/TPF_30_002/common.h
index bbf4eac..ca11821 100644
--- a/tests/TPF/TPF_30_002/common.h
+++ b/tests/TPF/TPF_30_002/common.h
@@ -25,7 +25,7 @@
#include <mars_test.h>
#define MIN_MPUS spe+1
-#define MAX_MPUS spe*2
+#define MAX_MPUS spe+8
#define TEST1_ELEMENT_COUNT 4096
diff --git a/tests/TPF/TPF_30_003/Makefile b/tests/TPF/TPF_30_003/Makefile
index dc68b86..975edc1 100644
--- a/tests/TPF/TPF_30_003/Makefile
+++ b/tests/TPF/TPF_30_003/Makefile
@@ -27,7 +27,7 @@ MPU_INCLUDE_CFLAGS+= -I./
top_srcdir = ../..
test_objs = host.o mpu1.task_eo mpu2.task_eo
-timeout = 120
+timeout = 240
include $(top_srcdir)/scripts/config.mk
include $(top_srcdir)/scripts/rules_item.mk
diff --git a/tests/TPF/TPF_30_004/Makefile b/tests/TPF/TPF_30_004/Makefile
index dc68b86..975edc1 100644
--- a/tests/TPF/TPF_30_004/Makefile
+++ b/tests/TPF/TPF_30_004/Makefile
@@ -27,7 +27,7 @@ MPU_INCLUDE_CFLAGS+= -I./
top_srcdir = ../..
test_objs = host.o mpu1.task_eo mpu2.task_eo
-timeout = 120
+timeout = 240
include $(top_srcdir)/scripts/config.mk
include $(top_srcdir)/scripts/rules_item.mk
diff --git a/tests/TPF/TPF_40_016/Makefile b/tests/TPF/TPF_40_016/Makefile
index dc68b86..c7f5caa 100644
--- a/tests/TPF/TPF_40_016/Makefile
+++ b/tests/TPF/TPF_40_016/Makefile
@@ -27,7 +27,7 @@ MPU_INCLUDE_CFLAGS+= -I./
top_srcdir = ../..
test_objs = host.o mpu1.task_eo mpu2.task_eo
-timeout = 120
+timeout = 240
include $(top_srcdir)/scripts/config.mk
include $(top_srcdir)/scripts/rules_item.mk
diff --git a/tests/TPF/TPF_40_017/Makefile b/tests/TPF/TPF_40_017/Makefile
index dc68b86..c7f5caa 100644
--- a/tests/TPF/TPF_40_017/Makefile
+++ b/tests/TPF/TPF_40_017/Makefile
@@ -27,7 +27,7 @@ MPU_INCLUDE_CFLAGS+= -I./
top_srcdir = ../..
test_objs = host.o mpu1.task_eo mpu2.task_eo
-timeout = 120
+timeout = 240
include $(top_srcdir)/scripts/config.mk
include $(top_srcdir)/scripts/rules_item.mk
diff --git a/tests/TPF/TPF_40_022/Makefile b/tests/TPF/TPF_40_022/Makefile
index b590ac2..76f262e 100644
--- a/tests/TPF/TPF_40_022/Makefile
+++ b/tests/TPF/TPF_40_022/Makefile
@@ -27,7 +27,7 @@ MPU_INCLUDE_CFLAGS+= -I./
top_srcdir = ../..
test_objs = host.o mpu1.task_eo mpu2.task_eo mpu3.task_eo
-timeout = 120
+timeout = 120
include $(top_srcdir)/scripts/config.mk
include $(top_srcdir)/scripts/rules_item.mk
diff --git a/tests/TPF/TPF_40_022/common.h b/tests/TPF/TPF_40_022/common.h
index 20e47a7..d18bb22 100644
--- a/tests/TPF/TPF_40_022/common.h
+++ b/tests/TPF/TPF_40_022/common.h
@@ -30,7 +30,7 @@
#define TEST2_ELEMENT_COUNT 4096
#define TEST3_ELEMENT_COUNT 4096
-#define MAX_MPUS spe*2
+#define MAX_MPUS spe+8
#define ALIGN128 __attribute__((aligned(128)))
diff --git a/tests/TPF/TPF_40_023/Makefile b/tests/TPF/TPF_40_023/Makefile
index b590ac2..76f262e 100644
--- a/tests/TPF/TPF_40_023/Makefile
+++ b/tests/TPF/TPF_40_023/Makefile
@@ -27,7 +27,7 @@ MPU_INCLUDE_CFLAGS+= -I./
top_srcdir = ../..
test_objs = host.o mpu1.task_eo mpu2.task_eo mpu3.task_eo
-timeout = 120
+timeout = 120
include $(top_srcdir)/scripts/config.mk
include $(top_srcdir)/scripts/rules_item.mk
diff --git a/tests/TPF/TPF_40_023/common.h b/tests/TPF/TPF_40_023/common.h
index 20e47a7..d18bb22 100644
--- a/tests/TPF/TPF_40_023/common.h
+++ b/tests/TPF/TPF_40_023/common.h
@@ -30,7 +30,7 @@
#define TEST2_ELEMENT_COUNT 4096
#define TEST3_ELEMENT_COUNT 4096
-#define MAX_MPUS spe*2
+#define MAX_MPUS spe+8
#define ALIGN128 __attribute__((aligned(128)))
diff --git a/tests/TPF/TPF_40_024/Makefile b/tests/TPF/TPF_40_024/Makefile
index 52f5df8..526b3d2 100644
--- a/tests/TPF/TPF_40_024/Makefile
+++ b/tests/TPF/TPF_40_024/Makefile
@@ -27,7 +27,7 @@ MPU_INCLUDE_CFLAGS+= -I./
top_srcdir = ../..
test_objs = host.o mpu1.task_eo
-timeout = 120
+timeout = 120
include $(top_srcdir)/scripts/config.mk
include $(top_srcdir)/scripts/rules_item.mk
diff --git a/tests/TPF/TPF_40_024/common.h b/tests/TPF/TPF_40_024/common.h
index 20e47a7..d18bb22 100644
--- a/tests/TPF/TPF_40_024/common.h
+++ b/tests/TPF/TPF_40_024/common.h
@@ -30,7 +30,7 @@
#define TEST2_ELEMENT_COUNT 4096
#define TEST3_ELEMENT_COUNT 4096
-#define MAX_MPUS spe*2
+#define MAX_MPUS spe+8
#define ALIGN128 __attribute__((aligned(128)))
diff --git a/tests/TPF/TPF_40_025/Makefile b/tests/TPF/TPF_40_025/Makefile
index dc68b86..975edc1 100644
--- a/tests/TPF/TPF_40_025/Makefile
+++ b/tests/TPF/TPF_40_025/Makefile
@@ -27,7 +27,7 @@ MPU_INCLUDE_CFLAGS+= -I./
top_srcdir = ../..
test_objs = host.o mpu1.task_eo mpu2.task_eo
-timeout = 120
+timeout = 240
include $(top_srcdir)/scripts/config.mk
include $(top_srcdir)/scripts/rules_item.mk
diff --git a/tests/TPF/TPF_40_026/Makefile b/tests/TPF/TPF_40_026/Makefile
index dc68b86..975edc1 100644
--- a/tests/TPF/TPF_40_026/Makefile
+++ b/tests/TPF/TPF_40_026/Makefile
@@ -27,7 +27,7 @@ MPU_INCLUDE_CFLAGS+= -I./
top_srcdir = ../..
test_objs = host.o mpu1.task_eo mpu2.task_eo
-timeout = 120
+timeout = 240
include $(top_srcdir)/scripts/config.mk
include $(top_srcdir)/scripts/rules_item.mk
diff --git a/tests/TPF/TPF_50_002/Makefile b/tests/TPF/TPF_50_002/Makefile
index dc68b86..975edc1 100644
--- a/tests/TPF/TPF_50_002/Makefile
+++ b/tests/TPF/TPF_50_002/Makefile
@@ -27,7 +27,7 @@ MPU_INCLUDE_CFLAGS+= -I./
top_srcdir = ../..
test_objs = host.o mpu1.task_eo mpu2.task_eo
-timeout = 120
+timeout = 240
include $(top_srcdir)/scripts/config.mk
include $(top_srcdir)/scripts/rules_item.mk
diff --git a/tests/TPF/TPF_50_002/host.c b/tests/TPF/TPF_50_002/host.c
index 749187a..9d9db5e 100644
--- a/tests/TPF/TPF_50_002/host.c
+++ b/tests/TPF/TPF_50_002/host.c
@@ -139,7 +139,7 @@ void test1(int mpu, pthread_t * threads, struct thread_arg_st *thread_args)
MARS_TEST_ASSERT_ERROR(ret, MARS_SUCCESS);
size = TEST1_ELEMENT_COUNT * mpu;
- sprintf(text,"single semaphore: acquire (%d mpu paris)",mpu);
+ sprintf(text,"single semaphore: acquire (%d mpu pairs)",mpu);
mars_test_print_statistics(acquire_ticks, size, text);
sprintf(text,"single semaphore: release (%d mpu pairs)",mpu);
mars_test_print_statistics(release_ticks, size, text);
@@ -186,9 +186,9 @@ void test2(int mpu, pthread_t * threads, struct thread_arg_st *thread_args)
MARS_TEST_ASSERT_ERROR(ret, MARS_SUCCESS);
size = TEST1_ELEMENT_COUNT * mpu;
- sprintf(text,"semaphore max_wait: acquire (%d mpu paris)",mpu);
+ sprintf(text,"semaphore max_wait: acquire (%d mpu pairs)",mpu);
mars_test_print_statistics(acquire_ticks, size, text);
- sprintf(text,"semaphore max_wait: release (%d mpu paris)",mpu);
+ sprintf(text,"semaphore max_wait: release (%d mpu pairs)",mpu);
mars_test_print_statistics(release_ticks, size, text);
free(acquire_ticks);
diff --git a/tests/TPF/TPF_50_003/Makefile b/tests/TPF/TPF_50_003/Makefile
index dc68b86..975edc1 100644
--- a/tests/TPF/TPF_50_003/Makefile
+++ b/tests/TPF/TPF_50_003/Makefile
@@ -27,7 +27,7 @@ MPU_INCLUDE_CFLAGS+= -I./
top_srcdir = ../..
test_objs = host.o mpu1.task_eo mpu2.task_eo
-timeout = 120
+timeout = 240
include $(top_srcdir)/scripts/config.mk
include $(top_srcdir)/scripts/rules_item.mk
diff --git a/tests/TPF/TPF_50_004/Makefile b/tests/TPF/TPF_50_004/Makefile
index dc68b86..bd4dc7a 100644
--- a/tests/TPF/TPF_50_004/Makefile
+++ b/tests/TPF/TPF_50_004/Makefile
@@ -27,7 +27,7 @@ MPU_INCLUDE_CFLAGS+= -I./
top_srcdir = ../..
test_objs = host.o mpu1.task_eo mpu2.task_eo
-timeout = 120
+timeout = 300
include $(top_srcdir)/scripts/config.mk
include $(top_srcdir)/scripts/rules_item.mk
diff --git a/tests/TPF/TPF_50_004/common.h b/tests/TPF/TPF_50_004/common.h
index 367f59c..bb74bb6 100644
--- a/tests/TPF/TPF_50_004/common.h
+++ b/tests/TPF/TPF_50_004/common.h
@@ -24,7 +24,7 @@
#include <mars/task.h>
#include <mars_test.h>
-#define MIN_MPUS 1
+#define MIN_MPUS spe+1
#define MAX_MPUS spe/2
#define QUEUE_DEPTH 16
diff --git a/tests/TPF/TPF_50_005/Makefile b/tests/TPF/TPF_50_005/Makefile
index dc68b86..b60ef73 100644
--- a/tests/TPF/TPF_50_005/Makefile
+++ b/tests/TPF/TPF_50_005/Makefile
@@ -27,7 +27,7 @@ MPU_INCLUDE_CFLAGS+= -I./
top_srcdir = ../..
test_objs = host.o mpu1.task_eo mpu2.task_eo
-timeout = 120
+timeout = 360
include $(top_srcdir)/scripts/config.mk
include $(top_srcdir)/scripts/rules_item.mk
diff --git a/tests/TPF/TPF_60_002/Makefile b/tests/TPF/TPF_60_002/Makefile
index 0bad622..50d3be3 100644
--- a/tests/TPF/TPF_60_002/Makefile
+++ b/tests/TPF/TPF_60_002/Makefile
@@ -27,7 +27,7 @@ MPU_INCLUDE_CFLAGS+= -I./
top_srcdir = ../..
test_objs = host.o mpu1.task_eo
-timeout = 120
+timeout = 300
include $(top_srcdir)/scripts/config.mk
include $(top_srcdir)/scripts/rules_item.mk
diff --git a/tests/TPF/TPF_60_002/common.h b/tests/TPF/TPF_60_002/common.h
index 16eb1c3..eee4f79 100644
--- a/tests/TPF/TPF_60_002/common.h
+++ b/tests/TPF/TPF_60_002/common.h
@@ -24,7 +24,7 @@
#include <mars/task.h>
#include <mars_test.h>
-#define MIN_MPUS 2
+#define MIN_MPUS spe//2
#define MAX_MPUS spe
#define TEST1_ELEMENT_COUNT 4096
diff --git a/tests/TPF/TPF_60_003/Makefile b/tests/TPF/TPF_60_003/Makefile
index 0bad622..4a5a01a 100644
--- a/tests/TPF/TPF_60_003/Makefile
+++ b/tests/TPF/TPF_60_003/Makefile
@@ -27,7 +27,7 @@ MPU_INCLUDE_CFLAGS+= -I./
top_srcdir = ../..
test_objs = host.o mpu1.task_eo
-timeout = 120
+timeout = 240
include $(top_srcdir)/scripts/config.mk
include $(top_srcdir)/scripts/rules_item.mk
diff --git a/tests/TPF/TPF_60_003/common.h b/tests/TPF/TPF_60_003/common.h
index d657bc2..737970a 100644
--- a/tests/TPF/TPF_60_003/common.h
+++ b/tests/TPF/TPF_60_003/common.h
@@ -25,7 +25,7 @@
#include <mars_test.h>
#define MIN_MPUS spe+1
-#define MAX_MPUS spe*2
+#define MAX_MPUS spe+8
#define TEST1_ELEMENT_COUNT 4096
generated by cgit 1.2.3-korg (git 2.39.0) at 2024-05-17 09:48:53 +0000