From 8e5a14b847d26e55825f59a532423026252fe856 Mon Sep 17 00:00:00 2001
From: Waldemar Brodkorb <wbx@openadk.org>
Date: Mon, 1 Sep 2014 22:53:06 +0200
Subject: update ltp to latest stable upstream
---
package/ltp/Makefile | 16 +++++++++++-----
package/ltp/patches/patch-runltp | 6 +++---
package/ltp/patches/patch-runtest_mm | 6 +++---
package/ltp/patches/patch-runtest_syscalls | 6 +++---
package/ltp/patches/patch-testcases_kernel_Makefile | 8 ++++----
.../ltp/patches/patch-testcases_realtime_lib_libstats_c | 16 ----------------
6 files changed, 24 insertions(+), 34 deletions(-)
delete mode 100644 package/ltp/patches/patch-testcases_realtime_lib_libstats_c
(limited to 'package/ltp')
diff --git a/package/ltp/Makefile b/package/ltp/Makefile
index b116cff83..0268f15f9 100644
--- a/package/ltp/Makefile
+++ b/package/ltp/Makefile
@@ -4,12 +4,11 @@
include $(ADK_TOPDIR)/rules.mk
PKG_NAME:= ltp
-PKG_VERSION:= 20140422
+PKG_VERSION:= 20140828
PKG_RELEASE:= 1
PKG_MD5SUM:= 6a98074e9121595ccb78951ebfeb698f
PKG_DESCR:= linux test project
-PKG_BUILDDEP:= libtirpc
-PKG_DEPENDS:= bash libtirpc libpthread librt
+PKG_DEPENDS:= bash libpthread librt
PKG_DEPENDS+= mke2fs mkfs
PKG_SECTION:= sys/misc
PKG_URL:= http://linux-test-project.github.io
@@ -23,8 +22,8 @@ include $(ADK_TOPDIR)/mk/package.mk
$(eval $(call PKG_template,LTP,ltp,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
-TARGET_CPPFLAGS+= -I$(STAGING_TARGET_DIR)/usr/include/tirpc
-TARGET_LDFLAGS+= -ltirpc
+TARGET_CFLAGS+= -fno-builtin
+XAKE_FLAGS+= GCC_HONOUR_COPTS=s
CONFIGURE_ARGS+= --with-open-posix-testsuite \
--with-realtime-testsuite \
--without-power-management-testsuite \
@@ -32,6 +31,13 @@ CONFIGURE_ARGS+= --with-open-posix-testsuite \
--without-perl \
--without-expect
+# bessel float version not implemented in uClibc
+pre-build:
+ -rm ${WRKBUILD}/testcases/misc/math/float/float_bessel.c
+ -rm -rf ${WRKBUILD}/testcases/misc/math/float/bessel
+ -rm -rf ${WRKBUILD}/testcases/network/{rpc,nfs*}
+ -rm -rf ${WRKBUILD}/testcases/kernel/syscalls/profil
+
ltp-install:
$(INSTALL_DIR) $(IDIR_LTP)/opt/ltp/tmp
$(CP) $(WRKINST)/usr/* $(IDIR_LTP)/opt/ltp
diff --git a/package/ltp/patches/patch-runltp b/package/ltp/patches/patch-runltp
index 569d93ee8..94bc79e84 100644
--- a/package/ltp/patches/patch-runltp
+++ b/package/ltp/patches/patch-runltp
@@ -1,5 +1,5 @@
---- ltp-full-20140422.orig/runltp 2014-04-23 10:37:31.000000000 +0200
-+++ ltp-full-20140422/runltp 2014-07-10 23:23:28.476220215 +0200
+--- ltp-full-20140828.orig/runltp 2014-08-28 12:11:45.000000000 +0200
++++ ltp-full-20140828/runltp 2014-09-01 13:55:06.540554810 +0200
@@ -77,7 +77,7 @@ setup()
exit 1
}
@@ -9,7 +9,7 @@
export PATH="${PATH}:${LTPROOT}/testcases/bin"
export LTP_DEV=""
-@@ -671,11 +671,11 @@ main()
+@@ -669,11 +669,11 @@ main()
fi
# check for required users and groups
diff --git a/package/ltp/patches/patch-runtest_mm b/package/ltp/patches/patch-runtest_mm
index 8e9e026a1..8f3181a24 100644
--- a/package/ltp/patches/patch-runtest_mm
+++ b/package/ltp/patches/patch-runtest_mm
@@ -1,6 +1,6 @@
---- ltp-full-20140422.orig/runtest/mm 2014-04-23 10:36:54.000000000 +0200
-+++ ltp-full-20140422/runtest/mm 2014-07-07 18:30:02.953473699 +0200
-@@ -110,4 +110,4 @@ overcommit_memory06 overcommit_memory -R
+--- ltp-full-20140828.orig/runtest/mm 2014-08-28 12:11:45.000000000 +0200
++++ ltp-full-20140828/runtest/mm 2014-09-01 13:55:06.548554854 +0200
+@@ -107,4 +107,4 @@ overcommit_memory06 overcommit_memory -R
max_map_count max_map_count -i 10
diff --git a/package/ltp/patches/patch-runtest_syscalls b/package/ltp/patches/patch-runtest_syscalls
index 9f90aa6b7..5597697a4 100644
--- a/package/ltp/patches/patch-runtest_syscalls
+++ b/package/ltp/patches/patch-runtest_syscalls
@@ -1,6 +1,6 @@
---- ltp-full-20140422.orig/runtest/syscalls 2014-04-23 10:36:54.000000000 +0200
-+++ ltp-full-20140422/runtest/syscalls 2014-07-07 16:47:09.356685909 +0200
-@@ -283,7 +283,7 @@ fork08 fork08
+--- ltp-full-20140828.orig/runtest/syscalls 2014-08-28 12:11:45.000000000 +0200
++++ ltp-full-20140828/runtest/syscalls 2014-09-01 13:55:06.556554900 +0200
+@@ -281,7 +281,7 @@ fork08 fork08
fork09 fork09
fork10 fork10
fork11 fork11
diff --git a/package/ltp/patches/patch-testcases_kernel_Makefile b/package/ltp/patches/patch-testcases_kernel_Makefile
index 97bf9bd32..a476df742 100644
--- a/package/ltp/patches/patch-testcases_kernel_Makefile
+++ b/package/ltp/patches/patch-testcases_kernel_Makefile
@@ -1,7 +1,7 @@
---- ltp-full-20140422.orig/testcases/kernel/Makefile 2014-04-23 10:36:54.000000000 +0200
-+++ ltp-full-20140422/testcases/kernel/Makefile 2014-07-22 15:57:17.210496497 +0200
-@@ -50,7 +50,6 @@ SUBDIRS += connectors \
- performance_counters \
+--- ltp-full-20140828.orig/testcases/kernel/Makefile 2014-08-28 12:11:45.000000000 +0200
++++ ltp-full-20140828/testcases/kernel/Makefile 2014-09-01 13:55:06.564554944 +0200
+@@ -49,7 +49,6 @@ SUBDIRS += connectors \
+ numa \
pty \
sched \
- security \
diff --git a/package/ltp/patches/patch-testcases_realtime_lib_libstats_c b/package/ltp/patches/patch-testcases_realtime_lib_libstats_c
deleted file mode 100644
index d35130dc4..000000000
--- a/package/ltp/patches/patch-testcases_realtime_lib_libstats_c
+++ /dev/null
@@ -1,16 +0,0 @@
-from buildroot
-
---- ltp-full-20140422.orig/testcases/realtime/lib/libstats.c 2014-04-23 10:37:00.000000000 +0200
-+++ ltp-full-20140422/testcases/realtime/lib/libstats.c 2014-06-27 10:55:59.401744516 +0200
-@@ -46,6 +46,11 @@
- #include <libstats.h>
- #include <librttest.h>
-
-+#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 */
--
cgit v1.2.3