|
From: <sv...@va...> - 2009-02-25 04:08:04
|
Author: njn
Date: 2009-02-25 04:07:56 +0000 (Wed, 25 Feb 2009)
New Revision: 9258
Log:
Merge r9257 (delete memcheck/tests/zeropage) from the trunk.
Removed:
branches/DARWIN/memcheck/tests/zeropage.c
branches/DARWIN/memcheck/tests/zeropage.stderr.exp
branches/DARWIN/memcheck/tests/zeropage.stderr.exp2
branches/DARWIN/memcheck/tests/zeropage.stdout.exp
branches/DARWIN/memcheck/tests/zeropage.stdout.exp-glibc27
branches/DARWIN/memcheck/tests/zeropage.vgtest
Modified:
branches/DARWIN/memcheck/tests/Makefile.am
Modified: branches/DARWIN/memcheck/tests/Makefile.am
===================================================================
--- branches/DARWIN/memcheck/tests/Makefile.am 2009-02-25 04:04:29 UTC (rev 9257)
+++ branches/DARWIN/memcheck/tests/Makefile.am 2009-02-25 04:07:56 UTC (rev 9258)
@@ -177,9 +177,7 @@
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 @@
vcpu_fbench vcpu_fnfns \
xml1 \
wrap1 wrap2 wrap3 wrap4 wrap5 wrap6 wrap7 wrap7so.so wrap8 \
- writev zeropage
+ writev
AM_CFLAGS += $(AM_FLAG_M3264_PRI)
Deleted: branches/DARWIN/memcheck/tests/zeropage.c
===================================================================
--- branches/DARWIN/memcheck/tests/zeropage.c 2009-02-25 04:04:29 UTC (rev 9257)
+++ branches/DARWIN/memcheck/tests/zeropage.c 2009-02-25 04:07:56 UTC (rev 9258)
@@ -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;
-}
Deleted: branches/DARWIN/memcheck/tests/zeropage.stderr.exp
===================================================================
Deleted: branches/DARWIN/memcheck/tests/zeropage.stderr.exp2
===================================================================
--- branches/DARWIN/memcheck/tests/zeropage.stderr.exp2 2009-02-25 04:04:29 UTC (rev 9257)
+++ branches/DARWIN/memcheck/tests/zeropage.stderr.exp2 2009-02-25 04:07:56 UTC (rev 9258)
@@ -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........
Deleted: branches/DARWIN/memcheck/tests/zeropage.stdout.exp
===================================================================
--- branches/DARWIN/memcheck/tests/zeropage.stdout.exp 2009-02-25 04:04:29 UTC (rev 9257)
+++ branches/DARWIN/memcheck/tests/zeropage.stdout.exp 2009-02-25 04:07:56 UTC (rev 9258)
@@ -1,3 +0,0 @@
-succeeded?!
-succeeded?!
-succeeded?!
Deleted: branches/DARWIN/memcheck/tests/zeropage.stdout.exp-glibc27
===================================================================
Deleted: branches/DARWIN/memcheck/tests/zeropage.vgtest
===================================================================
--- branches/DARWIN/memcheck/tests/zeropage.vgtest 2009-02-25 04:04:29 UTC (rev 9257)
+++ branches/DARWIN/memcheck/tests/zeropage.vgtest 2009-02-25 04:07:56 UTC (rev 9258)
@@ -1,2 +0,0 @@
-prog: zeropage
-vgopts: -q
|