From adc09ca5280a5ca5e35b0847e7cfed0946e90541 Mon Sep 17 00:00:00 2001 From: Tom Hughes Date: Wed, 2 Nov 2005 15:47:43 +0000 Subject: [PATCH] Remove the as_mmap and as_shm tests which don't make much sense since the address space manager was rewritten. git-svn-id: svn://svn.valgrind.org/valgrind/trunk@4991 --- none/tests/Makefile.am | 6 ++---- none/tests/as_mmap.c | 35 ---------------------------------- none/tests/as_mmap.stderr.exp | 9 --------- none/tests/as_mmap.stderr.exp2 | 11 ----------- none/tests/as_mmap.vgtest | 2 -- none/tests/as_shm.c | 33 -------------------------------- none/tests/as_shm.stderr.exp | 3 --- none/tests/as_shm.stdout.exp | 1 - none/tests/as_shm.vgtest | 2 -- none/tests/filter_as_mmap | 8 -------- 10 files changed, 2 insertions(+), 108 deletions(-) delete mode 100644 none/tests/as_mmap.c delete mode 100644 none/tests/as_mmap.stderr.exp delete mode 100644 none/tests/as_mmap.stderr.exp2 delete mode 100644 none/tests/as_mmap.vgtest delete mode 100644 none/tests/as_shm.c delete mode 100644 none/tests/as_shm.stderr.exp delete mode 100644 none/tests/as_shm.stdout.exp delete mode 100644 none/tests/as_shm.vgtest delete mode 100755 none/tests/filter_as_mmap diff --git a/none/tests/Makefile.am b/none/tests/Makefile.am index f3c93dd7d9..d807e92326 100644 --- a/none/tests/Makefile.am +++ b/none/tests/Makefile.am @@ -2,14 +2,12 @@ SUBDIRS = ${VG_ARCH} . DIST_SUBDIRS = ${VG_ARCH_ALL} . noinst_SCRIPTS = \ - filter_as_mmap filter_cmdline0 \ + filter_cmdline0 \ filter_fdleak filter_none_discards filter_stderr EXTRA_DIST = $(noinst_SCRIPTS) \ ansi.stderr.exp ansi.vgtest \ args.stderr.exp args.stdout.exp args.vgtest \ - as_mmap.stderr.exp as_mmap.stderr.exp2 as_mmap.vgtest \ - as_shm.stderr.exp as_shm.stdout.exp as_shm.vgtest \ async-sigs.stderr.exp async-sigs.stdout.exp async-sigs.vgtest \ bitfield1.stderr.exp bitfield1.vgtest \ blockfault.vgtest blockfault.stderr.exp blockfault.stdout.exp \ @@ -113,7 +111,7 @@ EXTRA_DIST = $(noinst_SCRIPTS) \ vgprintf.stderr.exp vgprintf.stdout.exp vgprintf.vgtest check_PROGRAMS = \ - ansi args as_mmap as_shm \ + ansi args \ async-sigs bitfield1 blockfault closeall coolo_strlen \ discard exec-sigmask execve faultstatus fcntl_setown \ fdleak_cmsg fdleak_creat fdleak_dup fdleak_dup2 \ diff --git a/none/tests/as_mmap.c b/none/tests/as_mmap.c deleted file mode 100644 index 2d9f04e96e..0000000000 --- a/none/tests/as_mmap.c +++ /dev/null @@ -1,35 +0,0 @@ -#include -#include - -int main() -{ - char local; - char *top = (char *)(((unsigned long)&local + 0x0fffffff) & ~0x0fffffff); - - fprintf(stderr, "1\n"); - if (mmap((void *)0x00000000, 0x10000, PROT_READ|PROT_WRITE, - MAP_PRIVATE|MAP_ANON|MAP_FIXED, -1, 0) == MAP_FAILED) - fprintf(stderr, "mmap @ 0x00000000\n"); - - fprintf(stderr, "2\n"); - if (mmap((void *)0x00010000, 0x10000, PROT_READ|PROT_WRITE, - MAP_PRIVATE|MAP_ANON|MAP_FIXED, -1, 0) == MAP_FAILED) - fprintf(stderr, "mmap @ 0x00010000\n"); - - fprintf(stderr, "3\n"); - if (mmap((void *)0x50000000, 0x10000, PROT_READ|PROT_WRITE, - MAP_PRIVATE|MAP_ANON|MAP_FIXED, -1, 0) == MAP_FAILED) - fprintf(stderr, "mmap @ 0x50000000\n"); - - fprintf(stderr, "4\n"); - if (mmap(top, 0x10000, PROT_READ|PROT_WRITE, - MAP_PRIVATE|MAP_ANON|MAP_FIXED, -1, 0) == MAP_FAILED) - fprintf(stderr, "mmap @ top\n"); - - fprintf(stderr, "5\n"); - if (mmap(top+0x08000000, 0x10000, PROT_READ|PROT_WRITE, - MAP_PRIVATE|MAP_ANON|MAP_FIXED, -1, 0) == MAP_FAILED) - fprintf(stderr, "mmap @ top+.5G\n"); - - return 0; -} diff --git a/none/tests/as_mmap.stderr.exp b/none/tests/as_mmap.stderr.exp deleted file mode 100644 index 9a587e809f..0000000000 --- a/none/tests/as_mmap.stderr.exp +++ /dev/null @@ -1,9 +0,0 @@ - -1 -2 -3 -4 -mmap @ top -5 -mmap @ top+.5G - diff --git a/none/tests/as_mmap.stderr.exp2 b/none/tests/as_mmap.stderr.exp2 deleted file mode 100644 index acd43fa978..0000000000 --- a/none/tests/as_mmap.stderr.exp2 +++ /dev/null @@ -1,11 +0,0 @@ - -1 -2 -3 -4 -Warning: client syscall old_mmap tried to modify addresses 0x........-0x........ -mmap @ top -5 -Warning: client syscall old_mmap tried to modify addresses 0x........-0x........ -mmap @ top+.5G - diff --git a/none/tests/as_mmap.vgtest b/none/tests/as_mmap.vgtest deleted file mode 100644 index b9c615445e..0000000000 --- a/none/tests/as_mmap.vgtest +++ /dev/null @@ -1,2 +0,0 @@ -prog: as_mmap -stderr_filter: filter_as_mmap diff --git a/none/tests/as_shm.c b/none/tests/as_shm.c deleted file mode 100644 index 005c725fa4..0000000000 --- a/none/tests/as_shm.c +++ /dev/null @@ -1,33 +0,0 @@ -#include -#include -#include -#include - -int main() -{ - int shmid = shmget(IPC_PRIVATE, 0x10000, IPC_CREAT|IPC_EXCL|0777); - void *addr; - char local; - char *top = (char *)(((unsigned long)&local + 0x0fffffff) & ~0x0fffffff); - - if (shmid == -1) - perror("shmget"); - - addr = shmat(shmid, 0, 0); - - if (addr == (void *)-1) - perror("shmat @ 0"); - else - printf("shmat 0: addr=...\n"); - - addr = shmat(shmid, top, 0); - - if (addr == (void *)-1) - perror("shmat @ top"); - else - printf("shmat 2: addr=...\n"); - - shmctl(shmid, IPC_RMID, NULL); - - return 0; -} diff --git a/none/tests/as_shm.stderr.exp b/none/tests/as_shm.stderr.exp deleted file mode 100644 index fe2a5d3115..0000000000 --- a/none/tests/as_shm.stderr.exp +++ /dev/null @@ -1,3 +0,0 @@ - -shmat @ top: Cannot allocate memory - diff --git a/none/tests/as_shm.stdout.exp b/none/tests/as_shm.stdout.exp deleted file mode 100644 index 5c3a150d20..0000000000 --- a/none/tests/as_shm.stdout.exp +++ /dev/null @@ -1 +0,0 @@ -shmat 0: addr=... diff --git a/none/tests/as_shm.vgtest b/none/tests/as_shm.vgtest deleted file mode 100644 index f62a95e708..0000000000 --- a/none/tests/as_shm.vgtest +++ /dev/null @@ -1,2 +0,0 @@ -prog: as_shm -stderr_filter: filter_as_mmap diff --git a/none/tests/filter_as_mmap b/none/tests/filter_as_mmap deleted file mode 100755 index 34287969bd..0000000000 --- a/none/tests/filter_as_mmap +++ /dev/null @@ -1,8 +0,0 @@ -#! /bin/sh - -dir=`dirname $0` - -./filter_stderr | - -# Anonymise addresses -$dir/../../tests/filter_addresses -- 2.47.3