----- Original Message -----
> From: "Zeng Linggang" <zenglg...@cn.fujitsu.com>
> To: "ltp-list" <ltp-list@lists.sourceforge.net>
> Sent: Friday, 20 June, 2014 9:19:56 AM
> Subject: [LTP] [PATCH 1/2] wait/wait02: cleanup
>
> * Delete some useless commtents and variable.
>
> * Some cleanup.
>
> Signed-off-by: Zeng Linggang <zenglg...@cn.fujitsu.com>
> ---
> testcases/kernel/syscalls/wait/wait02.c | 166
> ++++++--------------------------
> 1 file changed, 32 insertions(+), 134 deletions(-)
>
> diff --git a/testcases/kernel/syscalls/wait/wait02.c
> b/testcases/kernel/syscalls/wait/wait02.c
> index a95213d..ef3bf71 100644
> --- a/testcases/kernel/syscalls/wait/wait02.c
> +++ b/testcases/kernel/syscalls/wait/wait02.c
> @@ -1,5 +1,7 @@
> /*
> * Copyright (c) 2000 Silicon Graphics, Inc. All Rights Reserved.
> + * AUTHOR : William Roske
> + * CO-PILOT : Dave Fenner
> *
> * This program is free software; you can redistribute it and/or modify it
> * under the terms of version 2 of the GNU General Public License as
> @@ -30,84 +32,6 @@
> * http://oss.sgi.com/projects/GenInfo/NoticeExplan/
> *
> */
> -/* $Id: wait02.c,v 1.7 2009/10/26 14:55:48 subrata_modak Exp $ */
> -/**********************************************************
> - *
> - * OS Test - Silicon Graphics, Inc.
> - *
> - * TEST IDENTIFIER : wait02
> - *
> - * EXECUTED BY : anyone
> - *
> - * TEST TITLE : Basic test for wait(2)
> - *
> - * PARENT DOCUMENT : usctpl01
> - *
> - * TEST CASE TOTAL : 1
> - *
> - * WALL CLOCK TIME : 1
> - *
> - * CPU TYPES : ALL
> - *
> - * AUTHOR : William Roske
> - *
> - * CO-PILOT : Dave Fenner
> - *
> - * DATE STARTED : 03/30/92
> - *
> - * INITIAL RELEASE : UNICOS 7.0
> - *
> - * TEST CASES
> - *
> - * 1.) wait(2) returns...(See Description)
> - *
> - * INPUT SPECIFICATIONS
> - * The standard options for system call tests are accepted.
> - * (See the parse_opts(3) man page).
> - *
> - * OUTPUT SPECIFICATIONS
> - *
> - * DURATION
> - * Terminates - with frequency and infinite modes.
> - *
> - * SIGNALS
> - * Uses SIGUSR1 to pause before test if option set.
> - * (See the parse_opts(3) man page).
> - *
> - * RESOURCES
> - * None
> - *
> - * ENVIRONMENTAL NEEDS
> - * No run-time environmental needs.
> - *
> - * SPECIAL PROCEDURAL REQUIREMENTS
> - * None
> - *
> - * INTERCASE DEPENDENCIES
> - * None
> - *
> - * DETAILED DESCRIPTION
> - * This is a Phase I test for the wait(2) system call. It is intended
> - * to provide a limited exposure of the system call, for now. It
> - * should/will be extended when full functional tests are written for
> - * wait(2).
> - *
> - * Setup:
> - * Setup signal handling.
> - * Pause for SIGUSR1 if option specified.
> - *
> - * Test:
> - * Loop if the proper options are given.
> - * Execute system call
> - * Check return code, if system call failed (return=-1)
> - * Log the errno and Issue a FAIL message.
> - * Otherwise, Issue a PASS message.
> - *
> - * Cleanup:
> - * Print errno log and/or timing stats if options given
> - *
> - *
> - *#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#**/
>
> #include <errno.h>
> #include <string.h>
> @@ -118,94 +42,68 @@
> #include "test.h"
> #include "usctest.h"
>
> -void setup();
> -void cleanup();
> +static void setup(void);
> +static void cleanup(void);
>
> char *TCID = "wait02";
> int TST_TOTAL = 1;
>
> -int exp_enos[] = { 0, 0 };
> +static int exp_enos[] = { 0, 0 };
This looks like it can be removed along with TEST_EXP_ENOS().
> +
> +static int fork_pid, ret_code;
These can be local variables.
>
> -int fork_pid, ret_code;
> -void trapper();
> +static void wait_verify(void);
>
> int main(int ac, char **av)
> {
> int lc;
> const char *msg;
>
> - /***************************************************************
> - * parse standard options
> - ***************************************************************/
> - if ((msg = parse_opts(ac, av, NULL, NULL)) != NULL)
> + msg = parse_opts(ac, av, NULL, NULL);
> + if (msg != NULL)
> tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg);
>
> - /***************************************************************
> - * perform global setup for test
> - ***************************************************************/
> setup();
>
> - /* set the expected errnos... */
> TEST_EXP_ENOS(exp_enos);
>
> - /***************************************************************
> - * check looping state if -c option given
> - ***************************************************************/
> for (lc = 0; TEST_LOOPING(lc); lc++) {
> -
> tst_count = 0;
> -
> - /* create a child to wait for */
> - if ((fork_pid = FORK_OR_VFORK()) == -1) {
> - tst_brkm(TBROK, cleanup,
> - "fork() Failure. errno=%d : %s", errno,
> - strerror(errno));
> - } else if (fork_pid == 0) {
> - /* Child, sleep a second then exit */
> - sleep(1);
> - exit(1);
> - }
> -
> - /* Parent, wait for child to die */
> - TEST(wait(&ret_code));
> -
> - /* check return code */
> - if (TEST_RETURN == -1) {
> - TEST_ERROR_LOG(TEST_ERRNO);
> - tst_resm(TFAIL, "wait(1) Failed, errno=%d : %s",
> - TEST_ERRNO, strerror(TEST_ERRNO));
> - } else {
> - tst_resm(TPASS, "wait(&ret_code) returned %ld",
> - TEST_RETURN);
> - }
> + wait_verify();
> }
>
> cleanup();
> tst_exit();
> }
>
> -/***************************************************************
> - * setup() - performs all ONE TIME setup for this test.
> - ***************************************************************/
> -void setup(void)
> +static void setup(void)
> {
> -
> tst_sig(FORK, DEF_HANDLER, cleanup);
>
> TEST_PAUSE;
> +}
> +
> +static void wait_verify(void)
> +{
> + fork_pid = FORK_OR_VFORK();
> + if (fork_pid == -1) {
> + tst_brkm(TBROK | TERRNO, cleanup, "fork() Failure");
> + } else if (fork_pid == 0) {
> + sleep(1);
> + exit(1);
> + }
> +
> + TEST(wait(&ret_code));
I know this wasn't in original code, but I suggest to add some check for
ret_code too (WIFEXITED() && WEXITSTATUS() == 1).
Regards,
Jan
>
> + if (TEST_RETURN == -1) {
> + TEST_ERROR_LOG(TEST_ERRNO);
> + tst_resm(TFAIL | TTERRNO, "wait(1) Failed");
> + } else {
> + tst_resm(TPASS, "wait(&ret_code) returned %ld", TEST_RETURN);
> + }
> }
>
> -/***************************************************************
> - * cleanup() - performs all ONE TIME cleanup for this test at
> - * completion or premature exit.
> - ***************************************************************/
> -void cleanup(void)
> +static void cleanup(void)
> {
> - /*
> - * print timing stats if that option was specified.
> - * print errno log if that option was specified.
> - */
> TEST_CLEANUP;
> -
> }
> --
> 1.9.3
>
>
>
>
> ------------------------------------------------------------------------------
> HPCC Systems Open Source Big Data Platform from LexisNexis Risk Solutions
> Find What Matters Most in Your Big Data with HPCC Systems
> Open Source. Fast. Scalable. Simple. Ideal for Dirty Data.
> Leverages Graph Analysis for Fast Processing & Easy Data Exploration
> http://p.sf.net/sfu/hpccsystems
> _______________________________________________
> Ltp-list mailing list
> Ltp-list@lists.sourceforge.net
> https://lists.sourceforge.net/lists/listinfo/ltp-list
>
------------------------------------------------------------------------------
HPCC Systems Open Source Big Data Platform from LexisNexis Risk Solutions
Find What Matters Most in Your Big Data with HPCC Systems
Open Source. Fast. Scalable. Simple. Ideal for Dirty Data.
Leverages Graph Analysis for Fast Processing & Easy Data Exploration
http://p.sf.net/sfu/hpccsystems
_______________________________________________
Ltp-list mailing list
Ltp-list@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/ltp-list
