diff mbox series

[3/3] syscalls/mmap07: Remove the test

Message ID 20230824074406.1129-3-akumar@suse.de
State Accepted
Headers show
Series [1/3] syscalls/mmap05: Rewrite the test using new LTP API | expand

Commit Message

Avinesh Kumar Aug. 24, 2023, 7:38 a.m. UTC
As we are testing for EACCES in this test also when file descriptor is
not open for reading, I have moved this scenario to mmap06.c along with
other EACCES tests, so I guess it's safe to remove this one.

Signed-off-by: Avinesh Kumar <akumar@suse.de>
---
 runtest/syscalls                          |   1 -
 testcases/kernel/syscalls/mmap/.gitignore |   1 -
 testcases/kernel/syscalls/mmap/mmap07.c   | 146 ----------------------
 3 files changed, 148 deletions(-)
 delete mode 100644 testcases/kernel/syscalls/mmap/mmap07.c

Comments

Cyril Hrubis Aug. 30, 2023, 12:36 p.m. UTC | #1
Hi!
Pushed, thanks.
diff mbox series

Patch

diff --git a/runtest/syscalls b/runtest/syscalls
index 1028e45fc..4bacb4017 100644
--- a/runtest/syscalls
+++ b/runtest/syscalls
@@ -785,7 +785,6 @@  mmap03 mmap03
 mmap04 mmap04
 mmap05 mmap05
 mmap06 mmap06
-mmap07 mmap07
 mmap08 mmap08
 mmap09 mmap09
 mmap12 mmap12
diff --git a/testcases/kernel/syscalls/mmap/.gitignore b/testcases/kernel/syscalls/mmap/.gitignore
index 569a76ac1..4591fdbb9 100644
--- a/testcases/kernel/syscalls/mmap/.gitignore
+++ b/testcases/kernel/syscalls/mmap/.gitignore
@@ -5,7 +5,6 @@ 
 /mmap04
 /mmap05
 /mmap06
-/mmap07
 /mmap08
 /mmap09
 /mmap10
diff --git a/testcases/kernel/syscalls/mmap/mmap07.c b/testcases/kernel/syscalls/mmap/mmap07.c
deleted file mode 100644
index 682e527aa..000000000
--- a/testcases/kernel/syscalls/mmap/mmap07.c
+++ /dev/null
@@ -1,146 +0,0 @@ 
-/*
- * Copyright (c) International Business Machines  Corp., 2001
- *
- * 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
- */
-
-/*
- * Test Description:
- *  Call mmap() to map a file creating a mapped region with read access
- *  under the following conditions -
- *	- The prot parameter is set to PROT_WRITE
- *	- The file descriptor is open for writing.
- *	- The flags parameter has MAP_PRIVATE set.
- *
- *  The call should fail to map the file.
- *
- * Expected Result:
- *  mmap() should fail returning -1 and errno should get set to EACCES.
- *
- * HISTORY
- *	07/2001 Ported by Wayne Boyer
- */
-#include <stdio.h>
-#include <stdlib.h>
-#include <sys/types.h>
-#include <errno.h>
-#include <unistd.h>
-#include <fcntl.h>
-#include <string.h>
-#include <signal.h>
-#include <sys/stat.h>
-#include <sys/mman.h>
-
-#include "test.h"
-
-#define TEMPFILE	"mmapfile"
-
-char *TCID = "mmap07";
-int TST_TOTAL = 1;
-
-static size_t page_sz;
-static char *addr;
-static int fildes;
-
-static void setup(void);
-static void cleanup(void);
-
-int main(int ac, char **av)
-{
-	int lc;
-
-	tst_parse_opts(ac, av, NULL, NULL);
-
-	setup();
-
-	for (lc = 0; TEST_LOOPING(lc); lc++) {
-
-		tst_count = 0;
-
-		/*
-		 * Call mmap to map the temporary file 'TEMPFILE'
-		 * with write access.
-		 */
-		errno = 0;
-		addr = mmap(0, page_sz, PROT_WRITE,
-			    MAP_FILE | MAP_PRIVATE, fildes, 0);
-		TEST_ERRNO = errno;
-
-		/* Check for the return value of mmap() */
-		if (addr != MAP_FAILED) {
-			tst_resm(TFAIL | TERRNO,
-				 "mmap() returned invalid value, expected: %p",
-				 MAP_FAILED);
-			/* Unmap the mapped memory */
-			if (munmap(addr, page_sz) != 0) {
-				tst_resm(TBROK, "munmap() failed");
-				cleanup();
-			}
-			continue;
-		}
-		if (TEST_ERRNO == EACCES) {
-			tst_resm(TPASS, "mmap failed with EACCES");
-		} else {
-			tst_resm(TFAIL | TERRNO,
-				 "mmap failed with unexpected errno");
-		}
-
-	}
-	cleanup();
-	tst_exit();
-
-}
-
-static void setup(void)
-{
-	char *tst_buff;
-
-	tst_sig(NOFORK, DEF_HANDLER, cleanup);
-
-	TEST_PAUSE;
-
-	page_sz = getpagesize();
-
-	/* Allocate space for the test buffer */
-	if ((tst_buff = calloc(page_sz, sizeof(char))) == NULL) {
-		tst_brkm(TFAIL, NULL,
-			 "calloc() failed to allocate space for tst_buff");
-	}
-
-	/* Fill the test buffer with the known data */
-	memset(tst_buff, 'A', page_sz);
-
-	tst_tmpdir();
-
-	/* Creat a temporary file used for mapping */
-	if ((fildes = open(TEMPFILE, O_WRONLY | O_CREAT, 0666)) < 0) {
-		free(tst_buff);
-		tst_brkm(TFAIL, cleanup, "open() on %s failed", TEMPFILE);
-	}
-
-	/* Write test buffer contents into temporary file */
-	if (write(fildes, tst_buff, page_sz) < (int)page_sz) {
-		free(tst_buff);
-		tst_brkm(TFAIL, cleanup, "writing to %s failed", TEMPFILE);
-	}
-
-	free(tst_buff);
-}
-
-static void cleanup(void)
-{
-	close(fildes);
-	tst_rmdir();
-}