* [Buildroot] svn commit: trunk/buildroot/package/ltp-testsuite
@ 2006-12-02 6:42 sjhill at uclibc.org
0 siblings, 0 replies; 8+ messages in thread
From: sjhill at uclibc.org @ 2006-12-02 6:42 UTC (permalink / raw)
To: buildroot
Author: sjhill
Date: 2006-12-01 22:42:25 -0800 (Fri, 01 Dec 2006)
New Revision: 16751
Log:
Bump the revision to the latest release and update the patches. Some idiots decided to use deprecated functions 'bzero' and 'bcmp' so we patch that up. Someone fell free to pass the patch upstream to the LTP persons, I don't have time.
Added:
trunk/buildroot/package/ltp-testsuite/ltp-testsuite-remove-bzero-bcmp.patch
Removed:
trunk/buildroot/package/ltp-testsuite/ltp-testsuite-remove-bcopy.patch
Modified:
trunk/buildroot/package/ltp-testsuite/ltp-testsuite.mk
trunk/buildroot/package/ltp-testsuite/ltp-testsuite.patch
Changeset:
Deleted: trunk/buildroot/package/ltp-testsuite/ltp-testsuite-remove-bcopy.patch
===================================================================
--- trunk/buildroot/package/ltp-testsuite/ltp-testsuite-remove-bcopy.patch 2006-12-02 05:15:27 UTC (rev 16750)
+++ trunk/buildroot/package/ltp-testsuite/ltp-testsuite-remove-bcopy.patch 2006-12-02 06:42:25 UTC (rev 16751)
@@ -1,126 +0,0 @@
---- ltp/testcases/network/multicast/mc_member/member.c.orig 2005-10-03 12:19:46.000000000 -0600
-+++ ltp/testcases/network/multicast/mc_member/member.c 2006-07-04 18:29:28.000000000 -0600
-@@ -80,7 +80,7 @@
- }
-
- if((hp = gethostbyname(interface))) {
-- bcopy(hp->h_addr, &imr.imr_interface.s_addr, hp->h_length);
-+ memcpy(&imr.imr_interface.s_addr, hp->h_addr, hp->h_length);
- } else
- if((n = sscanf(interface, "%u.%u.%u.%u", &i1, &i2, &i3, &i4)) != 4) {
- fprintf(stderr, "bad group address\n" );
---- ltp/testcases/network/tcp_cmds/echo/echoes.c.orig 2005-10-03 11:58:24.000000000 -0600
-+++ ltp/testcases/network/tcp_cmds/echo/echoes.c 2006-07-04 18:27:06.000000000 -0600
-@@ -133,7 +133,7 @@
- exit(1);
- }
- port=sp->s_port;
-- bcopy(hp->h_addr_list[0],&hostaddr,sizeof(struct in_addr));
-+ memcpy(&hostaddr,hp->h_addr_list[0],sizeof(struct in_addr));
- bzero((char *)&sa,sizeof (sa));
- sa.sin_port=port;
- sa.sin_family=AF_INET;
---- ltp/testcases/network/tcp_cmds/perf_lan/pingpong.c.orig 2006-07-04 18:33:14.000000000 -0600
-+++ ltp/testcases/network/tcp_cmds/perf_lan/pingpong.c 2006-07-04 18:33:44.000000000 -0600
-@@ -118,7 +118,7 @@
- hp = gethostbyname(av[1]);
- if (hp) {
- to->sin_family = hp->h_addrtype;
-- bcopy(hp->h_addr, (caddr_t)&to->sin_addr, hp->h_length);
-+ memcpy((caddr_t)&to->sin_addr, hp->h_addr, hp->h_length);
- hostname = hp->h_name;
- } else {
- tst_resm (TINFO, "%s: unknown host, couldn't get address\n",argv[0]);
---- ltp/testcases/network/rpc/rpc01/rpc1.c.orig 2006-07-04 18:34:29.000000000 -0600
-+++ ltp/testcases/network/rpc/rpc01/rpc1.c 2006-07-04 18:34:47.000000000 -0600
-@@ -101,7 +101,7 @@
- }
- bzero(&server_sin, sizeof(server_sin));
- server_sin.sin_family = AF_INET;
-- bcopy(hp->h_addr, (char *) &server_sin.sin_addr, sizeof(hp->h_addr));
-+ memcpy((char *) &server_sin.sin_addr, hp->h_addr, sizeof(hp->h_addr));
-
- if (!file_name) {
- fprintf(stderr, "file name not given\n");
---- ltp/testcases/network/multicast/mc_commo/mc_recv.c.orig 2006-07-04 18:35:24.000000000 -0600
-+++ ltp/testcases/network/multicast/mc_commo/mc_recv.c 2006-07-04 18:35:59.000000000 -0600
-@@ -45,7 +45,7 @@
- imr.imr_multiaddr.s_addr = htonl((g1<<24) | (g2<<16) | (g3<<8) | g4);
-
- if((hp = gethostbyname(argv[2])))
-- bcopy(hp->h_addr, &imr.imr_interface.s_addr, hp->h_length);
-+ memcpy(&imr.imr_interface.s_addr, hp->h_addr, hp->h_length);
- else
- if((n = sscanf(argv[2], "%u.%u.%u.%u", &i1, &i2, &i3, &i4)) != 4) {
- fprintf (stderr,"Bad group interface address\n");
---- ltp/testcases/network/multicast/mc_commo/mc_send.c.orig 2006-07-04 18:36:34.000000000 -0600
-+++ ltp/testcases/network/multicast/mc_commo/mc_send.c 2006-07-04 18:36:52.000000000 -0600
-@@ -48,7 +48,7 @@
- imr.imr_multiaddr.s_addr = htonl((g1<<24) | (g2<<16) | (g3<<8) | g4);
-
- if((hp = gethostbyname(argv[2]))) {
-- bcopy(hp->h_addr, &imr.imr_interface.s_addr, hp->h_length);
-+ memcpy(&imr.imr_interface.s_addr, hp->h_addr, hp->h_length);
- } else
- if((n = sscanf(argv[2], "%u.%u.%u.%u", &i1, &i2, &i3, &i4)) != 4) {
- fprintf (stderr,"Bad interface address\n");
---- ltp/testcases/kernel/ipc/pipeio/pipeio.c.orig 2006-07-04 18:37:26.000000000 -0600
-+++ ltp/testcases/kernel/ipc/pipeio/pipeio.c 2006-07-04 18:38:44.000000000 -0600
-@@ -742,7 +742,7 @@
- /*
- * get the last 2 words printed
- */
-- bcopy(a-(width*NBPW),c,width*NBPW);
-+ memcpy(c,a-(width*NBPW),width*NBPW);
- for (p = c; (p-c) < width*NBPW; ++p) {
- if (*p < '!' || *p > '~')
- *p = '.';
-@@ -761,7 +761,7 @@
- printf("%10.10ld ",*word);
- break;
- case ASCII:
-- bcopy(a,b,NBPW);
-+ memcpy(b,a,NBPW);
- for (p = b; (p-b) < NBPW; ++p) {
- if (*p < '!' || *p > '~')
- *p = '.';
-@@ -780,7 +780,7 @@
- */
- bzero(c,width*NBPW);
- if (extra_words) width = extra_words; /* odd number of words */
-- bcopy(a-(width*NBPW),c,width*NBPW);
-+ memcpy(c,a-(width*NBPW),width*NBPW);
- for (p = c; (p-c) < width*NBPW; ++p) {
- if (*p < '!' || *p > '~')
- *p = '.';
---- ltp/testcases/ballista/ballista/serverCommunication.cpp.orig 2006-07-04 18:39:39.000000000 -0600
-+++ ltp/testcases/ballista/ballista/serverCommunication.cpp 2006-07-04 18:40:33.000000000 -0600
-@@ -67,7 +67,7 @@
- #ifdef SUN
-
- #include <strings.h>
--//includes bcopy proto
-+//includes memcpy proto
-
- #endif
-
-@@ -118,7 +118,7 @@
- }
-
-
-- bcopy ((const char *)hp->h_addr,(char *)&(server_addr.sin_addr.s_addr),hp->h_length);
-+ memcpy ((char *)&(server_addr.sin_addr.s_addr),(const char *)hp->h_addr,hp->h_length);
-
-
- server_addr.sin_family = AF_INET;
---- ltp/tools/netpipe-2.4/TCP.c.orig 2006-07-04 18:41:13.000000000 -0600
-+++ ltp/tools/netpipe-2.4/TCP.c 2006-07-04 18:41:39.000000000 -0600
-@@ -85,7 +85,7 @@
- }
-
- lsin1->sin_family = addr->h_addrtype;
-- bcopy(addr->h_addr, (char*) &(lsin1->sin_addr.s_addr), addr->h_length);
-+ memcpy((char*) &(lsin1->sin_addr.s_addr), addr->h_addr, addr->h_length);
- }
-
- lsin1->sin_port = htons(p->port);
Added: trunk/buildroot/package/ltp-testsuite/ltp-testsuite-remove-bzero-bcmp.patch
===================================================================
--- trunk/buildroot/package/ltp-testsuite/ltp-testsuite-remove-bzero-bcmp.patch 2006-12-02 05:15:27 UTC (rev 16750)
+++ trunk/buildroot/package/ltp-testsuite/ltp-testsuite-remove-bzero-bcmp.patch 2006-12-02 06:42:25 UTC (rev 16751)
@@ -0,0 +1,65 @@
+diff -ur ltp-full-20061121/testcases/kernel/fs/fsx-linux/fsx-linux.c ltp-full-20061121-patched/testcases/kernel/fs/fsx-linux/fsx-linux.c
+--- ltp-full-20061121/testcases/kernel/fs/fsx-linux/fsx-linux.c 2006-11-21 14:31:29.000000000 -0600
++++ ltp-full-20061121-patched/testcases/kernel/fs/fsx-linux/fsx-linux.c 2006-12-02 00:35:42.070475329 -0600
+@@ -322,7 +322,7 @@
+ unsigned op = 0;
+ unsigned bad = 0;
+
+- if (bcmp(good_buf + offset, temp_buf, size) != 0) {
++ if (memcmp(good_buf + offset, temp_buf, size) != 0) {
+ prt("READ BAD DATA: offset = 0x%x, size = 0x%x\n",
+ offset, size);
+ prt("OFFSET\tGOOD\tBAD\tRANGE\n");
+diff -ur ltp-full-20061121/testcases/kernel/io/ltp-aiodio/fsx-linux.c ltp-full-20061121-patched/testcases/kernel/io/ltp-aiodio/fsx-linux.c
+--- ltp-full-20061121/testcases/kernel/io/ltp-aiodio/fsx-linux.c 2006-11-21 14:31:27.000000000 -0600
++++ ltp-full-20061121-patched/testcases/kernel/io/ltp-aiodio/fsx-linux.c 2006-12-02 00:36:09.496726421 -0600
+@@ -355,7 +355,7 @@
+ unsigned op = 0;
+ unsigned bad = 0;
+
+- if (bcmp(good_buf + offset, temp_buf, size) != 0) {
++ if (memcmp(good_buf + offset, temp_buf, size) != 0) {
+ prt("READ BAD DATA: offset = 0x%x, size = 0x%x, fname = %s\n",
+ offset, size, fname);
+ prt("OFFSET\tGOOD\tBAD\tRANGE\n");
+diff -ur ltp-full-20061121/testcases/kernel/syscalls/symlink/symlink01.c ltp-full-20061121-patched/testcases/kernel/syscalls/symlink/symlink01.c
+--- ltp-full-20061121/testcases/kernel/syscalls/symlink/symlink01.c 2006-11-21 14:31:28.000000000 -0600
++++ ltp-full-20061121-patched/testcases/kernel/syscalls/symlink/symlink01.c 2006-12-02 00:36:18.081430964 -0600
+@@ -904,7 +904,7 @@
+ "stat(2) failed to return inode information for a regular object file");
+ return(0);
+ }
+- else if (bcmp((char *)&statter, (char *)&asymlink, sizeof(statter)) != 0) {
++ else if (memcmp((char *)&statter, (char *)&asymlink, sizeof(statter)) != 0) {
+ TEST_RESULT=TFAIL;
+ sprintf(test_msg,
+ "lstat(2) and stat(2) do not return same inode information for an object file");
+diff -ur ltp-full-20061121/testcases/network/nfs/fsx-linux/fsx-linux.c ltp-full-20061121-patched/testcases/network/nfs/fsx-linux/fsx-linux.c
+--- ltp-full-20061121/testcases/network/nfs/fsx-linux/fsx-linux.c 2006-11-21 14:31:24.000000000 -0600
++++ ltp-full-20061121-patched/testcases/network/nfs/fsx-linux/fsx-linux.c 2006-12-02 00:35:51.495248935 -0600
+@@ -325,7 +325,7 @@
+ unsigned op = 0;
+ unsigned bad = 0;
+
+- if (bcmp(good_buf + offset, temp_buf, size) != 0) {
++ if (memcmp(good_buf + offset, temp_buf, size) != 0) {
+ prt("READ BAD DATA: offset = 0x%x, size = 0x%x\n",
+ offset, size);
+ prt("OFFSET\tGOOD\tBAD\tRANGE\n");
+diff -ur ltp-full-20061121/testcases/network/nfsv4/locks/netsync.c ltp-full-20061121-patched/testcases/network/nfsv4/locks/netsync.c
+--- ltp-full-20061121/testcases/network/nfsv4/locks/netsync.c 2006-11-21 14:31:27.000000000 -0600
++++ ltp-full-20061121-patched/testcases/network/nfsv4/locks/netsync.c 2006-12-02 00:38:03.710097050 -0600
+@@ -57,11 +57,11 @@
+ perror ("socket");
+ exit(1);
+ }
+- bzero(&local, sizeof(local));
++ memset(&local, 0, sizeof(local));
+ local.sin_family = AF_INET;
+ local.sin_port = htons(PORT);
+ local.sin_addr.s_addr = INADDR_ANY;
+- bzero(&(local.sin_zero), 8);
++ memset(&(local.sin_zero), 0, 8);
+
+ if(bind(sock, (struct sockaddr *)&local, sizeof(struct sockaddr))== -1){
+ perror("bind");
Modified: trunk/buildroot/package/ltp-testsuite/ltp-testsuite.mk
===================================================================
--- trunk/buildroot/package/ltp-testsuite/ltp-testsuite.mk 2006-12-02 05:15:27 UTC (rev 16750)
+++ trunk/buildroot/package/ltp-testsuite/ltp-testsuite.mk 2006-12-02 06:42:25 UTC (rev 16751)
@@ -3,7 +3,7 @@
# ltp-testsuite
#
#############################################################
-LTP_TESTSUITE_VERSION:=20060615
+LTP_TESTSUITE_VERSION:=20061121
LTP_TESTSUITE_SOURCE:=ltp-full-$(LTP_TESTSUITE_VERSION).tgz
LTP_TESTSUITE_SITE:=http://$(BR2_SOURCEFORGE_MIRROR).dl.sourceforge.net/sourceforge/ltp
LTP_TESTSUITE_CAT:=$(ZCAT)
Modified: trunk/buildroot/package/ltp-testsuite/ltp-testsuite.patch
===================================================================
--- trunk/buildroot/package/ltp-testsuite/ltp-testsuite.patch 2006-12-02 05:15:27 UTC (rev 16750)
+++ trunk/buildroot/package/ltp-testsuite/ltp-testsuite.patch 2006-12-02 06:42:25 UTC (rev 16751)
@@ -1,61 +1,66 @@
---- ltp-full-20050707-dist/testcases/kernel/syscalls/fmtmsg/Makefile 2005-07-11 16:28:18.000000000 -0600
-+++ ltp-full-20050707/testcases/kernel/syscalls/fmtmsg/Makefile 2005-08-02 19:56:11.000000000 -0600
-@@ -26,7 +26,7 @@
- LOADLIBES+= $(if $(UCLINUX),-lc)
+diff -ur ltp-full-20061121/testcases/kernel/syscalls/fmtmsg/Makefile ltp-full-20061121-patched/testcases/kernel/syscalls/fmtmsg/Makefile
+--- ltp-full-20061121/testcases/kernel/syscalls/fmtmsg/Makefile 2006-11-21 14:31:28.000000000 -0600
++++ ltp-full-20061121-patched/testcases/kernel/syscalls/fmtmsg/Makefile 2006-12-02 00:16:36.830948316 -0600
+@@ -20,7 +20,7 @@
+ LDLIBS += -L../../../../lib -lltp
- SRCS=$(wildcard *.c)
--TARGETS=$(patsubst %.c,%,$(SRCS))
-+TARGETS=#$(patsubst %.c,%,$(SRCS))
+ SRCS = $(wildcard *.c)
+-TARGETS = $(patsubst %.c,%,$(SRCS))
++TARGETS =#$(patsubst %.c,%,$(SRCS))
all: $(TARGETS)
---- ltp-full-20050707-dist/testcases/kernel/syscalls/getcontext/Makefile 2005-05-26 14:38:47.000000000 -0600
-+++ ltp-full-20050707/testcases/kernel/syscalls/getcontext/Makefile 2005-08-02 19:56:11.000000000 -0600
-@@ -24,7 +24,7 @@
- LOADLIBES+= -L../../../../lib -lltp
+diff -ur ltp-full-20061121/testcases/kernel/syscalls/getcontext/Makefile ltp-full-20061121-patched/testcases/kernel/syscalls/getcontext/Makefile
+--- ltp-full-20061121/testcases/kernel/syscalls/getcontext/Makefile 2006-11-21 14:31:27.000000000 -0600
++++ ltp-full-20061121-patched/testcases/kernel/syscalls/getcontext/Makefile 2006-12-02 00:16:50.072004501 -0600
+@@ -20,7 +20,7 @@
+ LDLIBS += -L../../../../lib -lltp
- SRCS=$(wildcard *.c)
--TARGETS=$(patsubst %.c,%,$(SRCS))
-+TARGETS=#$(patsubst %.c,%,$(SRCS))
+ SRCS = $(wildcard *.c)
+-TARGETS = $(patsubst %.c,%,$(SRCS))
++TARGETS =#$(patsubst %.c,%,$(SRCS))
all: $(TARGETS)
---- ltp-full-20050707-dist/testcases/kernel/syscalls/profil/Makefile 2005-07-11 16:28:53.000000000 -0600
-+++ ltp-full-20050707/testcases/kernel/syscalls/profil/Makefile 2005-08-02 19:56:11.000000000 -0600
-@@ -25,7 +25,7 @@
- LOADLIBES+= $(if $(UCLINUX),-lc)
+diff -ur ltp-full-20061121/testcases/kernel/syscalls/profil/Makefile ltp-full-20061121-patched/testcases/kernel/syscalls/profil/Makefile
+--- ltp-full-20061121/testcases/kernel/syscalls/profil/Makefile 2006-11-21 14:31:28.000000000 -0600
++++ ltp-full-20061121-patched/testcases/kernel/syscalls/profil/Makefile 2006-12-02 00:17:03.301059744 -0600
+@@ -20,7 +20,7 @@
+ LDLIBS += -L../../../../lib -lltp
- SRCS=$(wildcard *.c)
--TARGETS=$(patsubst %.c,%,$(SRCS))
-+TARGETS=#$(patsubst %.c,%,$(SRCS))
+ SRCS = $(wildcard *.c)
+-TARGETS = $(patsubst %.c,%,$(SRCS))
++TARGETS =#$(patsubst %.c,%,$(SRCS))
all: $(TARGETS)
---- ltp-full-20050707-dist/testcases/kernel/syscalls/pselect/Makefile 2005-05-26 09:35:58.000000000 -0600
-+++ ltp-full-20050707/testcases/kernel/syscalls/pselect/Makefile 2005-08-02 19:56:11.000000000 -0600
-@@ -24,7 +24,7 @@
- LOADLIBES+= -L../../../../lib -lltp
+diff -ur ltp-full-20061121/testcases/kernel/syscalls/pselect/Makefile ltp-full-20061121-patched/testcases/kernel/syscalls/pselect/Makefile
+--- ltp-full-20061121/testcases/kernel/syscalls/pselect/Makefile 2006-11-21 14:31:29.000000000 -0600
++++ ltp-full-20061121-patched/testcases/kernel/syscalls/pselect/Makefile 2006-12-02 00:17:14.661965984 -0600
+@@ -20,7 +20,7 @@
+ LDLIBS += -L../../../../lib -lltp
- SRCS=$(wildcard *.c)
--TARGETS=$(patsubst %.c,%,$(SRCS))
-+TARGETS=#$(patsubst %.c,%,$(SRCS))
+ SRCS = $(wildcard *.c)
+-TARGETS = $(patsubst %.c,%,$(SRCS))
++TARGETS =#$(patsubst %.c,%,$(SRCS))
all: $(TARGETS)
---- ltp-full-20050707-dist/testcases/kernel/syscalls/swapon/swapon02.c 2005-07-11 16:29:08.000000000 -0600
-+++ ltp-full-20050707/testcases/kernel/syscalls/swapon/swapon02.c 2005-08-02 19:56:38.000000000 -0600
-@@ -86,9 +86,7 @@
+diff -ur ltp-full-20061121/testcases/kernel/syscalls/swapon/swapon02.c ltp-full-20061121-patched/testcases/kernel/syscalls/swapon/swapon02.c
+--- ltp-full-20061121/testcases/kernel/syscalls/swapon/swapon02.c 2006-11-21 14:31:29.000000000 -0600
++++ ltp-full-20061121-patched/testcases/kernel/syscalls/swapon/swapon02.c 2006-12-02 00:18:12.422573631 -0600
+@@ -85,9 +85,7 @@
+ #include <sys/wait.h>
#include <sys/stat.h>
#include <sys/swap.h>
- #include <asm/page.h>
-#ifdef OLDER_DISTRO_RELEASE
-#include <linux/swap.h>
-#endif
-+#define MAX_SWAPFILES 32
++#define MAX_SWAPFILES 32
#include <fcntl.h>
#include <pwd.h>
#include <string.h>
-@@ -97,10 +95,6 @@
+@@ -96,10 +94,6 @@
#include "test.h"
#include "usctest.h"
@@ -66,8 +71,9 @@
static void setup();
static void cleanup();
static int setup01();
---- ltp-full-20050804/testcases/kernel/syscalls/sysfs.orig/sysfs01.c 2005-12-08 18:26:07.000000000 -0700
-+++ ltp-full-20050804/testcases/kernel/syscalls/sysfs/sysfs01.c 2005-12-08 18:28:26.000000000 -0700
+diff -ur ltp-full-20061121/testcases/kernel/syscalls/sysfs/sysfs01.c ltp-full-20061121-patched/testcases/kernel/syscalls/sysfs/sysfs01.c
+--- ltp-full-20061121/testcases/kernel/syscalls/sysfs/sysfs01.c 2006-11-21 14:31:29.000000000 -0600
++++ ltp-full-20061121-patched/testcases/kernel/syscalls/sysfs/sysfs01.c 2006-12-02 00:15:34.705993080 -0600
@@ -72,10 +72,6 @@
#include <unistd.h>
#include <syscall.h>
@@ -79,20 +85,9 @@
static void setup();
static void cleanup();
-@@ -83,11 +79,7 @@
- int TST_TOTAL = 1; /* Total number of test cases. */
- extern int Tst_count; /* Test Case counter for tst_* routines */
-
--#if defined(__ia64__)
- #define sysfs(arg1, arg2) syscall(__NR_sysfs, arg1, arg2)
--#else
--_syscall2(long, sysfs, int, option, const char*, fsname);
--#endif
-
- int
- main(int ac, char **av)
---- ltp-full-20050804/testcases/kernel/syscalls/sysfs.orig/sysfs02.c 2005-08-04 14:33:06.000000000 -0600
-+++ ltp-full-20050804/testcases/kernel/syscalls/sysfs/sysfs02.c 2005-12-08 18:31:00.000000000 -0700
+diff -ur ltp-full-20061121/testcases/kernel/syscalls/sysfs/sysfs02.c ltp-full-20061121-patched/testcases/kernel/syscalls/sysfs/sysfs02.c
+--- ltp-full-20061121/testcases/kernel/syscalls/sysfs/sysfs02.c 2006-11-21 14:31:29.000000000 -0600
++++ ltp-full-20061121-patched/testcases/kernel/syscalls/sysfs/sysfs02.c 2006-12-02 00:15:34.705993080 -0600
@@ -70,10 +70,6 @@
#include <unistd.h>
#include <syscall.h>
@@ -104,20 +99,9 @@
static void setup();
static void cleanup();
-@@ -81,11 +77,7 @@
- int TST_TOTAL = 1; /* Total number of test cases. */
- extern int Tst_count; /* Test Case counter for tst_* routines */
-
--#if defined(__ia64__)
- #define sysfs(arg1, arg2, arg3) syscall(__NR_sysfs, arg1, arg2, arg3)
--#else
--_syscall3(long, sysfs, int, option, unsigned int, arg1, char*, buf);
--#endif
-
- int
- main(int ac, char **av)
---- ltp-full-20050804/testcases/kernel/syscalls/sysfs.orig/sysfs03.c 2005-08-04 14:33:06.000000000 -0600
-+++ ltp-full-20050804/testcases/kernel/syscalls/sysfs/sysfs03.c 2005-12-08 18:31:27.000000000 -0700
+diff -ur ltp-full-20061121/testcases/kernel/syscalls/sysfs/sysfs03.c ltp-full-20061121-patched/testcases/kernel/syscalls/sysfs/sysfs03.c
+--- ltp-full-20061121/testcases/kernel/syscalls/sysfs/sysfs03.c 2006-11-21 14:31:29.000000000 -0600
++++ ltp-full-20061121-patched/testcases/kernel/syscalls/sysfs/sysfs03.c 2006-12-02 00:15:34.705993080 -0600
@@ -70,10 +70,6 @@
#include <unistd.h>
#include <syscall.h>
@@ -129,20 +113,9 @@
static void setup();
static void cleanup();
-@@ -81,11 +77,7 @@
- int TST_TOTAL = 1; /* Total number of test cases. */
- extern int Tst_count; /* Test Case counter for tst_* routines */
-
--#if defined(__ia64__)
- #define sysfs(arg1) syscall(__NR_sysfs, arg1)
--#else
--_syscall1(long, sysfs, int, option);
--#endif
-
- int
- main(int ac, char **av)
---- ltp-full-20050804/testcases/kernel/syscalls/sysfs.orig/sysfs04.c 2005-08-04 14:33:06.000000000 -0600
-+++ ltp-full-20050804/testcases/kernel/syscalls/sysfs/sysfs04.c 2005-12-08 18:31:37.000000000 -0700
+diff -ur ltp-full-20061121/testcases/kernel/syscalls/sysfs/sysfs04.c ltp-full-20061121-patched/testcases/kernel/syscalls/sysfs/sysfs04.c
+--- ltp-full-20061121/testcases/kernel/syscalls/sysfs/sysfs04.c 2006-11-21 14:31:29.000000000 -0600
++++ ltp-full-20061121-patched/testcases/kernel/syscalls/sysfs/sysfs04.c 2006-12-02 00:15:34.705993080 -0600
@@ -73,10 +73,6 @@
#include "test.h"
#include "usctest.h"
@@ -154,21 +127,10 @@
#define INVALID_OPTION 100
static void setup();
static void cleanup();
-@@ -86,11 +82,7 @@
- extern int Tst_count; /* Test Case counter for tst_* routines */
- static int exp_enos[] = {EINVAL, 0};
-
--#if defined(__ia64__)
- #define sysfs(arg1) syscall(__NR_sysfs, arg1)
--#else
--_syscall1(long, sysfs, int, option);
--#endif
-
- int
- main(int ac, char **av)
---- ltp-full-20050804/testcases/kernel/syscalls/sysfs.orig/sysfs05.c 2005-08-04 14:33:06.000000000 -0600
-+++ ltp-full-20050804/testcases/kernel/syscalls/sysfs/sysfs05.c 2005-12-08 18:31:45.000000000 -0700
-@@ -74,18 +74,10 @@
+diff -ur ltp-full-20061121/testcases/kernel/syscalls/sysfs/sysfs05.c ltp-full-20061121-patched/testcases/kernel/syscalls/sysfs/sysfs05.c
+--- ltp-full-20061121/testcases/kernel/syscalls/sysfs/sysfs05.c 2006-11-21 14:31:29.000000000 -0600
++++ ltp-full-20061121-patched/testcases/kernel/syscalls/sysfs/sysfs05.c 2006-12-02 00:22:55.657171949 -0600
+@@ -74,10 +74,6 @@
#include "test.h"
#include "usctest.h"
@@ -179,17 +141,10 @@
static void setup();
static void cleanup();
--#if defined(__ia64__)
- #define sysfs(arg1, arg2) syscall(__NR_sysfs, arg1, arg2)
--#else
--_syscall2(long, sysfs, int, option, const char*, fsname);
--#endif
-
- char *TCID = "sysfs05"; /* Test program identifier. */
- int TST_TOTAL = 3; /* Total number of test cases. */
---- ltp-full-20050804/testcases/kernel/syscalls/sysfs.orig/sysfs06.c 2005-08-04 14:33:06.000000000 -0600
-+++ ltp-full-20050804/testcases/kernel/syscalls/sysfs/sysfs06.c 2005-12-08 18:31:56.000000000 -0700
-@@ -75,18 +75,10 @@
+diff -ur ltp-full-20061121/testcases/kernel/syscalls/sysfs/sysfs06.c ltp-full-20061121-patched/testcases/kernel/syscalls/sysfs/sysfs06.c
+--- ltp-full-20061121/testcases/kernel/syscalls/sysfs/sysfs06.c 2006-11-21 14:31:29.000000000 -0600
++++ ltp-full-20061121-patched/testcases/kernel/syscalls/sysfs/sysfs06.c 2006-12-02 00:22:47.124491054 -0600
+@@ -75,10 +75,6 @@
#include "test.h"
#include "usctest.h"
@@ -200,11 +155,3 @@
static void setup();
static void cleanup();
--#if defined(__ia64__)
- #define sysfs(arg1, arg2, arg3) syscall(__NR_sysfs, arg1, arg2, arg3)
--#else
--_syscall3(long, sysfs, int, option, unsigned int, fs_index, char, bad_addr);
--#endif
-
- char *TCID = "sysfs06"; /* Test program identifier. */
- int TST_TOTAL = 3; /* Total number of test cases. */
^ permalink raw reply [flat|nested] 8+ messages in thread
* [Buildroot] svn commit: trunk/buildroot/package/ltp-testsuite
@ 2006-12-08 5:16 andersen at uclibc.org
0 siblings, 0 replies; 8+ messages in thread
From: andersen at uclibc.org @ 2006-12-08 5:16 UTC (permalink / raw)
To: buildroot
Author: andersen
Date: 2006-12-07 21:16:20 -0800 (Thu, 07 Dec 2006)
New Revision: 16808
Log:
stime is a reserved name, don't let ltp use it for a local variable
Added:
trunk/buildroot/package/ltp-testsuite/ltp-testsuite-stime-is-a-reserved-name.patch
Changeset:
Added: trunk/buildroot/package/ltp-testsuite/ltp-testsuite-stime-is-a-reserved-name.patch
===================================================================
--- trunk/buildroot/package/ltp-testsuite/ltp-testsuite-stime-is-a-reserved-name.patch 2006-12-08 03:39:59 UTC (rev 16807)
+++ trunk/buildroot/package/ltp-testsuite/ltp-testsuite-stime-is-a-reserved-name.patch 2006-12-08 05:16:20 UTC (rev 16808)
@@ -0,0 +1,93 @@
+--- ltp-full-20061121/testcases/misc/math/fptests/fptest01.c.orig 2006-12-07 22:14:38.000000000 -0700
++++ ltp-full-20061121/testcases/misc/math/fptests/fptest01.c 2006-12-07 22:16:08.000000000 -0700
+@@ -84,7 +84,7 @@
+ struct event rtrevent;
+ int waiting[EVENTMX]; /* array of waiting processors */
+ int nwaiting; /* number of waiting processors */
+-double stime; /* global clock */
++double xstime; /* global clock */
+ double lsttime; /* time used for editing */
+ double dtc, dts, alpha; /* timing parameters */
+ int nproc; /* number of processors */
+@@ -133,7 +133,7 @@
+ double dtw, dtwsig;
+
+ ncycle=0;
+- stime=0;
++ xstime=0;
+ lsttime=0;
+ barcnt=0;
+ nwaiting=0;
+@@ -148,7 +148,7 @@
+ }
+
+ for (p=1; p<=nproc; p++) {
+- addevent(ENTERWORK,p,stime);
++ addevent(ENTERWORK,p,xstime);
+ }
+
+ return(0);
+@@ -167,7 +167,7 @@
+ for (i=0; i < nproc; i++)
+ t_total += eventtab[i].time;
+
+- avgspd=ncycle/stime;
++ avgspd=ncycle/xstime;
+
+ v = t_total - MAGIC1;
+ if (v < 0.0)
+@@ -294,33 +294,33 @@
+ double nxttime;
+ int i, p, proc;
+
+- stime = ev->time;
++ xstime = ev->time;
+ proc = ev->proc;
+
+ switch (ev->type) {
+ case TRYCRIT :
+ if (critfree==TRUE)
+- addevent(ENTERCRIT,proc,stime);
++ addevent(ENTERCRIT,proc,xstime);
+ else
+ addwaiting(proc);
+ break;
+ case ENTERCRIT :
+ critfree = FALSE;
+- nxttime=stime+dtcrit();
++ nxttime=xstime+dtcrit();
+ addevent(LEAVECRIT,proc,nxttime);
+ break;
+ case LEAVECRIT :
+ critfree = TRUE;
+- addevent(ATBARRIER,proc,stime);
++ addevent(ATBARRIER,proc,xstime);
+ if ((p=getwaiting())!=0) {
+- nxttime=stime;
++ nxttime=xstime;
+ addevent(ENTERCRIT,p,nxttime);
+ }
+ break;
+ case ATBARRIER :
+ barcnt++;
+ if (barcnt==nproc) {
+- nxttime=stime;
++ nxttime=xstime;
+ for (i=1; i<=nproc; i++) {
+ nxttime+=dtspinoff();
+ addevent(ENTERWORK,i,nxttime);
+@@ -330,12 +330,12 @@
+ }
+ break;
+ case ENTERWORK :
+- nxttime=stime+dtwork();
++ nxttime=xstime+dtwork();
+ if (ncycle<ncycmax)
+ addevent(LEAVEWORK,proc,nxttime);
+ break;
+ case LEAVEWORK :
+- addevent(TRYCRIT,proc,stime);
++ addevent(TRYCRIT,proc,xstime);
+ break;
+ default:
+ tst_resm(TBROK,"Illegal event");
^ permalink raw reply [flat|nested] 8+ messages in thread
* [Buildroot] svn commit: trunk/buildroot/package/ltp-testsuite
@ 2006-12-08 5:20 andersen at uclibc.org
0 siblings, 0 replies; 8+ messages in thread
From: andersen at uclibc.org @ 2006-12-08 5:20 UTC (permalink / raw)
To: buildroot
Author: andersen
Date: 2006-12-07 21:20:37 -0800 (Thu, 07 Dec 2006)
New Revision: 16809
Log:
generate.sh needs bash, so make it to ask for it by name
Added:
trunk/buildroot/package/ltp-testsuite/ltp-testsuite-generate-needs-bash.patch
Changeset:
Added: trunk/buildroot/package/ltp-testsuite/ltp-testsuite-generate-needs-bash.patch
===================================================================
--- trunk/buildroot/package/ltp-testsuite/ltp-testsuite-generate-needs-bash.patch 2006-12-08 05:16:20 UTC (rev 16808)
+++ trunk/buildroot/package/ltp-testsuite/ltp-testsuite-generate-needs-bash.patch 2006-12-08 05:20:37 UTC (rev 16809)
@@ -0,0 +1,8 @@
+--- ltp-full-20061121/testcases/network/generate.sh.orig 2006-12-07 22:21:56.000000000 -0700
++++ ltp-full-20061121/testcases/network/generate.sh 2006-12-07 22:22:05.000000000 -0700
+@@ -1,4 +1,4 @@
+-#!/bin/sh
++#!/bin/bash
+ #
+ # Copyright (c) International Business Machines Corp., 2001
+ #
^ permalink raw reply [flat|nested] 8+ messages in thread
* [Buildroot] svn commit: trunk/buildroot/package/ltp-testsuite
@ 2006-12-08 5:30 andersen at uclibc.org
0 siblings, 0 replies; 8+ messages in thread
From: andersen at uclibc.org @ 2006-12-08 5:30 UTC (permalink / raw)
To: buildroot
Author: andersen
Date: 2006-12-07 21:30:00 -0800 (Thu, 07 Dec 2006)
New Revision: 16812
Log:
sigh
Added:
trunk/buildroot/package/ltp-testsuite/ltp-testsuite-sh-is-not-C-code.patch
Changeset:
Added: trunk/buildroot/package/ltp-testsuite/ltp-testsuite-sh-is-not-C-code.patch
===================================================================
--- trunk/buildroot/package/ltp-testsuite/ltp-testsuite-sh-is-not-C-code.patch 2006-12-08 05:24:59 UTC (rev 16811)
+++ trunk/buildroot/package/ltp-testsuite/ltp-testsuite-sh-is-not-C-code.patch 2006-12-08 05:30:00 UTC (rev 16812)
@@ -0,0 +1,11 @@
+--- ltp-full-20061121/IDcheck.sh.orig 2006-12-07 22:31:29.000000000 -0700
++++ ltp-full-20061121/IDcheck.sh 2006-12-07 22:32:58.000000000 -0700
+@@ -85,7 +85,7 @@
+ fi
+
+ whoami | grep root > /dev/null
+-if [ $? == "0" ]; then
++if [ $? = "0" ]; then
+ I_AM_ROOT=1
+ fi
+
^ permalink raw reply [flat|nested] 8+ messages in thread
* [Buildroot] svn commit: trunk/buildroot/package/ltp-testsuite
@ 2007-05-09 22:59 sjhill at uclibc.org
0 siblings, 0 replies; 8+ messages in thread
From: sjhill at uclibc.org @ 2007-05-09 22:59 UTC (permalink / raw)
To: buildroot
Author: sjhill
Date: 2007-05-09 15:58:59 -0700 (Wed, 09 May 2007)
New Revision: 18599
Log:
Update version of LTP.
Removed:
trunk/buildroot/package/ltp-testsuite/ltp-testsuite-remove-bzero-bcmp.patch
trunk/buildroot/package/ltp-testsuite/ltp-testsuite-stime-is-a-reserved-name.patch
Modified:
trunk/buildroot/package/ltp-testsuite/ltp-testsuite.mk
trunk/buildroot/package/ltp-testsuite/ltp-testsuite.patch
Changeset:
Deleted: trunk/buildroot/package/ltp-testsuite/ltp-testsuite-remove-bzero-bcmp.patch
===================================================================
--- trunk/buildroot/package/ltp-testsuite/ltp-testsuite-remove-bzero-bcmp.patch 2007-05-09 22:48:41 UTC (rev 18598)
+++ trunk/buildroot/package/ltp-testsuite/ltp-testsuite-remove-bzero-bcmp.patch 2007-05-09 22:58:59 UTC (rev 18599)
@@ -1,65 +0,0 @@
-diff -ur ltp-full-20061121/testcases/kernel/fs/fsx-linux/fsx-linux.c ltp-full-20061121-patched/testcases/kernel/fs/fsx-linux/fsx-linux.c
---- ltp-full-20061121/testcases/kernel/fs/fsx-linux/fsx-linux.c 2006-11-21 14:31:29.000000000 -0600
-+++ ltp-full-20061121-patched/testcases/kernel/fs/fsx-linux/fsx-linux.c 2006-12-02 00:35:42.070475329 -0600
-@@ -322,7 +322,7 @@
- unsigned op = 0;
- unsigned bad = 0;
-
-- if (bcmp(good_buf + offset, temp_buf, size) != 0) {
-+ if (memcmp(good_buf + offset, temp_buf, size) != 0) {
- prt("READ BAD DATA: offset = 0x%x, size = 0x%x\n",
- offset, size);
- prt("OFFSET\tGOOD\tBAD\tRANGE\n");
-diff -ur ltp-full-20061121/testcases/kernel/io/ltp-aiodio/fsx-linux.c ltp-full-20061121-patched/testcases/kernel/io/ltp-aiodio/fsx-linux.c
---- ltp-full-20061121/testcases/kernel/io/ltp-aiodio/fsx-linux.c 2006-11-21 14:31:27.000000000 -0600
-+++ ltp-full-20061121-patched/testcases/kernel/io/ltp-aiodio/fsx-linux.c 2006-12-02 00:36:09.496726421 -0600
-@@ -355,7 +355,7 @@
- unsigned op = 0;
- unsigned bad = 0;
-
-- if (bcmp(good_buf + offset, temp_buf, size) != 0) {
-+ if (memcmp(good_buf + offset, temp_buf, size) != 0) {
- prt("READ BAD DATA: offset = 0x%x, size = 0x%x, fname = %s\n",
- offset, size, fname);
- prt("OFFSET\tGOOD\tBAD\tRANGE\n");
-diff -ur ltp-full-20061121/testcases/kernel/syscalls/symlink/symlink01.c ltp-full-20061121-patched/testcases/kernel/syscalls/symlink/symlink01.c
---- ltp-full-20061121/testcases/kernel/syscalls/symlink/symlink01.c 2006-11-21 14:31:28.000000000 -0600
-+++ ltp-full-20061121-patched/testcases/kernel/syscalls/symlink/symlink01.c 2006-12-02 00:36:18.081430964 -0600
-@@ -904,7 +904,7 @@
- "stat(2) failed to return inode information for a regular object file");
- return(0);
- }
-- else if (bcmp((char *)&statter, (char *)&asymlink, sizeof(statter)) != 0) {
-+ else if (memcmp((char *)&statter, (char *)&asymlink, sizeof(statter)) != 0) {
- TEST_RESULT=TFAIL;
- sprintf(test_msg,
- "lstat(2) and stat(2) do not return same inode information for an object file");
-diff -ur ltp-full-20061121/testcases/network/nfs/fsx-linux/fsx-linux.c ltp-full-20061121-patched/testcases/network/nfs/fsx-linux/fsx-linux.c
---- ltp-full-20061121/testcases/network/nfs/fsx-linux/fsx-linux.c 2006-11-21 14:31:24.000000000 -0600
-+++ ltp-full-20061121-patched/testcases/network/nfs/fsx-linux/fsx-linux.c 2006-12-02 00:35:51.495248935 -0600
-@@ -325,7 +325,7 @@
- unsigned op = 0;
- unsigned bad = 0;
-
-- if (bcmp(good_buf + offset, temp_buf, size) != 0) {
-+ if (memcmp(good_buf + offset, temp_buf, size) != 0) {
- prt("READ BAD DATA: offset = 0x%x, size = 0x%x\n",
- offset, size);
- prt("OFFSET\tGOOD\tBAD\tRANGE\n");
-diff -ur ltp-full-20061121/testcases/network/nfsv4/locks/netsync.c ltp-full-20061121-patched/testcases/network/nfsv4/locks/netsync.c
---- ltp-full-20061121/testcases/network/nfsv4/locks/netsync.c 2006-11-21 14:31:27.000000000 -0600
-+++ ltp-full-20061121-patched/testcases/network/nfsv4/locks/netsync.c 2006-12-02 00:38:03.710097050 -0600
-@@ -57,11 +57,11 @@
- perror ("socket");
- exit(1);
- }
-- bzero(&local, sizeof(local));
-+ memset(&local, 0, sizeof(local));
- local.sin_family = AF_INET;
- local.sin_port = htons(PORT);
- local.sin_addr.s_addr = INADDR_ANY;
-- bzero(&(local.sin_zero), 8);
-+ memset(&(local.sin_zero), 0, 8);
-
- if(bind(sock, (struct sockaddr *)&local, sizeof(struct sockaddr))== -1){
- perror("bind");
Deleted: trunk/buildroot/package/ltp-testsuite/ltp-testsuite-stime-is-a-reserved-name.patch
===================================================================
--- trunk/buildroot/package/ltp-testsuite/ltp-testsuite-stime-is-a-reserved-name.patch 2007-05-09 22:48:41 UTC (rev 18598)
+++ trunk/buildroot/package/ltp-testsuite/ltp-testsuite-stime-is-a-reserved-name.patch 2007-05-09 22:58:59 UTC (rev 18599)
@@ -1,93 +0,0 @@
---- ltp-full-20061121/testcases/misc/math/fptests/fptest01.c.orig 2006-12-07 22:14:38.000000000 -0700
-+++ ltp-full-20061121/testcases/misc/math/fptests/fptest01.c 2006-12-07 22:16:08.000000000 -0700
-@@ -84,7 +84,7 @@
- struct event rtrevent;
- int waiting[EVENTMX]; /* array of waiting processors */
- int nwaiting; /* number of waiting processors */
--double stime; /* global clock */
-+double xstime; /* global clock */
- double lsttime; /* time used for editing */
- double dtc, dts, alpha; /* timing parameters */
- int nproc; /* number of processors */
-@@ -133,7 +133,7 @@
- double dtw, dtwsig;
-
- ncycle=0;
-- stime=0;
-+ xstime=0;
- lsttime=0;
- barcnt=0;
- nwaiting=0;
-@@ -148,7 +148,7 @@
- }
-
- for (p=1; p<=nproc; p++) {
-- addevent(ENTERWORK,p,stime);
-+ addevent(ENTERWORK,p,xstime);
- }
-
- return(0);
-@@ -167,7 +167,7 @@
- for (i=0; i < nproc; i++)
- t_total += eventtab[i].time;
-
-- avgspd=ncycle/stime;
-+ avgspd=ncycle/xstime;
-
- v = t_total - MAGIC1;
- if (v < 0.0)
-@@ -294,33 +294,33 @@
- double nxttime;
- int i, p, proc;
-
-- stime = ev->time;
-+ xstime = ev->time;
- proc = ev->proc;
-
- switch (ev->type) {
- case TRYCRIT :
- if (critfree==TRUE)
-- addevent(ENTERCRIT,proc,stime);
-+ addevent(ENTERCRIT,proc,xstime);
- else
- addwaiting(proc);
- break;
- case ENTERCRIT :
- critfree = FALSE;
-- nxttime=stime+dtcrit();
-+ nxttime=xstime+dtcrit();
- addevent(LEAVECRIT,proc,nxttime);
- break;
- case LEAVECRIT :
- critfree = TRUE;
-- addevent(ATBARRIER,proc,stime);
-+ addevent(ATBARRIER,proc,xstime);
- if ((p=getwaiting())!=0) {
-- nxttime=stime;
-+ nxttime=xstime;
- addevent(ENTERCRIT,p,nxttime);
- }
- break;
- case ATBARRIER :
- barcnt++;
- if (barcnt==nproc) {
-- nxttime=stime;
-+ nxttime=xstime;
- for (i=1; i<=nproc; i++) {
- nxttime+=dtspinoff();
- addevent(ENTERWORK,i,nxttime);
-@@ -330,12 +330,12 @@
- }
- break;
- case ENTERWORK :
-- nxttime=stime+dtwork();
-+ nxttime=xstime+dtwork();
- if (ncycle<ncycmax)
- addevent(LEAVEWORK,proc,nxttime);
- break;
- case LEAVEWORK :
-- addevent(TRYCRIT,proc,stime);
-+ addevent(TRYCRIT,proc,xstime);
- break;
- default:
- tst_resm(TBROK,"Illegal event");
Modified: trunk/buildroot/package/ltp-testsuite/ltp-testsuite.mk
===================================================================
--- trunk/buildroot/package/ltp-testsuite/ltp-testsuite.mk 2007-05-09 22:48:41 UTC (rev 18598)
+++ trunk/buildroot/package/ltp-testsuite/ltp-testsuite.mk 2007-05-09 22:58:59 UTC (rev 18599)
@@ -3,7 +3,7 @@
# ltp-testsuite
#
#############################################################
-LTP_TESTSUITE_VERSION:=20061121
+LTP_TESTSUITE_VERSION:=20070228
LTP_TESTSUITE_SOURCE:=ltp-full-$(LTP_TESTSUITE_VERSION).tgz
LTP_TESTSUITE_SITE:=http://$(BR2_SOURCEFORGE_MIRROR).dl.sourceforge.net/sourceforge/ltp
LTP_TESTSUITE_CAT:=$(ZCAT)
@@ -37,6 +37,10 @@
-C $(LTP_TESTSUITE_DIR) all
touch $(LTP_TESTSUITE_DIR)/.compiled
+sjh: $(LTP_TESTSUITE_DIR)/Makefile
+ $(MAKE1) $(TARGET_CONFIGURE_OPTS) CROSS_COMPILER=$(TARGET_CROSS) \
+ -C $(LTP_TESTSUITE_DIR) all
+
$(LTP_TESTSUITE_DIR)/.installed: $(LTP_TESTSUITE_DIR)/.compiled
# Use fakeroot to pretend to do 'make install' as root
echo "$(MAKE1) $(TARGET_CONFIGURE_OPTS) CROSS_COMPILER=$(TARGET_CROSS) " \
Modified: trunk/buildroot/package/ltp-testsuite/ltp-testsuite.patch
===================================================================
--- trunk/buildroot/package/ltp-testsuite/ltp-testsuite.patch 2007-05-09 22:48:41 UTC (rev 18598)
+++ trunk/buildroot/package/ltp-testsuite/ltp-testsuite.patch 2007-05-09 22:58:59 UTC (rev 18599)
@@ -71,87 +71,3 @@
static void setup();
static void cleanup();
static int setup01();
-diff -ur ltp-full-20061121/testcases/kernel/syscalls/sysfs/sysfs01.c ltp-full-20061121-patched/testcases/kernel/syscalls/sysfs/sysfs01.c
---- ltp-full-20061121/testcases/kernel/syscalls/sysfs/sysfs01.c 2006-11-21 14:31:29.000000000 -0600
-+++ ltp-full-20061121-patched/testcases/kernel/syscalls/sysfs/sysfs01.c 2006-12-02 00:15:34.705993080 -0600
-@@ -72,10 +72,6 @@
- #include <unistd.h>
- #include <syscall.h>
-
--#ifndef _syscall2
--#include <linux/unistd.h>
--#endif
--
- static void setup();
- static void cleanup();
-
-diff -ur ltp-full-20061121/testcases/kernel/syscalls/sysfs/sysfs02.c ltp-full-20061121-patched/testcases/kernel/syscalls/sysfs/sysfs02.c
---- ltp-full-20061121/testcases/kernel/syscalls/sysfs/sysfs02.c 2006-11-21 14:31:29.000000000 -0600
-+++ ltp-full-20061121-patched/testcases/kernel/syscalls/sysfs/sysfs02.c 2006-12-02 00:15:34.705993080 -0600
-@@ -70,10 +70,6 @@
- #include <unistd.h>
- #include <syscall.h>
-
--#ifndef _syscall2
--#include <linux/unistd.h>
--#endif
--
- static void setup();
- static void cleanup();
-
-diff -ur ltp-full-20061121/testcases/kernel/syscalls/sysfs/sysfs03.c ltp-full-20061121-patched/testcases/kernel/syscalls/sysfs/sysfs03.c
---- ltp-full-20061121/testcases/kernel/syscalls/sysfs/sysfs03.c 2006-11-21 14:31:29.000000000 -0600
-+++ ltp-full-20061121-patched/testcases/kernel/syscalls/sysfs/sysfs03.c 2006-12-02 00:15:34.705993080 -0600
-@@ -70,10 +70,6 @@
- #include <unistd.h>
- #include <syscall.h>
-
--#ifndef _syscall2
--#include <linux/unistd.h>
--#endif
--
- static void setup();
- static void cleanup();
-
-diff -ur ltp-full-20061121/testcases/kernel/syscalls/sysfs/sysfs04.c ltp-full-20061121-patched/testcases/kernel/syscalls/sysfs/sysfs04.c
---- ltp-full-20061121/testcases/kernel/syscalls/sysfs/sysfs04.c 2006-11-21 14:31:29.000000000 -0600
-+++ ltp-full-20061121-patched/testcases/kernel/syscalls/sysfs/sysfs04.c 2006-12-02 00:15:34.705993080 -0600
-@@ -73,10 +73,6 @@
- #include "test.h"
- #include "usctest.h"
-
--#ifndef _syscall2
--#include <linux/unistd.h>
--#endif
--
- #define INVALID_OPTION 100
- static void setup();
- static void cleanup();
-diff -ur ltp-full-20061121/testcases/kernel/syscalls/sysfs/sysfs05.c ltp-full-20061121-patched/testcases/kernel/syscalls/sysfs/sysfs05.c
---- ltp-full-20061121/testcases/kernel/syscalls/sysfs/sysfs05.c 2006-11-21 14:31:29.000000000 -0600
-+++ ltp-full-20061121-patched/testcases/kernel/syscalls/sysfs/sysfs05.c 2006-12-02 00:22:55.657171949 -0600
-@@ -74,10 +74,6 @@
- #include "test.h"
- #include "usctest.h"
-
--#ifndef _syscall2
--#include <linux/unistd.h>
--#endif
--
- static void setup();
- static void cleanup();
-
-diff -ur ltp-full-20061121/testcases/kernel/syscalls/sysfs/sysfs06.c ltp-full-20061121-patched/testcases/kernel/syscalls/sysfs/sysfs06.c
---- ltp-full-20061121/testcases/kernel/syscalls/sysfs/sysfs06.c 2006-11-21 14:31:29.000000000 -0600
-+++ ltp-full-20061121-patched/testcases/kernel/syscalls/sysfs/sysfs06.c 2006-12-02 00:22:47.124491054 -0600
-@@ -75,10 +75,6 @@
- #include "test.h"
- #include "usctest.h"
-
--#ifndef _syscall2
--#include <linux/unistd.h>
--#endif
--
- static void setup();
- static void cleanup();
-
^ permalink raw reply [flat|nested] 8+ messages in thread
* [Buildroot] svn commit: trunk/buildroot/package/ltp-testsuite
@ 2007-06-06 18:10 aldot at uclibc.org
0 siblings, 0 replies; 8+ messages in thread
From: aldot at uclibc.org @ 2007-06-06 18:10 UTC (permalink / raw)
To: buildroot
Author: aldot
Date: 2007-06-06 11:10:48 -0700 (Wed, 06 Jun 2007)
New Revision: 18756
Log:
- make sure to have the target-dir where we want to unpack ltp to
Modified:
trunk/buildroot/package/ltp-testsuite/ltp-testsuite.mk
Changeset:
Modified: trunk/buildroot/package/ltp-testsuite/ltp-testsuite.mk
===================================================================
--- trunk/buildroot/package/ltp-testsuite/ltp-testsuite.mk 2007-06-06 18:10:14 UTC (rev 18755)
+++ trunk/buildroot/package/ltp-testsuite/ltp-testsuite.mk 2007-06-06 18:10:48 UTC (rev 18756)
@@ -28,14 +28,15 @@
ltp-testsuite-source: $(DL_DIR)/$(LTP_TESTSUITE_SOURCE)
$(LTP_TESTSUITE_DIR)/Makefile: $(DL_DIR)/$(LTP_TESTSUITE_SOURCE)
+ -mkdir -p $(LTP_TESTSUITE_ROOT)
$(LTP_TESTSUITE_CAT) $(DL_DIR)/$(LTP_TESTSUITE_SOURCE) | tar -C $(LTP_TESTSUITE_ROOT) $(TAR_OPTIONS) -
toolchain/patch-kernel.sh $(LTP_TESTSUITE_DIR) package/ltp-testsuite/ $(LTP_PATCHES)
- touch -c $(LTP_TESTSUITE_DIR)/Makefile
+ touch -c $@
$(LTP_TESTSUITE_DIR)/.compiled: $(LTP_TESTSUITE_DIR)/Makefile
$(MAKE1) $(TARGET_CONFIGURE_OPTS) CROSS_COMPILER=$(TARGET_CROSS) \
-C $(LTP_TESTSUITE_DIR) all
- touch $(LTP_TESTSUITE_DIR)/.compiled
+ touch $@
sjh: $(LTP_TESTSUITE_DIR)/Makefile
$(MAKE1) $(TARGET_CONFIGURE_OPTS) CROSS_COMPILER=$(TARGET_CROSS) \
@@ -46,7 +47,7 @@
echo "$(MAKE1) $(TARGET_CONFIGURE_OPTS) CROSS_COMPILER=$(TARGET_CROSS) " \
"-C $(LTP_TESTSUITE_DIR) install" \
> $(STAGING_DIR)/.fakeroot.ltp
- touch $(LTP_TESTSUITE_DIR)/.installed
+ touch $@
ltp-testsuite: uclibc host-fakeroot $(LTP_TESTSUITE_DIR)/.installed
^ permalink raw reply [flat|nested] 8+ messages in thread
* [Buildroot] svn commit: trunk/buildroot/package/ltp-testsuite
@ 2007-06-16 18:27 sjhill at uclibc.org
0 siblings, 0 replies; 8+ messages in thread
From: sjhill at uclibc.org @ 2007-06-16 18:27 UTC (permalink / raw)
To: buildroot
Author: sjhill
Date: 2007-06-16 11:27:38 -0700 (Sat, 16 Jun 2007)
New Revision: 18836
Log:
If external toolchain support NPTL, then we should build Open POSIX Testsuite if the user selects us.
Modified:
trunk/buildroot/package/ltp-testsuite/ltp-testsuite.mk
Changeset:
Modified: trunk/buildroot/package/ltp-testsuite/ltp-testsuite.mk
===================================================================
--- trunk/buildroot/package/ltp-testsuite/ltp-testsuite.mk 2007-06-16 17:56:05 UTC (rev 18835)
+++ trunk/buildroot/package/ltp-testsuite/ltp-testsuite.mk 2007-06-16 18:27:38 UTC (rev 18836)
@@ -16,9 +16,12 @@
#
LTP_PATCHES:=$(subst package/ltp-testsuite/,, \
$(wildcard package/ltp-testsuite/*.patch))
+
ifneq ($(BR2_PTHREADS_NATIVE),y)
+ ifneq ($(BR2_EXT_PTHREADS_NATIVE),y)
LTP_PATCHES:=$(filter-out ltp-testsuite-enable-openposix-for-nptl.patch, \
$(LTP_PATCHES))
+ endif
endif
^ permalink raw reply [flat|nested] 8+ messages in thread
* [Buildroot] svn commit: trunk/buildroot/package/ltp-testsuite
@ 2007-07-06 4:21 sjhill at uclibc.org
0 siblings, 0 replies; 8+ messages in thread
From: sjhill at uclibc.org @ 2007-07-06 4:21 UTC (permalink / raw)
To: buildroot
Author: sjhill
Date: 2007-07-05 21:21:22 -0700 (Thu, 05 Jul 2007)
New Revision: 19007
Log:
Fix patch filtering and add new patch to disable tests for IPv6 when not selected.
Added:
trunk/buildroot/package/ltp-testsuite/ltp-testsuite-disable-ipv6-tests.patch
Modified:
trunk/buildroot/package/ltp-testsuite/ltp-testsuite.mk
Changeset:
Added: trunk/buildroot/package/ltp-testsuite/ltp-testsuite-disable-ipv6-tests.patch
===================================================================
--- trunk/buildroot/package/ltp-testsuite/ltp-testsuite-disable-ipv6-tests.patch (rev 0)
+++ trunk/buildroot/package/ltp-testsuite/ltp-testsuite-disable-ipv6-tests.patch 2007-07-06 04:21:22 UTC (rev 19007)
@@ -0,0 +1,123 @@
+diff -ur ltp-full-20070228/testcases/network/sctp/func_tests/Makefile ltp-full-20070228-patched/testcases/network/sctp/func_tests/Makefile
+--- ltp-full-20070228/testcases/network/sctp/func_tests/Makefile 2007-02-28 22:40:32.000000000 -0600
++++ ltp-full-20070228-patched/testcases/network/sctp/func_tests/Makefile 2007-07-05 22:40:08.524219814 -0500
+@@ -26,8 +26,6 @@
+
+ LOADLIBES += $(LIBS) -lltp -lsctputil -lsctp -lpthread
+
+-V6FLAGS = -DTEST_V6=1 $(CFLAGS)
+-
+ SRCS = $(wildcard *.c)
+
+ V4_TARGETS = test_1_to_1_accept_close test_1_to_1_addrs test_1_to_1_connect \
+@@ -42,11 +40,7 @@
+ test_sctp_sendrecvmsg test_sockopt test_tcp_style \
+ test_timetolive test_1_to_1_connectx test_connectx
+
+-V6_TARGETS = test_basic_v6 test_fragments_v6 test_getname_v6 \
+- test_inaddr_any_v6 test_peeloff_v6 test_sctp_sendrecvmsg_v6 \
+- test_sockopt_v6 test_tcp_style_v6 test_timetolive_v6
+-
+-all: $(V4_TARGETS) $(V6_TARGETS)
++all: $(V4_TARGETS)
+
+ test_1_to_1_accept_close: test_1_to_1_accept_close.c
+ test_1_to_1_addrs: test_1_to_1_addrs.c
+@@ -68,47 +62,19 @@
+ test_assoc_shutdown: test_assoc_shutdown.c
+ test_autoclose: test_autoclose.c
+ test_basic: test_basic.c
+-test_basic_v6: test_basic_v6.o
+ test_connect: test_connect.c
+ test_fragments: test_fragments.c
+-test_fragments_v6: test_fragments_v6.o
+ test_getname: test_getname.c
+-test_getname_v6: test_getname_v6.o
+ test_inaddr_any: test_inaddr_any.c
+-test_inaddr_any_v6: test_inaddr_any_v6.o
+ test_peeloff: test_peeloff.c
+-test_peeloff_v6: test_peeloff_v6.o
+ test_recvmsg: test_recvmsg.c
+ test_sctp_sendrecvmsg: test_sctp_sendrecvmsg.c
+-test_sctp_sendrecvmsg_v6: test_sctp_sendrecvmsg_v6.o
+ test_sockopt: test_sockopt.c
+-test_sockopt_v6: test_sockopt_v6.o
+ test_tcp_style: test_tcp_style.c
+-test_tcp_style_v6: test_tcp_style_v6.o
+ test_timetolive: test_timetolive.c
+-test_timetolive_v6: test_timetolive_v6.o
+ test_1_to_1_connectx: test_1_to_1_connectx.c
+ test_connectx: test_connectx.c
+
+-test_basic_v6.o: test_basic.c
+- $(CC) -c $(V6FLAGS) -o $@ $^
+-test_fragments_v6.o: test_fragments.c
+- $(CC) -c $(V6FLAGS) -o $@ $^
+-test_getname_v6.o: test_getname.c
+- $(CC) -c $(V6FLAGS) -o $@ $^
+-test_inaddr_any_v6.o: test_inaddr_any.c
+- $(CC) -c $(V6FLAGS) -o $@ $^
+-test_peeloff_v6.o: test_peeloff.c
+- $(CC) -c $(V6FLAGS) -o $@ $^
+-test_sctp_sendrecvmsg_v6.o: test_sctp_sendrecvmsg.c
+- $(CC) -c $(V6FLAGS) -o $@ $^
+-test_sockopt_v6.o: test_sockopt.c
+- $(CC) -c $(V6FLAGS) -o $@ $^
+-test_tcp_style_v6.o: test_tcp_style.c
+- $(CC) -c $(V6FLAGS) -o $@ $^
+-test_timetolive_v6.o: test_timetolive.c
+- $(CC) -c $(V6FLAGS) -o $@ $^
+-
+ v4test: ${V4_TARGETS}
+ @for a in $^; \
+ do \
+@@ -123,26 +89,9 @@
+ fi; \
+ done
+
+-v6test: ${V6_TARGETS}
+- @for a in $^; \
+- do \
+- echo "./$$a"; \
+- if ./$$a; \
+- then \
+- echo "$$a passes"; \
+- echo ""; \
+- else \
+- echo "$$a fails"; \
+- exit 1; \
+- fi; \
+- done
+-
+ install:
+ ln -f $(V4_TARGETS) ../../../bin
+- ln -f $(V6_TARGETS) ../../../bin
+
+ clean:
+ rm -f $(V4_TARGETS)
+- rm -f $(V6_TARGETS)
+- rm -f ../../../bin/$(V6_TARGETS)
+ rm -f *.o
+diff -ur ltp-full-20070228/testcases/network/stress/ns-tools/Makefile ltp-full-20070228-patched/testcases/network/stress/ns-tools/Makefile
+--- ltp-full-20070228/testcases/network/stress/ns-tools/Makefile 2007-02-28 22:40:31.000000000 -0600
++++ ltp-full-20070228-patched/testcases/network/stress/ns-tools/Makefile 2007-07-05 22:39:27.593059603 -0500
+@@ -10,9 +10,8 @@
+ ns-echoclient
+
+ BINS=ns-tcpserver ns-tcpclient ns-udpserver ns-udpclient \
+- ns-icmpv4_sender ns-icmpv6_sender \
++ ns-icmpv4_sender \
+ ns-udpsender \
+- ns-icmp_redirector \
+ ns-mcast_receiver ns-igmp_querier \
+ ns-mcast_join
+
+diff -ur ltp-full-20070228/tools/Makefile ltp-full-20070228-patched/tools/Makefile
+--- ltp-full-20070228/tools/Makefile 2007-02-28 22:40:41.000000000 -0600
++++ ltp-full-20070228-patched/tools/Makefile 2007-07-05 22:39:27.593059603 -0500
+@@ -1,4 +1,4 @@
+-SUBDIRS = apicmds genload netpipe-2.4 netpipe-2.4-ipv6 #top-LTP
++SUBDIRS = apicmds genload netpipe-2.4 #top-LTP
+
+ CFLAGS+= -Wall -I../include
+ LOADLIBES+= -L../lib -lltp
Modified: trunk/buildroot/package/ltp-testsuite/ltp-testsuite.mk
===================================================================
--- trunk/buildroot/package/ltp-testsuite/ltp-testsuite.mk 2007-07-05 17:56:24 UTC (rev 19006)
+++ trunk/buildroot/package/ltp-testsuite/ltp-testsuite.mk 2007-07-06 04:21:22 UTC (rev 19007)
@@ -11,20 +11,22 @@
LTP_TESTSUITE_DIR:=$(LTP_TESTSUITE_ROOT)/ltp-full-$(LTP_TESTSUITE_VERSION)
#
-# We enable Open POSIX Testsuite if Native POSIX Threads Library (NPTL)
-# is selected. Otherwise, we filter out the patch for it.
+# Enable patches based upon different toolchain configuration options.
#
-LTP_PATCHES:=$(subst package/ltp-testsuite/,, \
- $(wildcard package/ltp-testsuite/*.patch))
+LTP_PATCHES:=ltp-testsuite-generate-needs-bash.patch \
+ ltp-testsuite-sh-is-not-C-code.patch \
+ ltp-testsuite.patch
-ifneq ($(BR2_PTHREADS_NATIVE),y)
- ifneq ($(BR2_EXT_PTHREADS_NATIVE),y)
-LTP_PATCHES:=$(filter-out ltp-testsuite-enable-openposix-for-nptl.patch, \
- $(LTP_PATCHES))
- endif
+ifeq ($(BR2_PTHREADS_NATIVE),y)
+LTP_PATCHES+=ltp-testsuite-enable-openposix-for-nptl.patch
endif
+ifeq ($(BR2_EXT_PTHREADS_NATIVE),y)
+LTP_PATCHES+=ltp-testsuite-enable-openposix-for-nptl.patch
+endif
+ifneq ($(BR2_INET_IPV6),y)
+LTP_PATCHES+=ltp-testsuite-disable-ipv6-tests.patch
+endif
-
$(DL_DIR)/$(LTP_TESTSUITE_SOURCE):
$(WGET) -P $(DL_DIR) $(LTP_TESTSUITE_SITE)/$(LTP_TESTSUITE_SOURCE)
@@ -41,10 +43,6 @@
-C $(LTP_TESTSUITE_DIR) all
touch $@
-sjh: $(LTP_TESTSUITE_DIR)/Makefile
- $(MAKE1) $(TARGET_CONFIGURE_OPTS) CROSS_COMPILER=$(TARGET_CROSS) \
- -C $(LTP_TESTSUITE_DIR) all
-
$(LTP_TESTSUITE_DIR)/.installed: $(LTP_TESTSUITE_DIR)/.compiled
# Use fakeroot to pretend to do 'make install' as root
echo '$(MAKE1) $(TARGET_CONFIGURE_OPTS) CROSS_COMPILER=$(TARGET_CROSS) ' \
^ permalink raw reply [flat|nested] 8+ messages in thread
end of thread, other threads:[~2007-07-06 4:21 UTC | newest]
Thread overview: 8+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2007-06-16 18:27 [Buildroot] svn commit: trunk/buildroot/package/ltp-testsuite sjhill at uclibc.org
-- strict thread matches above, loose matches on Subject: below --
2007-07-06 4:21 sjhill at uclibc.org
2007-06-06 18:10 aldot at uclibc.org
2007-05-09 22:59 sjhill at uclibc.org
2006-12-08 5:30 andersen at uclibc.org
2006-12-08 5:20 andersen at uclibc.org
2006-12-08 5:16 andersen at uclibc.org
2006-12-02 6:42 sjhill at uclibc.org
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox