disable some tests, now at least runltp finish.

8 files changed, 123 insertions, 6 deletions

diff --git a/package/ltp/Makefile b/package/ltp/Makefile
index 4303da72f..b116cff83 100644
--- a/package/ltp/Makefile
+++ b/package/ltp/Makefile
@@ -10,7 +10,7 @@ PKG_MD5SUM:=		6a98074e9121595ccb78951ebfeb698f
 PKG_DESCR:=		linux test project
 PKG_BUILDDEP:=		libtirpc
 PKG_DEPENDS:=		bash libtirpc libpthread librt
-PKG_DEPENDS+=		mke2fs
+PKG_DEPENDS+=		mke2fs mkfs
 PKG_SECTION:=		sys/misc
 PKG_URL:=		http://linux-test-project.github.io
 PKG_SITES:=		${MASTER_SITE_SOURCEFORGE:=ltp/}
@@ -33,7 +33,7 @@ CONFIGURE_ARGS+=	--with-open-posix-testsuite \
 			--without-expect
 
 ltp-install:
-	$(INSTALL_DIR) $(IDIR_LTP)/opt/ltp
+	$(INSTALL_DIR) $(IDIR_LTP)/opt/ltp/tmp
 	$(CP) $(WRKINST)/usr/* $(IDIR_LTP)/opt/ltp
 
 include ${ADK_TOPDIR}/mk/pkg-bottom.mk
diff --git a/package/ltp/patches/patch-runltp b/package/ltp/patches/patch-runltp
new file mode 100644
index 000000000..fa159a07b
--- /dev/null
+++ b/package/ltp/patches/patch-runltp
@@ -0,0 +1,11 @@
+--- ltp-full-20140422.orig/runltp	2014-04-23 10:37:31.000000000 +0200
++++ ltp-full-20140422/runltp	2014-07-07 22:30:06.069956961 +0200
+@@ -77,7 +77,7 @@ setup()
+         exit 1
+     }
+     export LTPROOT=${PWD}
+-    export TMPBASE="/tmp"
++    export TMPBASE="/opt/ltp/tmp"
+     export PATH="${PATH}:${LTPROOT}/testcases/bin"
+ 
+     export LTP_DEV=""
diff --git a/package/ltp/patches/patch-runtest_mm b/package/ltp/patches/patch-runtest_mm
new file mode 100644
index 000000000..8e9e026a1
--- /dev/null
+++ b/package/ltp/patches/patch-runtest_mm
@@ -0,0 +1,8 @@
+--- 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
+ 
+ max_map_count max_map_count -i 10
+ 
+-min_free_kbytes min_free_kbytes
++#min_free_kbytes min_free_kbytes
diff --git a/package/ltp/patches/patch-runtest_sched b/package/ltp/patches/patch-runtest_sched
index a157cb0af..d39872647 100644
--- a/package/ltp/patches/patch-runtest_sched
+++ b/package/ltp/patches/patch-runtest_sched
@@ -1,13 +1,13 @@
 --- ltp-full-20140422.orig/runtest/sched	2014-04-23 10:36:54.000000000 +0200
-+++ ltp-full-20140422/runtest/sched	2014-06-27 15:02:00.941026480 +0200
++++ ltp-full-20140422/runtest/sched	2014-07-09 18:50:14.482506093 +0200
 @@ -6,8 +6,8 @@ pth_str03 pth_str03
  time-schedule01		time-schedule
  trace_sched01		trace_sched -c 1
  
 -hackbench01 hackbench 50 process 1000
 -hackbench02 hackbench 20 thread 1000
-+hackbench01 hackbench 50 process 500
-+hackbench02 hackbench 20 thread 500
++#hackbench01 hackbench 50 process 500
++#hackbench02 hackbench 20 thread 500
  
  sched_cli_serv run_sched_cliserv.sh
  # Run this stress test for 2 minutes
diff --git a/package/ltp/patches/patch-runtest_syscalls b/package/ltp/patches/patch-runtest_syscalls
new file mode 100644
index 000000000..9f90aa6b7
--- /dev/null
+++ b/package/ltp/patches/patch-runtest_syscalls
@@ -0,0 +1,11 @@
+--- 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
+ fork09 fork09
+ fork10 fork10
+ fork11 fork11
+-fork13 fork13 -i 1000000
++fork13 fork13 -i 10000
+ fork14 fork14
+ 
+ fpathconf01 fpathconf01
diff --git a/package/ltp/patches/patch-scenario_groups_default b/package/ltp/patches/patch-scenario_groups_default
new file mode 100644
index 000000000..62a07df6c
--- /dev/null
+++ b/package/ltp/patches/patch-scenario_groups_default
@@ -0,0 +1,14 @@
+--- ltp-full-20140422.orig/scenario_groups/default	2014-04-23 10:36:54.000000000 +0200
++++ ltp-full-20140422/scenario_groups/default	2014-07-07 18:27:26.448313302 +0200
+@@ -19,11 +19,9 @@ fcntl-locktests
+ connectors
+ admin_tools
+ timers
+-power_management_tests
+ numa
+ hugetlb
+ commands
+-hyperthreading
+ kernel_misc
+ modules
+ fs_ext4
diff --git a/package/ltp/patches/patch-ver_linux b/package/ltp/patches/patch-ver_linux
new file mode 100644
index 000000000..69d23bd24
--- /dev/null
+++ b/package/ltp/patches/patch-ver_linux
@@ -0,0 +1,66 @@
+--- ltp-full-20140422.orig/ver_linux	2014-04-23 10:37:00.000000000 +0200
++++ ltp-full-20140422/ver_linux	2014-07-07 22:31:57.942795517 +0200
+@@ -18,62 +18,23 @@ fi
+ uname -a
+ echo ' '
+ 
+-echo "Gnu C                 " `gcc --version 2>/dev/null | head -n 1`
+-
+ make --version 2>&1 | awk -F, '{print $1}' | awk \
+       '/GNU Make/{print "Gnu make              ",$NF}'
+ 
+ ld -v 2>&1 | awk -F\) '{print $1}' | awk \
+       '/BFD/{print "binutils              ",$NF}'
+ 
+-fdformat --version 2>&1 | awk -F\- '{print "util-linux            ", $NF}'
+-
+ mount --version 2>&1 | awk -F\- '{print "mount                 ", $NF}'
+ 
+ insmod -V  2>&1 | awk 'NR==1 {print "modutils              ",$NF}'
+ 
+-tune2fs 2>&1 | grep "^tune2fs" | sed 's/,//' |  awk \
+-'NR==1 {print "e2fsprogs             ", $2}'
+-
+-reiserfsck 2>&1 | grep reiserfsprogs | awk \
+-'NR==1{print "reiserfsprogs         ", $NF}'
+-
+-cardmgr -V 2>&1| grep version | awk \
+-'NR==1{print "pcmcia-cs             ", $3}'
+-
+-pppd --version 2>&1| grep version | awk \
+-'NR==1{print "PPP                   ", $3}'
+-
+-isdnctrl 2>&1 | grep version | awk \
+-'NR==1{print "isdn4k-utils          ", $NF}'
+-
+-ls -l `ldd /bin/sh | awk '/libc/{print $3}'` | sed \
+--e 's/\.so$//' | awk -F'[.-]'   '{print "Linux C Library        " \
+-$(NF-2)"."$(NF-1)"."$NF}'
+-
+-ldd -v > /dev/null 2>&1 && ldd -v || ldd --version |head -n 1 | awk \
+-'NR==1{print "Dynamic linker (ldd)  ", $NF}'
+-
+-ls -l /usr/lib/lib{g,stdc}++.so  2>/dev/null | awk -F. \
+-       '{print "Linux C++ Library      " $4"."$5"."$6}'
+-
+-ps --version 2>&1 | awk 'NR==1{print "Procps                ", $NF}'
+-
+ ifconfig --version 2>&1 | grep tools | awk \
+ 'NR==1{print "Net-tools             ", $NF}'
+ 
+ ip -V 2>&1 | awk \
+ 'NR==1{print "iproute2             ", $NF}'
+ 
+-# Kbd needs 'loadkeys -h',
+-loadkeys -h 2>&1 | awk \
+-'(NR==1 && ($3 !~ /option/)) {print "Kbd                   ", $3}'
+-
+-# while console-tools needs 'loadkeys -V'.
+-loadkeys -V 2>&1 | awk \
+-'(NR==1 && ($2 ~ /console-tools/)) {print "Console-tools         ", $3}'
+-
+-expr --v 2>&1 | awk 'NR==1{print "Sh-utils              ", $NF}'
++busybox -v
+ 
+ if [ -e /proc/modules ]; then
+     X=`cat /proc/modules | sed -e "s/ .*$//"`
diff --git a/package/util-linux/Makefile b/package/util-linux/Makefile
index 7dc11fb89..b65c83ef0 100644
--- a/package/util-linux/Makefile
+++ b/package/util-linux/Makefile
@@ -16,7 +16,7 @@ PKG_OPTS:=		dev
 PKG_ARCH_DEPENDS:=	!m68k
 
 PKG_SUBPKGS:=		FDISK SFDISK SWAP_UTILS LOSETUP MCOOKIE MOUNT
-PKG_SUBPKGS+=		LIBUUID LIBBLKID LIBMOUNT SU CFDISK
+PKG_SUBPKGS+=		LIBUUID LIBBLKID LIBMOUNT SU CFDISK MKFS
 PKGSD_LIBUUID:=		uuid library
 PKGSC_LIBUUID:=		libs/misc
 PKGSD_LIBBLKID:=	blkid library
@@ -36,6 +36,8 @@ PKGSS_SWAP_UTILS:=	libblkid
 PKGSC_SWAP_UTILS:=	sys/fs
 PKGSD_LOSETUP:=		loop devices management utilities
 PKGSC_LOSETUP:=		sys/fs
+PKGSD_MKFS:=		filesystem creation frontend
+PKGSC_MKFS:=		sys/fs
 PKGSD_MOUNT:=		mount/umount utilities
 PKGSS_MOUNT:=		libblkid libmount libuuid libncurses
 PKGSC_MOUNT:=		sys/fs
@@ -50,6 +52,7 @@ $(eval $(call PKG_template,SFDISK,sfdisk,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEP
 $(eval $(call PKG_template,SU,su,${PKG_VERSION}-${PKG_RELEASE},${PKGSS_SU},${PKGSD_SU},${PKGSC_SU}))
 $(eval $(call PKG_template,SWAP_UTILS,swap-utils,${PKG_VERSION}-${PKG_RELEASE},${PKGSS_SWAP_UTILS},${PKGSD_SWAP_UTILS},${PKGSC_SWAP_UTILS}))
 $(eval $(call PKG_template,LOSETUP,losetup,${PKG_VERSION}-${PKG_RELEASE},${PKGSS_LOSETUP},${PKGSD_LOSETUP},${PKGSC_LOSETUP}))
+$(eval $(call PKG_template,MKFS,mkfs,${PKG_VERSION}-${PKG_RELEASE},${PKGSS_MKFS},${PKGSD_MKFS},${PKGSC_MKFS}))
 $(eval $(call PKG_template,MOUNT,mount,${PKG_VERSION}-${PKG_RELEASE},${PKGSS_MOUNT},${PKGSD_MOUNT},${PKGSC_MOUNT}))
 $(eval $(call PKG_template,MCOOKIE,mcookie,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKGSD_MCOOKIE},${PKGSC_MCOOKIE}))
 $(eval $(call PKG_template,LIBUUID,libuuid,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKGSD_LIBUUID},${PKGSC_LIBUUID},${PKG_OPTS}))
@@ -101,6 +104,10 @@ swap-utils-install:
 	${CP} ${WRKINST}/usr/sbin/mkswap ${IDIR_SWAP_UTILS}/usr/sbin
 	${CP} ${WRKINST}/usr/sbin/swap{on,off} ${IDIR_SWAP_UTILS}/usr/sbin
 
+mkfs-install:
+	${INSTALL_DIR} ${IDIR_MKFS}/usr/sbin
+	${INSTALL_BIN} ${WRKINST}/usr/sbin/mkfs ${IDIR_MKFS}/usr/sbin
+
 mount-install:
 	${INSTALL_DIR} ${IDIR_MOUNT}/bin
 	${INSTALL_BIN} ${WRKINST}/usr/bin/{u,}mount ${IDIR_MOUNT}/bin