On Thu, 2008-09-04 at 08:49 -0500, Serge E. Hallyn wrote:
> Quoting Matt Helsley ([EMAIL PROTECTED]):
> > Now that they are in it's best to drop the noltp junk leftover from the LTP
> > port
> > of the container tests.
> >
> > Signed-off-by: Matt Helsley <[EMAIL PROTECTED]>
>
> Acked-by: Serge Hallyn <[EMAIL PROTECTED]>
Merged-By: Subrata Modak <[EMAIL PROTECTED]>
>
> > Cc: Veerendra Chandrappa <[EMAIL PROTECTED]>
> > Cc: Sudhir Kumar15 <[EMAIL PROTECTED]>
> > Cc: Subrata Modak <[EMAIL PROTECTED]>
> > Cc: Serge E. Hallyn <[EMAIL PROTECTED]>
> > ---
> > testcases/kernel/containers/Makefile | 3 -
> > testcases/kernel/containers/libclone/Makefile | 4 -
> > testcases/kernel/containers/pidns/Makefile | 13 -----
> > testcases/kernel/containers/pidns/pidns01.c | 16 -------
> > testcases/kernel/containers/pidns/pidns02.c | 16 -------
> > testcases/kernel/containers/pidns/pidns03.c | 17 -------
> > testcases/kernel/containers/pidns/runtests_noltp.sh | 39
> > -----------------
> > testcases/kernel/containers/sysvipc/Makefile | 11 ----
> > testcases/kernel/containers/sysvipc/runtests_noltp.sh | 31 -------------
> > testcases/kernel/containers/sysvipc/shmnstest.c | 12 -----
> > testcases/kernel/containers/utsname/Makefile | 12 -----
> > testcases/kernel/containers/utsname/runtests_noltp.sh | 41
> > ------------------
> > testcases/kernel/containers/utsname/utstest.c | 11 ----
> > 13 files changed, 4 insertions(+), 222 deletions(-)
> >
> > Index: ltp-20080902/testcases/kernel/containers/utsname/runtests_noltp.sh
> > ===================================================================
> > --- ltp-20080902.orig/testcases/kernel/containers/utsname/runtests_noltp.sh
> > +++ /dev/null
> > @@ -1,41 +0,0 @@
> > -#!/bin/sh
> > -################################################################################
> > -##
> > ##
> > -## Copyright (c) International Business Machines Corp., 2007
> > ##
> > -##
> > ##
> > -## 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
> > ##
> > -##
> > ##
> > -################################################################################
> > -
> > -oldhostname=`hostname`
> > -exit_code=0
> > -echo "unshare tests"
> > -for i in `seq 1 5`; do
> > - echo "test $i (unshare)"
> > - ./utstest_noltp unshare $i
> > - if [ $? -ne 0 ]; then
> > - exit_code=$?
> > - fi
> > -done
> > -echo "clone tests"
> > -for i in `seq 1 5`; do
> > - echo "test $i (clone)"
> > - ./utstest_noltp clone $i
> > - if [ $? -ne 0 ]; then
> > - exit_code=$?
> > - fi
> > -done
> > -hostname "$oldhostname"
> > -exit $exit_code
> > Index: ltp-20080902/testcases/kernel/containers/utsname/Makefile
> > ===================================================================
> > --- ltp-20080902.orig/testcases/kernel/containers/utsname/Makefile
> > +++ ltp-20080902/testcases/kernel/containers/utsname/Makefile
> > @@ -23,27 +23,17 @@ CPPFLAGS += -I../../../../include -I../l
> > LDLIBS += -L../../../../lib -L../libclone ../libclone/libclone.a -lltp
> >
> > SRCS = $(wildcard *.c)
> > -NOLTPSRCS = utstest.c
> > TARGETS = $(patsubst %.c,%,$(SRCS))
> > -NOLTP_TARGETS = $(patsubst %.c,%_noltp,$(NOLTPSRCS))
> >
> > HAS_UNSHARE ?= $(shell ../check_for_unshare && echo y)
> > ifneq ($(HAS_UNSHARE),y)
> > TARGETS :=
> > endif
> >
> > -%_noltp : %.c
> > - $(CC) -g -DNO_LTP -o $@ $< ../libclone/libclone.a
> > -
> > all: $(TARGETS)
> >
> > -noltp: $(NOLTP_TARGETS)
> > -
> > clean:
> > - rm -f $(TARGETS) *.o $(NOLTP_TARGETS)
> > + rm -f $(TARGETS) *.o
> >
> > install:
> > @set -e; for i in $(TARGETS) runutstest.sh check_utsns_enabled; do ln
> > -f $$i ../../../bin/$$i ; chmod +x runutstest.sh ; done
> > -
> > -noltp_check: noltp
> > - ./runtests_noltp.sh
> > Index: ltp-20080902/testcases/kernel/containers/Makefile
> > ===================================================================
> > --- ltp-20080902.orig/testcases/kernel/containers/Makefile
> > +++ ltp-20080902/testcases/kernel/containers/Makefile
> > @@ -23,9 +23,6 @@ SUBDIRS = libclone utsname sysvipc pidns
> > all: check_for_unshare
> > @set -e; for i in $(SUBDIRS); do $(MAKE) -C $$i $@; done
> >
> > -noltp noltp_check: check_for_unshare
> > - @set -e; for i in $(SUBDIRS); do $(MAKE) -C $$i $@; done
> > -
> > check_for_unshare: check_for_unshare.c
> > $(CC) -o $@ $< ../../../lib/tst_kvercmp.c -I../../../include
> >
> > Index: ltp-20080902/testcases/kernel/containers/libclone/Makefile
> > ===================================================================
> > --- ltp-20080902.orig/testcases/kernel/containers/libclone/Makefile
> > +++ ltp-20080902/testcases/kernel/containers/libclone/Makefile
> > @@ -28,7 +28,7 @@ else
> > TARGET :=
> > endif
> >
> > -all noltp : $(TARGET)
> > +all: $(TARGET)
> >
> > libclone.a: $(OBJS)
> > $(AR) -cr $@ $^
> > @@ -36,6 +36,4 @@ libclone.a: $(OBJS)
> > clean:
> > rm -f $(TARGET) $(OBJS)
> >
> > -noltp_check: noltp
> > -
> > install:
> > Index: ltp-20080902/testcases/kernel/containers/pidns/Makefile
> > ===================================================================
> > --- ltp-20080902.orig/testcases/kernel/containers/pidns/Makefile
> > +++ ltp-20080902/testcases/kernel/containers/pidns/Makefile
> > @@ -25,26 +25,15 @@ LDLIBS += -L../../../../lib -L../libclon
> > SRCS = $(wildcard *.c)
> > TARGETS = $(patsubst %.c,%,$(SRCS))
> >
> > -NOLTPSRCS = pidns01.c pidns02.c pidns03.c
> > -NOLTP_TARGETS = $(patsubst %.c,%_noltp,$(NOLTPSRCS))
> > -
> > HAS_UNSHARE ?= $(shell ../check_for_unshare && echo y)
> > ifneq ($(HAS_UNSHARE),y)
> > TARGETS :=
> > endif
> >
> > -%_noltp : %.c
> > - $(CC) -g -DNO_LTP -o $@ $< ../libclone/libclone.a
> > -
> > all: $(TARGETS)
> >
> > -noltp: $(NOLTP_TARGETS)
> > -
> > clean:
> > - rm -f $(TARGETS) *.o $(NOLTP_TARGETS)
> > + rm -f $(TARGETS) *.o
> >
> > install:
> > @set -e; for i in $(TARGETS) runpidnstest.sh check_pidns_enabled; do ln
> > -f $$i ../../../bin/$$i ; chmod +x runpidnstest.sh ; done
> > -
> > -noltp_check: noltp
> > - chmod +x runtests_noltp.sh ; ./runtests_noltp.sh
> > Index: ltp-20080902/testcases/kernel/containers/sysvipc/Makefile
> > ===================================================================
> > --- ltp-20080902.orig/testcases/kernel/containers/sysvipc/Makefile
> > +++ ltp-20080902/testcases/kernel/containers/sysvipc/Makefile
> > @@ -23,25 +23,16 @@ LDLIBS += -L../../../../lib -L../libclon
> >
> > SRCS = $(wildcard *.c)
> > TARGETS = $(patsubst %.c,%,$(SRCS))
> > -NOLTP_TARGETS = $(patsubst %.c,%_noltp,$(SRCS))
> >
> > HAS_UNSHARE ?= $(shell ../check_for_unshare && echo y)
> > ifneq ($(HAS_UNSHARE),y)
> > TARGETS :=
> > endif
> >
> > -%_noltp : %.c
> > - $(CC) -g -DNO_LTP -o $@ $< ../libclone/libclone.a
> > -
> > all: $(TARGETS)
> >
> > -noltp: $(NOLTP_TARGETS)
> > -
> > clean:
> > - rm -f $(TARGETS) *.o $(NOLTP_TARGETS)
> > + rm -f $(TARGETS) *.o
> >
> > install:
> > @set -e; for i in $(TARGETS) runipcnstest.sh check_ipcns_enabled ; do
> > ln -f $$i ../../../bin/$$i ; chmod +x runipcnstest.sh ; done
> > -
> > -noltp_check: noltp
> > - ./runtests_noltp.sh
> > Index: ltp-20080902/testcases/kernel/containers/sysvipc/shmnstest.c
> > ===================================================================
> > --- ltp-20080902.orig/testcases/kernel/containers/sysvipc/shmnstest.c
> > +++ ltp-20080902/testcases/kernel/containers/sysvipc/shmnstest.c
> > @@ -31,25 +31,13 @@
> > #include <errno.h>
> > #include <sys/ipc.h>
> > #include <sys/shm.h>
> > -#ifndef NO_LTP
> > #include <test.h>
> > #include <libclone.h>
> > -#else
> > -#include "../libclone/libclone.h"
> > -#endif
> >
> > char *TCID = "sysvipc_namespace";
> > int TST_TOTAL=1;
> > #define TESTKEY 0xEAEAEA
> >
> > -#ifdef NO_LTP
> > -#define TFAIL "FAILURE: "
> > -#define TPASS "PASS: "
> > -#define TINFO "INFO: "
> > -#define tst_resm(x, format, arg...) printf("%s:" format, x,## arg)
> > -#define tst_exit(ret) exit(ret)
> > -#endif
> > -
> > int p1[2];
> > int p2[2];
> >
> > Index: ltp-20080902/testcases/kernel/containers/utsname/utstest.c
> > ===================================================================
> > --- ltp-20080902.orig/testcases/kernel/containers/utsname/utstest.c
> > +++ ltp-20080902/testcases/kernel/containers/utsname/utstest.c
> > @@ -52,23 +52,12 @@
> > #include <unistd.h>
> > #include <string.h>
> > #include <errno.h>
> > -#ifndef NO_LTP
> > #include <test.h>
> > #include <libclone.h>
> > -#else
> > -#include "../libclone/libclone.h"
> > -#endif
> >
> > char *TCID = "uts_namespace";
> > int TST_TOTAL=1;
> >
> > -#ifdef NO_LTP
> > -#define TFAIL "FAILURE: "
> > -#define TPASS "PASS: "
> > -#define tst_resm(x, format, arg...) printf("%s:" format, x, ## arg)
> > -#define tst_exit() exit(1)
> > -#endif
> > -
> > int drop_root()
> > {
> > int ret;
> > Index: ltp-20080902/testcases/kernel/containers/sysvipc/runtests_noltp.sh
> > ===================================================================
> > --- ltp-20080902.orig/testcases/kernel/containers/sysvipc/runtests_noltp.sh
> > +++ /dev/null
> > @@ -1,31 +0,0 @@
> > -#!/bin/sh
> > -################################################################################
> > -##
> > ##
> > -## Copyright (c) International Business Machines Corp., 2007
> > ##
> > -##
> > ##
> > -## 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
> > ##
> > -##
> > ##
> > -################################################################################
> > -
> > -exit_code=0
> > -echo "sysvipc tests"
> > -for type in none clone unshare; do
> > - echo "**sysvipc $type"
> > - ./shmnstest_noltp $type
> > - if [ $? -ne 0 ]; then
> > - exit_code=$?
> > - fi
> > -done
> > -exit $exit_code
> > Index: ltp-20080902/testcases/kernel/containers/pidns/pidns02.c
> > ===================================================================
> > --- ltp-20080902.orig/testcases/kernel/containers/pidns/pidns02.c
> > +++ ltp-20080902/testcases/kernel/containers/pidns/pidns02.c
> > @@ -56,29 +56,15 @@
> > #include <unistd.h>
> > #include <string.h>
> > #include <errno.h>
> > -#ifndef NO_LTP
> > #include <usctest.h>
> > #include <test.h>
> > #include <libclone.h>
> > -#else
> > -#include "../../../../include/usctest.h"
> > -#include "../libclone/libclone.h"
> > -#endif
> >
> > char *TCID = "pid_namespace2";
> > int TST_TOTAL=1;
> >
> > void cleanup(void);
> >
> > -#ifdef NO_LTP
> > -#define TFAIL "FAILURE: "
> > -#define TPASS "PASS: "
> > -#define TINFO "INFO: "
> > -#define TWARN "WARN: "
> > -#define tst_resm(x, format, arg...) printf("%s:" format, x, ## arg)
> > -#define tst_exit() exit(1)
> > -#endif
> > -
> > #define PGID 1
> > #define SID 1
> >
> > @@ -154,10 +140,8 @@ void
> > cleanup()
> > {
> >
> > -#ifndef NO_LTP
> > /* Clean the test testcase as LTP wants*/
> > TEST_CLEANUP;
> > -#endif
> >
> > /* exit with return code appropriate for results */
> > tst_exit();
> > Index: ltp-20080902/testcases/kernel/containers/pidns/pidns03.c
> > ===================================================================
> > --- ltp-20080902.orig/testcases/kernel/containers/pidns/pidns03.c
> > +++ ltp-20080902/testcases/kernel/containers/pidns/pidns03.c
> > @@ -55,14 +55,9 @@
> > #include <string.h>
> > #include <errno.h>
> > #include <dirent.h>
> > -#ifndef NO_LTP
> > #include <usctest.h>
> > #include <test.h>
> > #include <libclone.h>
> > -#else
> > -#include "../../../../include/usctest.h"
> > -#include "../libclone/libclone.h"
> > -#endif
> >
> > char *TCID = "pid_namespace3";
> > int TST_TOTAL;
> > @@ -70,16 +65,6 @@ int TST_TOTAL;
> > static void cleanup();
> > static int child_fn();
> >
> > -
> > -#ifdef NO_LTP
> > -#define TFAIL "FAILURE: "
> > -#define TPASS "PASS: "
> > -#define TINFO "INFO: "
> > -#define TWARN "WARN: "
> > -#define tst_resm(x, format, arg...) printf("%s:" format, x, ## arg)
> > -#define tst_exit() exit(1)
> > -#endif
> > -
> > /***********************************************************************
> > * M A I N
> > ***********************************************************************/
> > @@ -177,13 +162,11 @@ void
> > cleanup()
> > {
> >
> > -#ifndef NO_LTP
> > /*
> > * print timing stats if that option was specified.
> > * print errno log if that option was specified.
> > */
> > TEST_CLEANUP;
> > -#endif
> >
> > /* exit with return code appropriate for results */
> > tst_exit();
> > Index: ltp-20080902/testcases/kernel/containers/pidns/pidns01.c
> > ===================================================================
> > --- ltp-20080902.orig/testcases/kernel/containers/pidns/pidns01.c
> > +++ ltp-20080902/testcases/kernel/containers/pidns/pidns01.c
> > @@ -54,29 +54,15 @@
> > #include <unistd.h>
> > #include <string.h>
> > #include <errno.h>
> > -#ifndef NO_LTP
> > #include <usctest.h>
> > #include <test.h>
> > #include <libclone.h>
> > -#else
> > -#include "../../../../include/usctest.h"
> > -#include "../libclone/libclone.h"
> > -#endif
> >
> > char *TCID = "pid_namespace1";
> > int TST_TOTAL=1;
> >
> > void cleanup(void);
> >
> > -#ifdef NO_LTP
> > -#define TFAIL "FAILURE: "
> > -#define TPASS "PASS: "
> > -#define TINFO "INFO: "
> > -#define TWARN "WARN: "
> > -#define tst_resm(x, format, arg...) printf("%s:" format, x, ## arg)
> > -#define tst_exit() exit(1)
> > -#endif
> > -
> > #define CHILD_PID 1
> > #define PARENT_PID 0
> >
> > @@ -155,10 +141,8 @@ void
> > cleanup()
> > {
> >
> > -#ifndef NO_LTP
> > /* Clean the test testcase as LTP wants*/
> > TEST_CLEANUP;
> > -#endif
> >
> > /* exit with return code appropriate for results */
> > tst_exit();
> > Index: ltp-20080902/testcases/kernel/containers/pidns/runtests_noltp.sh
> > ===================================================================
> > --- ltp-20080902.orig/testcases/kernel/containers/pidns/runtests_noltp.sh
> > +++ /dev/null
> > @@ -1,39 +0,0 @@
> > -################################################################################
> > -##
> > ##
> > -## Copyright (c) International Business Machines Corp., 2007
> > ##
> > -##
> > ##
> > -## 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
> > ##
> > -##
> > ##
> > -################################################################################
> > -
> > -#!/bin/sh
> > -
> > -exit_code=0
> > -./pidns01_noltp
> > -if [ $? -ne 0 ]; then
> > - exit_code=$?
> > - exit $exit_code
> > -fi
> > -./pidns02_noltp
> > -if [ $? -ne 0 ]; then
> > - exit_code=$?
> > - exit $exit_code
> > -fi
> > -./pidns03_noltp
> > -if [ $? -ne 0 ]; then
> > - exit_code=$?
> > - exit $exit_code
> > -fi
> > -exit $exit_code
> >
> > --
-------------------------------------------------------------------------
This SF.Net email is sponsored by the Moblin Your Move Developer's challenge
Build the coolest Linux based applications with Moblin SDK & win great prizes
Grand prize is a trip for two to an Open Source event anywhere in the world
http://moblin-contest.org/redirect.php?banner_id=100&url=/
_______________________________________________
Ltp-list mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/ltp-list
