[LTP] [PATCH 2/3] syscalls/ftruncate: Rewrite ftruncate03
Cyril Hrubis
chrubis@suse.cz
Tue Jul 30 14:55:52 CEST 2019
Hi!
> --- a/testcases/kernel/syscalls/ftruncate/ftruncate03.c
> +++ b/testcases/kernel/syscalls/ftruncate/ftruncate03.c
> @@ -1,188 +1,83 @@
> +// SPDX-License-Identifier: GPL-2.0
Here as well -or-later
> + * Copyright (c) 2019 FUJITSU LIMITED. All rights reserved.
> *
> - * Copyright (c) International Business Machines Corp., 2002
Here as well, the IBM copyright should stay here.
> - * 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 Street, Fifth Floor, Boston, MA 02110-1301 USA
> + * Jay Huie
> + * Robbie Williamson
> */
> -
> /*
> - * Test Name: ftruncate03
> - *
> * Test Description:
> * Verify that,
> - * 1) ftruncate(2) returns -1 and sets errno to EINVAL if the specified
> - * socket is invalid.
> - * 2) ftruncate(2) returns -1 and sets errno to EINVAL if the specified
> - * file descriptor has an attempt to write, when open for read only.
> - * 3) ftruncate(2) returns -1 and sets errno to EBADF if the file descriptor
> - * of the specified file is not valid.
> - *
> - * Expected Result:
> - * ftruncate() should fail with return value -1 and set expected errno.
> - *
> - * HISTORY
> - * 02/2002 Written by Jay Huie
> - * 02/2002 Adapted for and included into the LTP by Robbie Williamson
> - *
> - * RESTRICTIONS:
> - * This test should be run by 'non-super-user' only.
> - *
> + * 1)ftruncate() fails with EINVAL if the file is a socket.
> + * 2)ftruncate() fails with EINVAL if the file descriptor opens with O_RDONLY.
> + * 3)ftruncate() fails with EBADF if the file descriptor is invalid.
We are still missing EINVAL when off_t is negative.
> */
>
> -#include <stdio.h>
> +#include <sys/types.h>
> +#include <sys/stat.h>
> +#include <fcntl.h>
> #include <unistd.h>
> #include <errno.h>
> #include <string.h>
> -#include <inttypes.h>
> -#include <sys/types.h>
> #include <sys/socket.h>
> -#include <fcntl.h>
> -
> -#include "test.h"
> -
> -#define TESTFILE "ftruncate03_tst_file"
> -
> -TCID_DEFINE(ftruncate03);
> -int TST_TOTAL = 3;
>
> -int main(void)
> -{
> - int wjh_ret = -1, wjh_f = -1, count = 0;
> - //used for the 2nd test
> - //make str > trunc_size characters long
> - char str[] = "THIS IS JAYS TEST FILE DATA";
> - int trunc_size = 4;
> - int flag = O_RDONLY;
> -
> -#ifdef DEBUG
> - printf("Starting test, possible errnos are; EBADF(%d) EINVAL(%d)\n",
> - EBADF, EINVAL);
> - printf("\t\tENOENT(%d) EACCES(%d) EPERM(%d)\n\n", ENOENT, EACCES,
> - EPERM);
> -#endif
> +#include "tst_test.h"
>
> - tst_tmpdir();
> +#define TESTFILE "testfile"
>
> -//TEST1: ftruncate on a socket is not valid, should fail w/ EINVAL
> +static int sock_fd, read_fd, bad_fd = -1;
>
> -#ifdef DEBUG
> - printf("Starting test1\n");
> -#endif
> - wjh_f = socket(PF_INET, SOCK_STREAM, 0);
> - wjh_ret = ftruncate(wjh_f, 1);
> -#ifdef DEBUG
> - printf("DEBUG: fd: %d ret: %d errno(%d) %s\n",
> - wjh_f, wjh_ret, errno, strerror(errno));
> -#endif
> - if (wjh_ret == -1 && errno == EINVAL) {
> - tst_resm(TPASS, "Test Passed");
> - } else {
> - tst_resm(TFAIL,
> - "ftruncate(socket)=%i (wanted -1), errno=%i (wanted EINVAL %i)",
> - wjh_ret, errno, EINVAL);
> - }
> - close(wjh_f);
> - errno = 0;
> - wjh_ret = 0;
> - wjh_f = -1;
> +static struct tcase {
> + int *fd;
> + int exp_errno;
> +} tcases[] = {
> + {&sock_fd, EINVAL},
> + {&read_fd, EINVAL},
> + {&bad_fd, EBADF},
> +};
>
> -//TEST2: ftruncate on fd not open for writing should be EINVAL
> +static void verify_ftruncate(unsigned int n)
> +{
> + struct tcase *tc = &tcases[n];
>
> -#ifdef DEBUG
> - printf("\nStarting test2\n");
> -#endif
> - //create a file and fill it so we can truncate it in ReadOnly mode
> - //delete it first, ignore if it doesn't exist
> - unlink(TESTFILE);
> - errno = 0;
> - wjh_f = open(TESTFILE, O_RDWR | O_CREAT, 0644);
> - if (wjh_f == -1) {
> - tst_brkm(TFAIL | TERRNO, tst_rmdir, "open(%s) failed",
> - TESTFILE);
> - }
> - while (count < strlen(str)) {
> - if ((count += write(wjh_f, str, strlen(str))) == -1) {
> - tst_resm(TFAIL | TERRNO, "write() failed");
> - close(wjh_f);
> - tst_rmdir();
> - tst_exit();
> - }
> + TEST(ftruncate(*tc->fd, 4));
> + if (TST_RET != -1) {
> + tst_res(TFAIL, "ftruncate() succeeded unexpectedly");
Here as well, we should print the TST_RET value.
> + return;
> }
> - close(wjh_f);
> - errno = 0;
>
> -//Uncomment below if you want it to succeed, O_RDWR => success
> -// flag = O_RDWR;
> -#ifdef DEBUG
> - if (flag == O_RDWR) {
> - printf("\tLooks like it should succeed!\n");
> + if (TST_ERR == tc->exp_errno) {
> + tst_res(TPASS, "ftruncate() failed expectedly");
^
Can we please pass the TTERRNO here as well?
> + } else {
> + tst_res(TFAIL | TTERRNO,
> + "ftruncate() failed unexpectedly, got %s, expected",
> + tst_strerrno(tc->exp_errno));
> }
> -#endif
> +}
>
> - wjh_f = open(TESTFILE, flag);
> - if (wjh_f == -1) {
> - tst_brkm(TFAIL | TERRNO, tst_rmdir, "open(%s) failed",
> - TESTFILE);
> - }
> - wjh_ret = ftruncate(wjh_f, trunc_size);
> -#ifdef DEBUG
> - printf("DEBUG: fd: %d ret: %d @ errno(%d) %s\n",
> - wjh_f, wjh_ret, errno, strerror(errno));
> -#endif
> - if ((flag == O_RDONLY) && (wjh_ret == -1) && (errno == EINVAL)) {
> - tst_resm(TPASS, "Test Passed");
> - } else if ((flag == O_RDWR)) {
> - if (wjh_ret == 0) {
> - tst_resm(TPASS, "Test Succeeded!");
> - } else {
> - tst_resm(TFAIL | TERRNO,
> - "ftruncate(%s) should have succeeded, but didn't! ret="
> - "%d (wanted 0)", TESTFILE, wjh_ret);
> - }
> - } else //flag was O_RDONLY but return codes wrong
> - {
> - tst_resm(TFAIL,
> - "ftruncate(rd_only_fd)=%i (wanted -1), errno=%i (wanted %i EINVAL)",
> - wjh_ret, errno, EINVAL);
> - }
> - close(wjh_f);
> - errno = 0;
> - wjh_ret = 0;
> - wjh_f = -1;
> +static void setup(void)
> +{
> + sock_fd = SAFE_SOCKET(PF_INET, SOCK_STREAM, 0);
>
> -//TEST3: invalid socket descriptor should fail w/ EBADF
> + if (tst_fill_file(TESTFILE, 'a', 100, 1))
> + tst_brk(TBROK, "Failed to create test file");
There is no need to fill the file, we can just pass O_CREAT to the open
below.
> -#ifdef DEBUG
> - printf("\nStarting test3\n");
> -#endif
> - wjh_f = -999999; //should be a bad file descriptor
> - wjh_ret = ftruncate(wjh_f, trunc_size);
> -#ifdef DEBUG
> - printf("DEBUG: fd: %d ret: %d @ errno(%d) %s\n",
> - wjh_f, wjh_ret, errno, strerror(errno));
> -#endif
> - if (wjh_ret != -1 || errno != EBADF) {
> - tst_resm(TFAIL | TERRNO,
> - "ftruncate(invalid_fd)=%d (wanted -1 and EBADF)",
> - wjh_ret);
> - } else {
> - tst_resm(TPASS, "Test Passed");
> - }
> + read_fd = SAFE_OPEN(TESTFILE, O_RDONLY);
> +}
>
> - tst_rmdir();
> +static void cleanup(void)
> +{
> + if (sock_fd > 0)
> + SAFE_CLOSE(sock_fd);
>
> -//Done Testing
> - tst_exit();
> + if (read_fd > 0)
> + SAFE_CLOSE(read_fd);
> }
> +
> +static struct tst_test test = {
> + .tcnt = ARRAY_SIZE(tcases),
> + .test = verify_ftruncate,
> + .setup = setup,
> + .cleanup = cleanup,
> + .needs_tmpdir = 1,
> +};
> --
> 1.8.3.1
>
>
>
>
> --
> Mailing list info: https://lists.linux.it/listinfo/ltp
--
Cyril Hrubis
chrubis@suse.cz
More information about the ltp
mailing list