From bbb9f831dbfcedf799021f2b0a1dd7aef3c0f928 Mon Sep 17 00:00:00 2001
From: Jiajun Xu <jiajun.xu@intel.com>
Date: Thu, 24 May 2012 17:08:36 +0800
Subject: ltp: Upgrade LTP to version 20120401

Signed-off-by: Jiajun Xu <jiajun.xu@intel.com>
---
 .../ltp/ltp/uclibc-getcontext.patch                | 78 ----------------------
 meta/recipes-extended/ltp/ltp_20120104.bb          | 76 ---------------------
 meta/recipes-extended/ltp/ltp_20120401.bb          | 75 +++++++++++++++++++++
 3 files changed, 75 insertions(+), 154 deletions(-)
 delete mode 100644 meta/recipes-extended/ltp/ltp/uclibc-getcontext.patch
 delete mode 100644 meta/recipes-extended/ltp/ltp_20120104.bb
 create mode 100644 meta/recipes-extended/ltp/ltp_20120401.bb

(limited to 'meta/recipes-extended')

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 @@
-Fix building disabled getcontext and profil01 tests for uclibc
-
-Signed-off-by: Khem Raj <raj.khem@gmail.com>
-
-Upstream-Status: Pending
-
-Index: ltp-20110915/testcases/kernel/syscalls/getcontext/getcontext01.c
-===================================================================
---- ltp-20110915.orig/testcases/kernel/syscalls/getcontext/getcontext01.c	2012-01-19 16:39:24.391012507 -0800
-+++ ltp-20110915/testcases/kernel/syscalls/getcontext/getcontext01.c	2012-01-19 16:39:24.459012510 -0800
-@@ -34,6 +34,10 @@
-  **********************************************************/
- 
- #include <features.h>
-+#include "test.h"
-+#include "usctest.h"
-+char *TCID = "getcontext01";	/* Test program identifier.    */
-+
- #if !defined(__UCLIBC__)
- 
- #include <stdio.h>
-@@ -41,13 +45,9 @@
- #include <errno.h>
- #include <ucontext.h>
- 
--#include "test.h"
--#include "usctest.h"
--
- void setup();
- void cleanup();
- 
--char *TCID = "getcontext01";	/* Test program identifier.    */
- int TST_TOTAL = 1;		/* Total number of test cases. */
- 
- int exp_enos[] = { 0 };		/* must be a 0 terminated list */
-@@ -102,4 +102,4 @@
- {
- 	tst_brkm(TCONF, NULL, "system doesn't have getcontext support");
- }
--#endif
-\ No newline at end of file
-+#endif
-Index: ltp-20110915/testcases/kernel/syscalls/profil/profil01.c
-===================================================================
---- ltp-20110915.orig/testcases/kernel/syscalls/profil/profil01.c	2012-01-19 16:39:55.975014036 -0800
-+++ ltp-20110915/testcases/kernel/syscalls/profil/profil01.c	2012-01-19 16:40:23.475015322 -0800
-@@ -41,6 +41,8 @@
- #endif
- 
- #include <features.h>
-+#include "test.h"
-+char *TCID = "profil01";
- #ifndef __UCLIBC__
- 
- #ifdef __arm__
-@@ -58,7 +60,6 @@
- #include <errno.h>
- #include <sys/types.h>
- #include <sys/wait.h>
--#include "test.h"
- #include "usctest.h"
- #define FAILED 0
- #define PASSED 1
-@@ -73,7 +74,6 @@
- //char progname[]= "profil1()";
- 
- /*****	LTP Port	*****/
--char *TCID = "profil01";
- int local_flag = PASSED;
- int block_number;
- FILE *temp;
-@@ -310,4 +310,4 @@
- 	/* uClibc does not have profiling support */
- 	tst_exit();
- }
--#endif
-\ No newline at end of file
-+#endif
diff --git a/meta/recipes-extended/ltp/ltp_20120104.bb b/meta/recipes-extended/ltp/ltp_20120104.bb
deleted file mode 100644
index c82203a764..0000000000
--- a/meta/recipes-extended/ltp/ltp_20120104.bb
+++ /dev/null
@@ -1,76 +0,0 @@
-SUMMARY = "Linux Test Project"
-DESCRIPTION = "The Linux Test Project is a joint project with SGI, IBM, OSDL, and Bull with a goal to deliver test suites to the open source community that validate the reliability, robustness, and stability of Linux. The Linux Test Project is a collection of tools for testing the Linux kernel and related features."
-HOMEPAGE = "http://ltp.sourceforge.net"
-SECTION = "console/utils"
-
-LICENSE = "GPLv2 & GPLv2+ & LGPLv2+ & LGPLv2.1+ & BSD-2-Clause"
-LIC_FILES_CHKSUM = "file://COPYING;md5=0636e73ff0215e8d672dc4c32c317bb3 \
-		    file://testcases/kernel/mce-test/COPYING;md5=0636e73ff0215e8d672dc4c32c317bb3 \
-		    file://testcases/kernel/controllers/freezer/COPYING;md5=0636e73ff0215e8d672dc4c32c317bb3 \
-		    file://testcases/kernel/controllers/freezer/run_freezer.sh;startline=5;endline=17;md5=aeac3f7691caa2e76fd5a732fbd6510d \
-		    file://testcases/kernel/fs/ext4-new-features/ffsb-6.0-rc2/COPYING;md5=c46082167a314d785d012a244748d803 \
-		    file://testcases/kernel/hotplug/memory_hotplug/COPYING;md5=e04a2e542b2b8629bf9cd2ba29b0fe41 \
-		    file://testcases/kernel/hotplug/cpu_hotplug/COPYING;md5=e04a2e542b2b8629bf9cd2ba29b0fe41 \
-		    file://testcases/open_posix_testsuite/COPYING;md5=216e43b72efbe4ed9017cc19c4c68b01 \
-		    file://tools/netpipe-2.4/COPYING;md5=18810669f13b87348459e611d31ab760 \
-		    file://tools/netpipe-2.4-ipv6/COPYING;md5=18810669f13b87348459e611d31ab760 \
-		    file://tools/top-LTP/proc/COPYING;md5=6e29c688d912da12b66b73e32b03d812 \
-		    file://tools/pounder21/COPYING;md5=94d55d512a9ba36caa9b7df079bae19f \
-		    file://utils/benchmark/kernbench-0.42/COPYING;md5=94d55d512a9ba36caa9b7df079bae19f \
-		"
-
-PR = "r1"
-
-SRC_URI = "${SOURCEFORGE_MIRROR}/ltp/ltp-full-${PV}.bz2 \
-           file://uclibc-getcontext.patch \
-          "
-
-SRC_URI[md5sum] = "ac183bbdac67139f049b3755fda37179"
-SRC_URI[sha256sum] = "11b149b821d709e3351ac66f028f1b0dd5337ee9073dc20019ccffdac42d5c2e"
-
-export prefix = "/opt/ltp"
-export exec_prefix = "/opt/ltp"
-
-inherit autotools
-
-FILES_${PN}-dbg += "/opt/ltp/runtest/.debug"
-FILES_${PN}-dbg += "/opt/ltp/testcases/bin/.debug"
-FILES_${PN}-dbg += "/opt/ltp/testcases/bin/*/bin/.debug"
-FILES_${PN}-dbg += "/opt/ltp/testcases/bin/*/test/.debug"
-FILES_${PN}-dbg += "/opt/ltp/scenario_groups/.debug"
-FILES_${PN}-dbg += "/opt/ltp/testscripts/.debug"
-FILES_${PN}-dbg += "/opt/ltp/testscripts/open_posix_testsuite/.debug"
-
-FILES_${PN}-staticdev += "/opt/ltp/lib/libmem.a"
-
-FILES_${PN} += "/opt/ltp/* /opt/ltp/runtest/* /opt/ltp/scenario_groups/* /opt/ltp/testcases/bin/* /opt/ltp/testcases/bin/*/bin/* /opt/ltp/testscripts/* /opt/ltp/testcases/open_posix_testsuite/* /opt/ltp/testcases/open_posix_testsuite/conformance/* /opt/ltp/testcases/open_posix_testsuite/Documentation/* /opt/ltp/testcases/open_posix_testsuite/functional/* /opt/ltp/testcases/open_posix_testsuite/include/* /opt/ltp/testcases/open_posix_testsuite/scripts/* /opt/ltp/testcases/open_posix_testsuite/stress/* /opt/ltp/testcases/open_posix_testsuite/tools/*"
-
-TARGET_CC_ARCH += "${LDFLAGS}"
-
-do_unpack_append() {
-        bb.build.exec_func('do_extract_tarball', d)
-}
-
-do_extract_tarball() {
-	if test -f ${WORKDIR}/ltp-full-${PV} ; then
-	    tar x --no-same-owner -f ${WORKDIR}/ltp-full-${PV} -C ${WORKDIR}
-	    rm -rf ${WORKDIR}/ltp-${PV}
-	    mv ${WORKDIR}/ltp-full-${PV} ${WORKDIR}/ltp-${PV}
-	fi
-}
-
-do_install(){
-	install -d ${D}/opt/ltp/
-	oe_runmake DESTDIR=${D} SKIP_IDCHECK=1 install
-	
-	# Copy POSIX test suite into ${D}/opt/ltp/testcases by manual
-	cp -r testcases/open_posix_testsuite ${D}/opt/ltp/testcases
-
-	# We need to remove all scripts which depend on /usr/bin/expect, since expect is not supported in poky
-	# We will add expect for enhancement in future
-	find ${D} -type f -print | xargs grep "\!.*\/usr\/bin\/expect" | awk -F":" '{print $1}' | xargs rm -f
-}
-
-# Avoid generated binaries stripping. Otherwise some of the ltp tests such as ldd01 & nm01 fails
-INHIBIT_PACKAGE_STRIP = "1"
-
diff --git a/meta/recipes-extended/ltp/ltp_20120401.bb b/meta/recipes-extended/ltp/ltp_20120401.bb
new file mode 100644
index 0000000000..821d9e4bbb
--- /dev/null
+++ b/meta/recipes-extended/ltp/ltp_20120401.bb
@@ -0,0 +1,75 @@
+SUMMARY = "Linux Test Project"
+DESCRIPTION = "The Linux Test Project is a joint project with SGI, IBM, OSDL, and Bull with a goal to deliver test suites to the open source community that validate the reliability, robustness, and stability of Linux. The Linux Test Project is a collection of tools for testing the Linux kernel and related features."
+HOMEPAGE = "http://ltp.sourceforge.net"
+SECTION = "console/utils"
+
+LICENSE = "GPLv2 & GPLv2+ & LGPLv2+ & LGPLv2.1+ & BSD-2-Clause"
+LIC_FILES_CHKSUM = "file://COPYING;md5=0636e73ff0215e8d672dc4c32c317bb3 \
+		    file://testcases/kernel/mce-test/COPYING;md5=0636e73ff0215e8d672dc4c32c317bb3 \
+		    file://testcases/kernel/controllers/freezer/COPYING;md5=0636e73ff0215e8d672dc4c32c317bb3 \
+		    file://testcases/kernel/controllers/freezer/run_freezer.sh;startline=5;endline=17;md5=aeac3f7691caa2e76fd5a732fbd6510d \
+		    file://testcases/kernel/fs/ext4-new-features/ffsb-6.0-rc2/COPYING;md5=c46082167a314d785d012a244748d803 \
+		    file://testcases/kernel/hotplug/memory_hotplug/COPYING;md5=e04a2e542b2b8629bf9cd2ba29b0fe41 \
+		    file://testcases/kernel/hotplug/cpu_hotplug/COPYING;md5=e04a2e542b2b8629bf9cd2ba29b0fe41 \
+		    file://testcases/open_posix_testsuite/COPYING;md5=216e43b72efbe4ed9017cc19c4c68b01 \
+		    file://tools/netpipe-2.4/COPYING;md5=18810669f13b87348459e611d31ab760 \
+		    file://tools/netpipe-2.4-ipv6/COPYING;md5=18810669f13b87348459e611d31ab760 \
+		    file://tools/top-LTP/proc/COPYING;md5=6e29c688d912da12b66b73e32b03d812 \
+		    file://tools/pounder21/COPYING;md5=94d55d512a9ba36caa9b7df079bae19f \
+		    file://utils/benchmark/kernbench-0.42/COPYING;md5=94d55d512a9ba36caa9b7df079bae19f \
+		"
+
+PR = "r2"
+
+SRC_URI = "${SOURCEFORGE_MIRROR}/ltp/ltp-full-${PV}.bz2 \
+          "
+
+SRC_URI[md5sum] = "e1d0acf1a6b6da0cb30dc1b0dcf5f26d"
+SRC_URI[sha256sum] = "f0f5845f9666f61332fdf0b7e396fc647f9372db0902a829af2cf9402b807bd1"
+
+export prefix = "/opt/ltp"
+export exec_prefix = "/opt/ltp"
+
+inherit autotools
+
+FILES_${PN}-dbg += "/opt/ltp/runtest/.debug"
+FILES_${PN}-dbg += "/opt/ltp/testcases/bin/.debug"
+FILES_${PN}-dbg += "/opt/ltp/testcases/bin/*/bin/.debug"
+FILES_${PN}-dbg += "/opt/ltp/testcases/bin/*/test/.debug"
+FILES_${PN}-dbg += "/opt/ltp/scenario_groups/.debug"
+FILES_${PN}-dbg += "/opt/ltp/testscripts/.debug"
+FILES_${PN}-dbg += "/opt/ltp/testscripts/open_posix_testsuite/.debug"
+
+FILES_${PN}-staticdev += "/opt/ltp/lib/libmem.a"
+
+FILES_${PN} += "/opt/ltp/* /opt/ltp/runtest/* /opt/ltp/scenario_groups/* /opt/ltp/testcases/bin/* /opt/ltp/testcases/bin/*/bin/* /opt/ltp/testscripts/* /opt/ltp/testcases/open_posix_testsuite/* /opt/ltp/testcases/open_posix_testsuite/conformance/* /opt/ltp/testcases/open_posix_testsuite/Documentation/* /opt/ltp/testcases/open_posix_testsuite/functional/* /opt/ltp/testcases/open_posix_testsuite/include/* /opt/ltp/testcases/open_posix_testsuite/scripts/* /opt/ltp/testcases/open_posix_testsuite/stress/* /opt/ltp/testcases/open_posix_testsuite/tools/*"
+
+TARGET_CC_ARCH += "${LDFLAGS}"
+
+do_unpack_append() {
+        bb.build.exec_func('do_extract_tarball', d)
+}
+
+do_extract_tarball() {
+	if test -f ${WORKDIR}/ltp-full-${PV} ; then
+	    tar x --no-same-owner -f ${WORKDIR}/ltp-full-${PV} -C ${WORKDIR}
+	    rm -rf ${WORKDIR}/ltp-${PV}
+	    mv ${WORKDIR}/ltp-full-${PV} ${WORKDIR}/ltp-${PV}
+	fi
+}
+
+do_install(){
+	install -d ${D}/opt/ltp/
+	oe_runmake DESTDIR=${D} SKIP_IDCHECK=1 install
+	
+	# Copy POSIX test suite into ${D}/opt/ltp/testcases by manual
+	cp -r testcases/open_posix_testsuite ${D}/opt/ltp/testcases
+
+	# We need to remove all scripts which depend on /usr/bin/expect, since expect is not supported in poky
+	# We will add expect for enhancement in future
+	find ${D} -type f -print | xargs grep "\!.*\/usr\/bin\/expect" | awk -F":" '{print $1}' | xargs rm -f
+}
+
+# Avoid generated binaries stripping. Otherwise some of the ltp tests such as ldd01 & nm01 fails
+INHIBIT_PACKAGE_STRIP = "1"
+
-- 
cgit v1.2.3