Hi ! After the patch from Roy moveing the libtestsuite code from /testcases/kernel/syscalls/lib to /lib, the code in the old directory has not been removed. Moreover, include PATH in some makefile was still pointing to this old directory.
This patch remove libtestsuite code from the old directory and remove deprecated references to this old dir in some Makefiles. Subrata : you should probably remove the old dir from the CVS repository. However, removing a directory is always painfull with CVS ! Regards. R. -- Renaud Lottiaux Kerlabs Bâtiment Germanium 80, avenue des buttes de Coësmes 35700 Rennes - France Phone : (+33|0)6 80 89 19 34 Fax : (+33|0)2 99 84 71 71 Email : [EMAIL PROTECTED] Web : http://www.kerlabs.com/
Index: cvs/testcases/kernel/syscalls/lib/libtestsuite.c
===================================================================
--- cvs.orig/testcases/kernel/syscalls/lib/libtestsuite.c 2008-06-02 17:40:34.000000000 +0200
+++ /dev/null 1970-01-01 00:00:00.000000000 +0000
@@ -1,111 +0,0 @@
-/*
- *
- * Copyright (c) International Business Machines Corp., 2001
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See
- * the GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
- */
-
-/*
- * NAME
- * libtestsuite.c
- *
- * DESCRIPTION
- * file containing generic routines which are used by some of the LTP
- * testsuite tests. Currently, the following routines are present in
- * this library:
- *
- * my_getpwnam(), do_file_setup()
- *
- * HISTORY
- * 11/03/2008 Renaud Lottiaux ([EMAIL PROTECTED])
- * - Add the following functions to synchronise father and sons processes
- * sync_pipe_create(), sync_pipe_wait(), sync_pipe_notify()
- */
-#include <unistd.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <pwd.h>
-#include <errno.h>
-#include <fcntl.h>
-
-#include "test.h"
-#include "usctest.h"
-
-struct passwd *
-my_getpwnam(char *name)
-{
- struct passwd *saved_pwent;
- struct passwd *pwent;
-
- if ((pwent = getpwnam(name)) == NULL) {
- perror("getpwnam");
- tst_brkm(TBROK, NULL, "getpwnam() failed");
- }
- saved_pwent = (struct passwd *)malloc(sizeof(struct passwd));
-
- *saved_pwent = *pwent;
-
- return(saved_pwent);
-}
-
-void
-do_file_setup(char *fname)
-{
- int fd;
-
- if ((fd = open(fname,O_RDWR|O_CREAT,0700)) == -1) {
- tst_resm(TBROK, "open(%s, O_RDWR|O_CREAT,0700) Failed, "
- "errno=%d : %s", fname, errno, strerror(errno));
- }
-
- if (close(fd) == -1) {
- tst_resm(TWARN, "close(%s) Failed on file create, errno=%d : "
- "%s", fname, errno, strerror(errno));
- }
-}
-
-int sync_pipe_create(int fd[])
-{
- return pipe (fd);
-}
-
-int sync_pipe_close(int fd[])
-{
- return close (fd[0]) || close (fd[1]);
-}
-
-int sync_pipe_wait(int fd[])
-{
- char buf;
- int r;
-
- r = read (fd[0], &buf, 1);
-
- if ((r != 1) || (buf != 'A'))
- return -1;
- return 0;
-}
-
-int sync_pipe_notify(int fd[])
-{
- char buf = 'A';
- int r;
-
- r = write (fd[1], &buf, 1);
-
- if (r != 1)
- return -1;
- return 0;
-}
Index: cvs/testcases/kernel/syscalls/lib/libtestsuite.h
===================================================================
--- cvs.orig/testcases/kernel/syscalls/lib/libtestsuite.h 2008-06-02 17:40:34.000000000 +0200
+++ /dev/null 1970-01-01 00:00:00.000000000 +0000
@@ -1,12 +0,0 @@
-/* The following functions are used to synchronize father and sons processes.
- *
- * create_sync_pipes: create pipes used for the synchronization. Must be done
- * by father process before a fork.
- *
- * wait_son_startup: wait a son process to reach the "notify_startup" function.
- *
- * notify_startup: notify the father process a son has started its execution.
- */
-int sync_pipe_create( int fd[]);
-int sync_pipe_wait( int fd[]);
-int sync_pipe_notify( int fd[]);
Index: cvs/testcases/kernel/syscalls/ipc/msgrcv/Makefile
===================================================================
--- cvs.orig/testcases/kernel/syscalls/ipc/msgrcv/Makefile 2008-06-02 17:13:10.000000000 +0200
+++ cvs/testcases/kernel/syscalls/ipc/msgrcv/Makefile 2008-06-02 17:40:46.000000000 +0200
@@ -16,7 +16,7 @@
# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
#
-CFLAGS += -I../lib -I../../lib -I../../../../../include -Wall
+CFLAGS += -I../lib -I../../../../../include -Wall
LDLIBS += -L../../../../../lib -lltp -L.. -lipc
SRCS = $(wildcard *.c)
Index: cvs/testcases/kernel/syscalls/ipc/semctl/Makefile
===================================================================
--- cvs.orig/testcases/kernel/syscalls/ipc/semctl/Makefile 2008-06-02 17:13:10.000000000 +0200
+++ cvs/testcases/kernel/syscalls/ipc/semctl/Makefile 2008-06-02 17:40:46.000000000 +0200
@@ -16,7 +16,7 @@
# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
#
-CFLAGS += -I../lib -I../../lib -I../../../../../include -Wall
+CFLAGS += -I../lib -I../../../../../include -Wall
LDLIBS += -L../../../../../lib -lltp -L.. -lipc
SRCS = $(wildcard *.c)
Index: cvs/testcases/kernel/syscalls/ipc/msgsnd/Makefile
===================================================================
--- cvs.orig/testcases/kernel/syscalls/ipc/msgsnd/Makefile 2008-06-02 17:13:10.000000000 +0200
+++ cvs/testcases/kernel/syscalls/ipc/msgsnd/Makefile 2008-06-02 17:40:46.000000000 +0200
@@ -16,7 +16,7 @@
# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
#
-CFLAGS += -I../lib -I../../lib -I../../../../../include -Wall
+CFLAGS += -I../lib -I../../../../../include -Wall
LDLIBS += -L../../../../../lib -lltp -L.. -lipc
SRCS = $(wildcard *.c)
Index: cvs/testcases/kernel/syscalls/ipc/semop/Makefile
===================================================================
--- cvs.orig/testcases/kernel/syscalls/ipc/semop/Makefile 2008-06-02 17:13:10.000000000 +0200
+++ cvs/testcases/kernel/syscalls/ipc/semop/Makefile 2008-06-02 17:40:46.000000000 +0200
@@ -16,7 +16,7 @@
# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
#
-CFLAGS += -I../lib -I../../lib -I../../../../../include -Wall
+CFLAGS += -I../lib -I../../../../../include -Wall
LDLIBS += -L../../../../../lib -lltp -L.. -lipc
SRCS = $(wildcard *.c)
Index: cvs/testcases/kernel/syscalls/ipc/shmctl/Makefile
===================================================================
--- cvs.orig/testcases/kernel/syscalls/ipc/shmctl/Makefile 2008-06-02 17:13:10.000000000 +0200
+++ cvs/testcases/kernel/syscalls/ipc/shmctl/Makefile 2008-06-02 17:40:46.000000000 +0200
@@ -16,7 +16,7 @@
# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
#
-CFLAGS += -I../lib -I../../lib -I../../../../../include -Wall
+CFLAGS += -I../lib -I../../../../../include -Wall
LDLIBS += -L../../../../../lib -lltp -L.. -lipc
SRCS = $(wildcard *.c)
Index: cvs/testcases/kernel/syscalls/ipc/msgrcv/msgrcv05.c
===================================================================
--- cvs.orig/testcases/kernel/syscalls/ipc/msgrcv/msgrcv05.c 2008-06-02 17:13:10.000000000 +0200
+++ cvs/testcases/kernel/syscalls/ipc/msgrcv/msgrcv05.c 2008-06-02 17:40:46.000000000 +0200
@@ -59,6 +59,7 @@
#include "usctest.h"
#include "ipcmsg.h"
+#include "libtestsuite.h"
#include <sys/types.h>
#include <sys/wait.h>
Index: cvs/testcases/kernel/syscalls/ipc/msgsnd/msgsnd06.c
===================================================================
--- cvs.orig/testcases/kernel/syscalls/ipc/msgsnd/msgsnd06.c 2008-06-02 17:13:10.000000000 +0200
+++ cvs/testcases/kernel/syscalls/ipc/msgsnd/msgsnd06.c 2008-06-02 17:40:46.000000000 +0200
@@ -64,6 +64,7 @@
#include "usctest.h"
#include "ipcmsg.h"
+#include "libtestsuite.h"
void cleanup(void);
void setup(void);
Index: cvs/testcases/kernel/syscalls/lib/Makefile
===================================================================
--- cvs.orig/testcases/kernel/syscalls/lib/Makefile 2008-06-02 17:40:54.000000000 +0200
+++ /dev/null 1970-01-01 00:00:00.000000000 +0000
@@ -1,34 +0,0 @@
-#
-# Copyright (c) International Business Machines Corp., 2001
-#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2 of the License, or
-# (at your option) any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See
-# the GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
-#
-
-DIR=lib
-CFLAGS += -I../../../../include -Wall
-CFLAGS += -D_USC_LIB_
-SRC=libtestsuite.c
-OBJS=$(SRC:.c=.o)
-MAINS=../libtestsuite.a
-
-all: ../libtestsuite.a
-
-../libtestsuite.a: $(OBJS)
- $(AR) -rc $@ $(OBJS)
-
-install:
-
-clean:
- rm -f $(OBJS) ../libtestsuite.a
signature.asc
Description: This is a digitally signed message part.
------------------------------------------------------------------------- This SF.net email is sponsored by: Microsoft Defy all challenges. Microsoft(R) Visual Studio 2008. http://clk.atdmt.com/MRT/go/vse0120000070mrt/direct/01/
_______________________________________________ Ltp-list mailing list [email protected] https://lists.sourceforge.net/lists/listinfo/ltp-list
