From acc1939be3ac6b0dc67acf78f10afe46065e634c Mon Sep 17 00:00:00 2001 From: Jerin Jacob Date: Thu, 28 Feb 2013 04:55:40 +0000 Subject: ltp-testsuite: bump version to 20130109 [Peter: drop version number in patches] Signed-off-by: Jerin Jacob Signed-off-by: Peter Korsgaard --- ...tp-testsuite-20101031-disable-controllers.patch | 25 ------------------- ...tsuite-20101031-fix-build-on-uClibc-exp10.patch | 22 ---------------- .../ltp-testsuite-disable-controllers.patch | 29 ++++++++++++++++++++++ .../ltp-testsuite-fix-build-on-uClibc-exp10.patch | 22 ++++++++++++++++ package/ltp-testsuite/ltp-testsuite.mk | 2 +- 5 files changed, 52 insertions(+), 48 deletions(-) delete mode 100644 package/ltp-testsuite/ltp-testsuite-20101031-disable-controllers.patch delete mode 100644 package/ltp-testsuite/ltp-testsuite-20101031-fix-build-on-uClibc-exp10.patch create mode 100644 package/ltp-testsuite/ltp-testsuite-disable-controllers.patch create mode 100644 package/ltp-testsuite/ltp-testsuite-fix-build-on-uClibc-exp10.patch diff --git a/package/ltp-testsuite/ltp-testsuite-20101031-disable-controllers.patch b/package/ltp-testsuite/ltp-testsuite-20101031-disable-controllers.patch deleted file mode 100644 index 57d603864..000000000 --- a/package/ltp-testsuite/ltp-testsuite-20101031-disable-controllers.patch +++ /dev/null @@ -1,25 +0,0 @@ -Disable controllers testcases - -The cpuset controllers testcases do not build due to bug -https://sourceforge.net/tracker/?func=detail&aid=3126942&group_id=3382&atid=103382. Disabling -just the cpuset controllers do not seem to be easily possible, and -those controller features are rarely used on embedded systems anyway. - -Signed-off-by: Thomas Petazzoni ---- - testcases/kernel/Makefile | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -Index: ltp-testsuite-20101031/testcases/kernel/Makefile -=================================================================== ---- ltp-testsuite-20101031.orig/testcases/kernel/Makefile -+++ ltp-testsuite-20101031/testcases/kernel/Makefile -@@ -28,7 +28,7 @@ - # - # KEEP THIS LIST ALPHABETIZED PLEASE! - ifneq ($(UCLINUX),1) --SUBDIRS := containers connectors controllers fs hotplug io ipc mem \ -+SUBDIRS := containers connectors fs hotplug io ipc mem \ - numa performance_counters power_management pty sched \ - security syscalls timers tracing - else diff --git a/package/ltp-testsuite/ltp-testsuite-20101031-fix-build-on-uClibc-exp10.patch b/package/ltp-testsuite/ltp-testsuite-20101031-fix-build-on-uClibc-exp10.patch deleted file mode 100644 index 7a02d9520..000000000 --- a/package/ltp-testsuite/ltp-testsuite-20101031-fix-build-on-uClibc-exp10.patch +++ /dev/null @@ -1,22 +0,0 @@ -Inspired by: http://peter.korsgaard.com/patches/alsa-utils/alsamixer-fix-build-on-uClibc-exp10.patch - -exp10 extension is not part of uClibc, so compute it. - - -Signed-off-by: Samuel Martin - -diff -purN ltp-testsuite-20101031.orig/testcases/realtime/lib/libstats.c ltp-testsuite-20101031/testcases/realtime/lib/libstats.c ---- ltp-testsuite-20101031.orig/testcases/realtime/lib/libstats.c 2012-10-22 23:19:02.306646174 +0200 -+++ ltp-testsuite-20101031/testcases/realtime/lib/libstats.c 2012-10-22 23:25:41.554847766 +0200 -@@ -46,6 +46,11 @@ - #include - #include - -+#ifdef __UCLIBC__ -+/* 10^x = 10^(log e^x) = (e^x)^log10 = e^(x * log 10) */ -+#define exp10(x) (exp((x) * log(10))) -+#endif /* __UCLIBC__ */ -+ - int save_stats = 0; - - /* static helper functions */ diff --git a/package/ltp-testsuite/ltp-testsuite-disable-controllers.patch b/package/ltp-testsuite/ltp-testsuite-disable-controllers.patch new file mode 100644 index 000000000..85ef262d0 --- /dev/null +++ b/package/ltp-testsuite/ltp-testsuite-disable-controllers.patch @@ -0,0 +1,29 @@ +Disable controllers testcases. +This fix is carried over from 20101031 version. + +The cpuset controllers testcases do not build due to bug +https://sourceforge.net/tracker/?func=detail&aid=3126942&group_id=3382&atid=103382. +Disabling just the cpuset controllers do not seem to be easily possible, and +those controller features are rarely used on embedded systems anyway. + +Signed-off-by: Thomas Petazzoni +Signed-off-by: Jerin Jacob +--- + testcases/kernel/Makefile | 1 - + 1 files changed, 0 insertions(+), 1 deletions(-) + +diff --git a/testcases/kernel/Makefile b/testcases/kernel/Makefile +index 4b4800d..d6ab7b6 100644 +--- a/testcases/kernel/Makefile ++++ b/testcases/kernel/Makefile +@@ -37,7 +37,6 @@ ifneq ($(UCLINUX),1) + # KEEP THIS LIST ALPHABETIZED PLEASE! + SUBDIRS += connectors \ + containers \ +- controllers \ + fs \ + hotplug \ + io \ +-- +1.7.6.5 + diff --git a/package/ltp-testsuite/ltp-testsuite-fix-build-on-uClibc-exp10.patch b/package/ltp-testsuite/ltp-testsuite-fix-build-on-uClibc-exp10.patch new file mode 100644 index 000000000..7a02d9520 --- /dev/null +++ b/package/ltp-testsuite/ltp-testsuite-fix-build-on-uClibc-exp10.patch @@ -0,0 +1,22 @@ +Inspired by: http://peter.korsgaard.com/patches/alsa-utils/alsamixer-fix-build-on-uClibc-exp10.patch + +exp10 extension is not part of uClibc, so compute it. + + +Signed-off-by: Samuel Martin + +diff -purN ltp-testsuite-20101031.orig/testcases/realtime/lib/libstats.c ltp-testsuite-20101031/testcases/realtime/lib/libstats.c +--- ltp-testsuite-20101031.orig/testcases/realtime/lib/libstats.c 2012-10-22 23:19:02.306646174 +0200 ++++ ltp-testsuite-20101031/testcases/realtime/lib/libstats.c 2012-10-22 23:25:41.554847766 +0200 +@@ -46,6 +46,11 @@ + #include + #include + ++#ifdef __UCLIBC__ ++/* 10^x = 10^(log e^x) = (e^x)^log10 = e^(x * log 10) */ ++#define exp10(x) (exp((x) * log(10))) ++#endif /* __UCLIBC__ */ ++ + int save_stats = 0; + + /* static helper functions */ diff --git a/package/ltp-testsuite/ltp-testsuite.mk b/package/ltp-testsuite/ltp-testsuite.mk index d0276f227..caed4b3ab 100644 --- a/package/ltp-testsuite/ltp-testsuite.mk +++ b/package/ltp-testsuite/ltp-testsuite.mk @@ -3,7 +3,7 @@ # ltp-testsuite # ############################################################# -LTP_TESTSUITE_VERSION = 20101031 +LTP_TESTSUITE_VERSION = 20130109 LTP_TESTSUITE_SOURCE = ltp-full-$(LTP_TESTSUITE_VERSION).bz2 LTP_TESTSUITE_SITE = http://downloads.sourceforge.net/project/ltp/LTP%20Source/ltp-$(LTP_TESTSUITE_VERSION) LTP_TESTSUITE_LICENSE = GPLv2 GPLv2+ -- cgit v1.2.3