Signed-off-by: Manas Kumar Nayak <[email protected]> To: LTP List <[email protected]> Cc: Subrata Modak <[email protected]> Cc: Masatake YAMATO <[email protected]> ---
--- ltp-full-20090531.orig/testcases/kernel/syscalls/waitid/Makefile 1970-01-01 05:30:00.000000000 +0530 +++ ltp-full-20090531/testcases/kernel/syscalls/waitid/Makefile 2009-06-12 15:49:28.000000000 +0530 @@ -0,0 +1,31 @@ +# +# Copyright (c) International Business Machines Corp., 2009 +# +# 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 +# + +CFLAGS += -I../../../../include -Wall +LDLIBS += -L../../../../lib -lltp + +SRCS = $(wildcard *.c) +TARGETS = $(patsubst %.c,%,$(SRCS)) + +all: $(TARGETS) + +install: + @set -e; for i in $(TARGETS); do ln -f $$i ../../../bin/$$i ; done + +clean: + rm -f $(TARGETS) --- ltp-full-20090531.orig/testcases/kernel/syscalls/waitid/waitid01.c 1970-01-01 05:30:00.000000000 +0530 +++ ltp-full-20090531/testcases/kernel/syscalls/waitid/waitid01.c 2009-06-12 21:21:13.000000000 +0530 @@ -0,0 +1,204 @@ +/******************************************************************************/ +/* Copyright (c) Crackerjack Project., 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 */ +/* */ +/******************************************************************************/ +/******************************************************************************/ +/* */ +/* File: waitid01.c */ +/* */ +/* Description: This tests the waitid() syscall */ +/* */ +/* Usage: <for command-line> */ +/* waitid01 [-c n] [-e][-i n] [-I x] [-p x] [-t] */ +/* where, -c n : Run n copies concurrently. */ +/* -e : Turn on errno logging. */ +/* -i n : Execute test n times. */ +/* -I x : Execute test for x seconds. */ +/* -P x : Pause for x seconds between iterations. */ +/* -t : Turn on syscall timing. */ +/* */ +/* Total Tests: 1 */ +/* */ +/* Test Name: waitid01 */ +/* History: Porting from Crackerjack to LTP is done by */ +/* Manas Kumar Nayak [email protected]> */ +/******************************************************************************/ + +#include <stdio.h> +#include <errno.h> +#include <stdlib.h> +#include <sys/wait.h> +#include <sys/types.h> +#include <unistd.h> +#include <sys/stat.h> + +/* Harness Specific Include Files. */ +#include "test.h" +#include "usctest.h" +#include "linux_syscall_numbers.h" + +/* Extern Global Variables */ +extern int Tst_count; /* counter for tst_xxx routines. */ +extern char *TESTDIR; /* temporary dir created by tst_tmpdir() */ + +/* Global Variables */ +char *TCID = "waitid01"; /* Test program identifier.*/ +int testno; +int TST_TOTAL = 3; /* total number of tests in this file. */ + +/* Extern Global Functions */ +/******************************************************************************/ +/* */ +/* Function: cleanup */ +/* */ +/* Description: Performs all one time clean up for this test on successful */ +/* completion, premature exit or failure. Closes all temporary */ +/* files, removes all temporary directories exits the test with */ +/* appropriate return code by calling tst_exit() function. */ +/* */ +/* Input: None. */ +/* */ +/* Output: None. */ +/* */ +/* Return: On failure - Exits calling tst_exit(). Non '0' return code. */ +/* On success - Exits calling tst_exit(). With '0' return code. */ +/* */ +/******************************************************************************/ +extern void cleanup() { + /* Remove tmp dir and all files in it */ + TEST_CLEANUP; + tst_rmdir(); + + /* Exit with appropriate return code. */ + tst_exit(); +} + +/* Local Functions */ +/******************************************************************************/ +/* */ +/* Function: setup */ +/* */ +/* Description: Performs all one time setup for this test. This function is */ +/* typically used to capture signals, create temporary dirs */ +/* and temporary files that may be used in the course of this */ +/* test. */ +/* */ +/* Input: None. */ +/* */ +/* Output: None. */ +/* */ +/* Return: On failure - Exits by calling cleanup(). */ +/* On success - returns 0. */ +/* */ +/******************************************************************************/ +void setup() { + /* Capture signals if any */ + /* Create temporary directories */ + TEST_PAUSE; + tst_tmpdir(); +} + + +int errnochoose(void){ //choose the relative errno + + switch (TEST_ERRNO){ + case 0: tst_exit(); + case ECHILD: strerror((int)"ECHILD"); + break; + case EINTR: strerror((int)"EINTR"); + break; + case EINVAL: strerror((int)"EINVAL"); + break; + default: strerror((int)"Other Error"); + break; + } + TEST_RETURN = 0; + tst_exit() ; +} + +void display_status(siginfo_t *infop) +{ + tst_resm(TINFO,"Process %d terminated:", infop->si_pid); + tst_resm(TINFO,"code = %d",infop->si_code); + if(infop->si_code == CLD_EXITED) + tst_resm(TINFO,"exit value = %d",infop->si_status); + else + tst_resm(TINFO,"signal = %d",infop->si_status); +} + +int main(int ac, char **av) { + id_t pid; + siginfo_t infop; + int lc; /* loop counter */ + char *msg; /* message returned from parse_opts */ + + /* parse standard options */ + if ((msg = parse_opts(ac, av, (option_t *)NULL, NULL)) != (char *)NULL){ + tst_brkm(TBROK, cleanup, "OPTION PARSING ERROR - %s", msg); + tst_exit(); + } + + setup(); + + /* Check looping state if -i option given */ + for (lc = 0; TEST_LOOPING(lc); ++lc) { + Tst_count = 0; + for (testno = 0; testno < TST_TOTAL; ++testno) { + + TEST(fork()); + if(TEST_RETURN == 0){ + exit(123); + } + else{ + TEST(waitid(P_ALL,getpid(),&infop,WEXITED)); + if(TEST_RETURN == -1){ + TEST(errnochoose()); + }else + display_status(&infop); //CLD_EXITED = 1 + } + + TEST(fork()); + if(TEST_RETURN == 0){ + int a, b = 0; + a = 1/b; + tst_exit(); + } else{ + TEST(waitid(P_ALL,0,&infop,WEXITED)); + if(TEST_RETURN == -1) + TEST(errnochoose()); + else + display_status(&infop); //CLD_DUMPED = 3 ; SIGFPE = 8 + } + + TEST(pid = fork()); + if(TEST_RETURN == 0){ + TEST(sleep(10)); + tst_exit(); + } + TEST(kill(pid,SIGHUP)); + TEST(waitid(P_ALL,0,&infop,WEXITED)); + if(TEST_RETURN == -1) + TEST(errnochoose()); + else + display_status(&infop); //CLD_KILLED = 2 ; SIGHUP = 1 + } + } + tst_resm(TPASS, "waitid(): system call passed"); + cleanup(); + tst_exit(); +} + --- ltp-full-20090531.orig/runtest/syscalls 2009-06-12 21:08:46.000000000 +0530 +++ ltp-full-20090531/runtest/syscalls 2009-06-12 21:22:40.000000000 +0530 @@ -1271,6 +1271,8 @@ waitpid11 waitpid11 waitpid12 waitpid12 waitpid13 waitpid13 +waitid01 waitid01 + write01 write01 write02 write02 write03 write03 --- Regards-- Manas ------------------------------------------------------------------------------ Crystal Reports - New Free Runtime and 30 Day Trial Check out the new simplified licensing option that enables unlimited royalty-free distribution of the report engine for externally facing server and web deployment. http://p.sf.net/sfu/businessobjects _______________________________________________ Ltp-list mailing list [email protected] https://lists.sourceforge.net/lists/listinfo/ltp-list
