Delete memcheck/tests/zeropage. The original purpose of the test is no

longer valid, as the comment indicates.  Furthermore it mmaps arbitrary bits
of address space and so is horribly unportable, and doesn't work on Darwin.

git-svn-id: svn://svn.valgrind.org/valgrind/trunk@9257

diff --git a/memcheck/tests/Makefile.am b/memcheck/tests/Makefile.am
index 0e6f5eb0a6e1830752c5daa5f58c026ac5b651e3..8461d9ee96c92106105c29227a86c682a1036387 100644 (file)
--- a/memcheck/tests/Makefile.am
+++ b/memcheck/tests/Makefile.am
@@ -177,9 +177,7 @@ EXTRA_DIST = $(noinst_SCRIPTS) \
        writev.stderr.exp writev.vgtest \
        xml1.stderr.exp xml1.stderr.exp2 \
        xml1.stderr.exp64 xml1.stdout.exp \
-       xml1.vgtest \
-       zeropage.stderr.exp zeropage.stderr.exp2 zeropage.stdout.exp \
-       zeropage.vgtest
+       xml1.vgtest
 
 check_PROGRAMS = \
        addressable \
@@ -224,7 +222,7 @@ check_PROGRAMS = \
        vcpu_fbench vcpu_fnfns \
        xml1 \
        wrap1 wrap2 wrap3 wrap4 wrap5 wrap6 wrap7 wrap7so.so wrap8 \
-       writev zeropage
+       writev
 
 
 AM_CFLAGS   += $(AM_FLAG_M3264_PRI)

diff --git a/memcheck/tests/zeropage.c b/memcheck/tests/zeropage.c
deleted file mode 100644 (file)
index 4302b2f..0000000
--- a/memcheck/tests/zeropage.c
+++ /dev/null
@@ -1,38 +0,0 @@
-#include <sys/mman.h>
-#include <stdlib.h>
-#include <stdio.h>
-#include <sys/types.h>
-#include <unistd.h>
-
-/* The quick sanity check of Memcheck (and other tools with shadow memory)
-   relies on the first 64KB of memory never being used.  So our mmap()
-   refuses to touch this area.  This program tests for that.
-   [actually, no longer true, these all now succeed.] */
-int main(void)
-{
-   /* mmap(0x0, ... FIXED) should fail */
-   int* m = mmap(0x0, 4096, PROT_READ|PROT_WRITE, 
-                 MAP_PRIVATE|MAP_ANON|MAP_FIXED, -1, 0);
-   if (m != (int*)-1)
-      printf("succeeded?!\n");
-
-   /* mmap(0x1000, ... FIXED) should fail */
-        m = mmap((void*)0x1000, 4096, PROT_READ|PROT_WRITE, 
-                 MAP_PRIVATE|MAP_ANON|MAP_FIXED, -1, 0);
-   if (m != (int*)-1)
-      printf("succeeded?!\n");
-
-   /* mmap(0xa000, ... FIXED) should fail */
-        m = mmap((void*)0xa000, 4096, PROT_READ|PROT_WRITE, 
-                 MAP_PRIVATE|MAP_ANON|MAP_FIXED, -1, 0);
-   if (m != (int*)-1)
-      printf("succeeded?!\n");
-
-   /* mmap(0x10000, ... FIXED) should fail */
-        m = mmap((void*)0x10000, 4096, PROT_READ|PROT_WRITE, 
-                 MAP_PRIVATE|MAP_ANON|MAP_FIXED, -1, 0);
-   if (m == (int*)-1)
-      printf("failed?!\n");
-
-   return 0;
-}

diff --git a/memcheck/tests/zeropage.stderr.exp b/memcheck/tests/zeropage.stderr.exp
deleted file mode 100644 (file)
index e69de29..0000000

diff --git a/memcheck/tests/zeropage.stderr.exp2 b/memcheck/tests/zeropage.stderr.exp2
deleted file mode 100644 (file)
index 2424bb9..0000000
--- a/memcheck/tests/zeropage.stderr.exp2
+++ /dev/null
@@ -1,3 +0,0 @@
-Warning: client syscall old_mmap tried to modify addresses 0x........-0x........
-Warning: client syscall old_mmap tried to modify addresses 0x........-0x........
-Warning: client syscall old_mmap tried to modify addresses 0x........-0x........

diff --git a/memcheck/tests/zeropage.stdout.exp b/memcheck/tests/zeropage.stdout.exp
deleted file mode 100644 (file)
index 9fb8645..0000000
--- a/memcheck/tests/zeropage.stdout.exp
+++ /dev/null
@@ -1,3 +0,0 @@
-succeeded?!
-succeeded?!
-succeeded?!

diff --git a/memcheck/tests/zeropage.stdout.exp-glibc27 b/memcheck/tests/zeropage.stdout.exp-glibc27
deleted file mode 100644 (file)
index e69de29..0000000

diff --git a/memcheck/tests/zeropage.vgtest b/memcheck/tests/zeropage.vgtest
deleted file mode 100644 (file)
index 89038e4..0000000
--- a/memcheck/tests/zeropage.vgtest
+++ /dev/null
@@ -1,2 +0,0 @@
-prog: zeropage
-vgopts: -q