[LTP] [PATCH 1/2] sbrk01: Refactor the test using new LTP API

[Li Wang]

Hi Avinesh,

On Tue, Aug 8, 2023 at 11:36 PM Avinesh Kumar <akumar@suse.de> wrote:

> Signed-off-by: Avinesh Kumar <akumar@suse.de>
> ---
>  testcases/kernel/syscalls/sbrk/sbrk01.c | 121 +++++-------------------
>  1 file changed, 26 insertions(+), 95 deletions(-)
>
> diff --git a/testcases/kernel/syscalls/sbrk/sbrk01.c
> b/testcases/kernel/syscalls/sbrk/sbrk01.c
> index ce26b1503..109b1d125 100644
> --- a/testcases/kernel/syscalls/sbrk/sbrk01.c
> +++ b/testcases/kernel/syscalls/sbrk/sbrk01.c
> @@ -1,111 +1,42 @@
> +// SPDX-License-Identifier: GPL-2.0
>  /*
>   * 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
> - * published by the Free Software Foundation.
> - *
> - * This program is distributed in the hope that it would be useful, but
> - * WITHOUT ANY WARRANTY; without even the implied warranty of
> - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
> - *
> - * Further, this software is distributed without any warranty that it is
> - * free of the rightful claim of any third person regarding infringement
> - * or the like.  Any license provided herein, whether implied or
> - * otherwise, applies only to this software file.  Patent licenses, if
> - * any, provided herein do not apply to combinations of this program with
> - * other software, or any other product whatsoever.
> - *
> - * You should have received a copy of the GNU General Public License along
> - * with this program; if not, write the Free Software Foundation, Inc.,
> - * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
> - *
> - * Contact information: Silicon Graphics, Inc., 1600 Amphitheatre Pkwy,
> - * Mountain View, CA  94043, or:
> - *
> - * http://www.sgi.com
> - *
> - * For further information regarding this notice, see:
> - *
> - * http://oss.sgi.com/projects/GenInfo/NoticeExplan/
> - *
> - */
> -/*
> - * DESCRIPTION
> - *     1.) test sbrk(8192) should return successfully.
> - *     2.) test sbrk(-8192) should return successfully.
> + *  AUTHOR : William Roske, CO-PILOT : Dave Fenner
> + * Copyright (c) 2023 SUSE LLC Avinesh Kumar <avinesh.kumar@suse.com>
>   */
>
> -#include <unistd.h>
> -#include <errno.h>
> -#include <string.h>
> -#include <signal.h>
> -#include <sys/types.h>
> -
> -#include "test.h"
> +/*\
> + * [Description]
> + *
> + * Verify that sbrk() successfully increments or decrements the program's
> + * data break.
> + */
>
> -char *TCID = "sbrk01";
> +#include "tst_test.h"
>
> -static struct test_case_t {
> +static struct tcase {
>         long increment;
> -} test_cases[] = {
> +} tcases[] = {
> +       {0},
>         {8192},
> -       {-8192},
> +       {-8192}
>  };
>
> -static void setup(void);
> -static void sbrk_verify(const struct test_case_t *);
> -static void cleanup(void);
> -
> -int TST_TOTAL = ARRAY_SIZE(test_cases);
> -
> -int main(int ac, char **av)
> -{
> -       int lc;
> -       int i;
> -
> -       tst_parse_opts(ac, av, NULL, NULL);
> -
> -       setup();
> -
> -       for (lc = 0; TEST_LOOPING(lc); lc++) {
> -
> -               tst_count = 0;
> -
> -               for (i = 0; i < TST_TOTAL; i++)
> -                       sbrk_verify(&test_cases[i]);
> -       }
> -
> -       cleanup();
> -       tst_exit();
> -
> -}
> -
> -static void setup(void)
> -{
> -       tst_sig(NOFORK, DEF_HANDLER, cleanup);
> -
> -       TEST_PAUSE;
> -}
> -
> -static void sbrk_verify(const struct test_case_t *test)
> +static void run(unsigned int i)
>  {
>         void *tret;
> +       struct tcase *tc = &tcases[i];
>
> -       tret = sbrk(test->increment);
> -       TEST_ERRNO = errno;
> +       tret = sbrk(tc->increment);
> +       TST_ERR = errno;


Can we make use of the LTP test macro TESTPTR()?
It has already given TST_RET_PRT and TST_ERR inside that.

See:
https://github.com/linux-test-project/ltp/blob/master/include/tst_test_macros.h#L30



>
> -       if (tret == (void *)-1) {
> -               tst_resm(TFAIL | TTERRNO, "sbrk - Increase by %ld bytes
> failed",
> -                        test->increment);
> -       } else {
> -               tst_resm(TPASS, "sbrk - Increase by %ld bytes returned %p",
> -                        test->increment, tret);
> -       }
> +       if (tret == (void *) -1)
> +               tst_res(TFAIL | TTERRNO, "sbrk(%ld) failed",
> tc->increment);
> +       else
> +               tst_res(TPASS, "sbrk(%ld) returned %p", tc->increment,
> tret);
>  }
>
> -static void cleanup(void)
> -{
> -}
> +static struct tst_test test = {
> +       .test = run,
> +       .tcnt = ARRAY_SIZE(tcases)
> +};
> --
> 2.41.0
>
>
> --
> Mailing list info: https://lists.linux.it/listinfo/ltp
>
>

-- 
Regards,
Li Wang