diff options
author | Jiajun Xu <jiajun.xu@intel.com> | 2012-05-24 17:08:36 +0800 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2012-05-25 11:17:55 +0100 |
commit | cfc882e2db717296b175f23e18fad92551647f83 (patch) | |
tree | 663a11d7a0c1dc0ae38b7568b9eb5c62f15cab6f /meta | |
parent | ed14592700054418c4d502def30453ef625e0f74 (diff) | |
download | poky-cfc882e2db717296b175f23e18fad92551647f83.tar.gz |
ltp: Upgrade LTP to version 20120401
(From OE-Core rev: bbb9f831dbfcedf799021f2b0a1dd7aef3c0f928)
Signed-off-by: Jiajun Xu <jiajun.xu@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta')
-rw-r--r-- | meta/recipes-extended/ltp/ltp/uclibc-getcontext.patch | 78 | ||||
-rw-r--r-- | meta/recipes-extended/ltp/ltp_20120401.bb (renamed from meta/recipes-extended/ltp/ltp_20120104.bb) | 7 |
2 files changed, 3 insertions, 82 deletions
diff --git a/meta/recipes-extended/ltp/ltp/uclibc-getcontext.patch b/meta/recipes-extended/ltp/ltp/uclibc-getcontext.patch deleted file mode 100644 index 310e2d4fa6..0000000000 --- a/meta/recipes-extended/ltp/ltp/uclibc-getcontext.patch +++ /dev/null | |||
@@ -1,78 +0,0 @@ | |||
1 | Fix building disabled getcontext and profil01 tests for uclibc | ||
2 | |||
3 | Signed-off-by: Khem Raj <raj.khem@gmail.com> | ||
4 | |||
5 | Upstream-Status: Pending | ||
6 | |||
7 | Index: ltp-20110915/testcases/kernel/syscalls/getcontext/getcontext01.c | ||
8 | =================================================================== | ||
9 | --- ltp-20110915.orig/testcases/kernel/syscalls/getcontext/getcontext01.c 2012-01-19 16:39:24.391012507 -0800 | ||
10 | +++ ltp-20110915/testcases/kernel/syscalls/getcontext/getcontext01.c 2012-01-19 16:39:24.459012510 -0800 | ||
11 | @@ -34,6 +34,10 @@ | ||
12 | **********************************************************/ | ||
13 | |||
14 | #include <features.h> | ||
15 | +#include "test.h" | ||
16 | +#include "usctest.h" | ||
17 | +char *TCID = "getcontext01"; /* Test program identifier. */ | ||
18 | + | ||
19 | #if !defined(__UCLIBC__) | ||
20 | |||
21 | #include <stdio.h> | ||
22 | @@ -41,13 +45,9 @@ | ||
23 | #include <errno.h> | ||
24 | #include <ucontext.h> | ||
25 | |||
26 | -#include "test.h" | ||
27 | -#include "usctest.h" | ||
28 | - | ||
29 | void setup(); | ||
30 | void cleanup(); | ||
31 | |||
32 | -char *TCID = "getcontext01"; /* Test program identifier. */ | ||
33 | int TST_TOTAL = 1; /* Total number of test cases. */ | ||
34 | |||
35 | int exp_enos[] = { 0 }; /* must be a 0 terminated list */ | ||
36 | @@ -102,4 +102,4 @@ | ||
37 | { | ||
38 | tst_brkm(TCONF, NULL, "system doesn't have getcontext support"); | ||
39 | } | ||
40 | -#endif | ||
41 | \ No newline at end of file | ||
42 | +#endif | ||
43 | Index: ltp-20110915/testcases/kernel/syscalls/profil/profil01.c | ||
44 | =================================================================== | ||
45 | --- ltp-20110915.orig/testcases/kernel/syscalls/profil/profil01.c 2012-01-19 16:39:55.975014036 -0800 | ||
46 | +++ ltp-20110915/testcases/kernel/syscalls/profil/profil01.c 2012-01-19 16:40:23.475015322 -0800 | ||
47 | @@ -41,6 +41,8 @@ | ||
48 | #endif | ||
49 | |||
50 | #include <features.h> | ||
51 | +#include "test.h" | ||
52 | +char *TCID = "profil01"; | ||
53 | #ifndef __UCLIBC__ | ||
54 | |||
55 | #ifdef __arm__ | ||
56 | @@ -58,7 +60,6 @@ | ||
57 | #include <errno.h> | ||
58 | #include <sys/types.h> | ||
59 | #include <sys/wait.h> | ||
60 | -#include "test.h" | ||
61 | #include "usctest.h" | ||
62 | #define FAILED 0 | ||
63 | #define PASSED 1 | ||
64 | @@ -73,7 +74,6 @@ | ||
65 | //char progname[]= "profil1()"; | ||
66 | |||
67 | /***** LTP Port *****/ | ||
68 | -char *TCID = "profil01"; | ||
69 | int local_flag = PASSED; | ||
70 | int block_number; | ||
71 | FILE *temp; | ||
72 | @@ -310,4 +310,4 @@ | ||
73 | /* uClibc does not have profiling support */ | ||
74 | tst_exit(); | ||
75 | } | ||
76 | -#endif | ||
77 | \ No newline at end of file | ||
78 | +#endif | ||
diff --git a/meta/recipes-extended/ltp/ltp_20120104.bb b/meta/recipes-extended/ltp/ltp_20120401.bb index c82203a764..821d9e4bbb 100644 --- a/meta/recipes-extended/ltp/ltp_20120104.bb +++ b/meta/recipes-extended/ltp/ltp_20120401.bb | |||
@@ -19,14 +19,13 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=0636e73ff0215e8d672dc4c32c317bb3 \ | |||
19 | file://utils/benchmark/kernbench-0.42/COPYING;md5=94d55d512a9ba36caa9b7df079bae19f \ | 19 | file://utils/benchmark/kernbench-0.42/COPYING;md5=94d55d512a9ba36caa9b7df079bae19f \ |
20 | " | 20 | " |
21 | 21 | ||
22 | PR = "r1" | 22 | PR = "r2" |
23 | 23 | ||
24 | SRC_URI = "${SOURCEFORGE_MIRROR}/ltp/ltp-full-${PV}.bz2 \ | 24 | SRC_URI = "${SOURCEFORGE_MIRROR}/ltp/ltp-full-${PV}.bz2 \ |
25 | file://uclibc-getcontext.patch \ | ||
26 | " | 25 | " |
27 | 26 | ||
28 | SRC_URI[md5sum] = "ac183bbdac67139f049b3755fda37179" | 27 | SRC_URI[md5sum] = "e1d0acf1a6b6da0cb30dc1b0dcf5f26d" |
29 | SRC_URI[sha256sum] = "11b149b821d709e3351ac66f028f1b0dd5337ee9073dc20019ccffdac42d5c2e" | 28 | SRC_URI[sha256sum] = "f0f5845f9666f61332fdf0b7e396fc647f9372db0902a829af2cf9402b807bd1" |
30 | 29 | ||
31 | export prefix = "/opt/ltp" | 30 | export prefix = "/opt/ltp" |
32 | export exec_prefix = "/opt/ltp" | 31 | export exec_prefix = "/opt/ltp" |