Menu
▾
▴
[Valgrind-developers] valgrind: r9260 - in branches/DARWIN/memcheck/tests: x86 x86-linux
|
From: <sv...@va...> - 2009-02-25 04:27:31
|
Author: njn
Date: 2009-02-25 04:27:25 +0000 (Wed, 25 Feb 2009)
New Revision: 9260
Log:
Merge r9259 (move bug133594) from the trunk.
Added:
branches/DARWIN/memcheck/tests/x86-linux/bug133694.c
branches/DARWIN/memcheck/tests/x86-linux/bug133694.stderr.exp
branches/DARWIN/memcheck/tests/x86-linux/bug133694.stdout.exp
branches/DARWIN/memcheck/tests/x86-linux/bug133694.vgtest
Removed:
branches/DARWIN/memcheck/tests/x86/bug133694.c
branches/DARWIN/memcheck/tests/x86/bug133694.stderr.exp
branches/DARWIN/memcheck/tests/x86/bug133694.stdout.exp
branches/DARWIN/memcheck/tests/x86/bug133694.vgtest
Modified:
branches/DARWIN/memcheck/tests/x86-linux/Makefile.am
branches/DARWIN/memcheck/tests/x86/Makefile.am
Modified: branches/DARWIN/memcheck/tests/x86/Makefile.am
===================================================================
--- branches/DARWIN/memcheck/tests/x86/Makefile.am 2009-02-25 04:20:54 UTC (rev 9259)
+++ branches/DARWIN/memcheck/tests/x86/Makefile.am 2009-02-25 04:27:25 UTC (rev 9260)
@@ -6,7 +6,6 @@
INSN_TESTS = insn_basic insn_fpu insn_cmov insn_mmx insn_mmxext insn_sse insn_sse2
EXTRA_DIST = $(noinst_SCRIPTS) \
- bug133694.vgtest bug133694.stderr.exp bug133694.stdout.exp \
bug152022.vgtest bug152022.stderr.exp bug152022.stdout.exp \
espindola2.vgtest espindola2.stderr.exp \
fpeflags.stderr.exp fpeflags.vgtest \
@@ -27,7 +26,6 @@
xor-undef-x86.vgtest
check_PROGRAMS = \
- bug133694 \
bug152022 \
espindola2 \
fpeflags \
Deleted: branches/DARWIN/memcheck/tests/x86/bug133694.c
===================================================================
--- branches/DARWIN/memcheck/tests/x86/bug133694.c 2009-02-25 04:20:54 UTC (rev 9259)
+++ branches/DARWIN/memcheck/tests/x86/bug133694.c 2009-02-25 04:27:25 UTC (rev 9260)
@@ -1,39 +0,0 @@
-#include <stdio.h>
-#include <stdlib.h>
-#include <sys/mman.h>
-
-#if defined(__APPLE__)
-# define MAP_ANONYMOUS MAP_ANON
-#endif
-
-int main(int argc, char **argv)
-{
- void *a1;
-
- if ((a1 = mmap((void *)0x200000, 4096, PROT_READ|PROT_WRITE, MAP_PRIVATE|MAP_FIXED|MAP_ANONYMOUS, -1, 0)) == MAP_FAILED)
- {
- perror("mmap1");
- exit(1);
- }
-
- if (munmap(a1, 4096) < 0)
- {
- perror("munmap1");
- exit(1);
- }
-
- if (mmap((void *)0x100000, 4096, PROT_READ|PROT_WRITE, MAP_PRIVATE|MAP_FIXED|MAP_ANONYMOUS, -1, 0) == MAP_FAILED)
- {
- perror("mmap2");
- exit(1);
- }
-
- if (mmap((void *)0x100000, 4096, PROT_READ|PROT_WRITE, MAP_PRIVATE|MAP_ANONYMOUS, -1, 0) == MAP_FAILED)
- {
- perror("mmap2");
- exit(1);
- }
-
- printf("success\n");
- exit(0);
-}
Deleted: branches/DARWIN/memcheck/tests/x86/bug133694.stderr.exp
===================================================================
Deleted: branches/DARWIN/memcheck/tests/x86/bug133694.stdout.exp
===================================================================
--- branches/DARWIN/memcheck/tests/x86/bug133694.stdout.exp 2009-02-25 04:20:54 UTC (rev 9259)
+++ branches/DARWIN/memcheck/tests/x86/bug133694.stdout.exp 2009-02-25 04:27:25 UTC (rev 9260)
@@ -1 +0,0 @@
-success
Deleted: branches/DARWIN/memcheck/tests/x86/bug133694.vgtest
===================================================================
--- branches/DARWIN/memcheck/tests/x86/bug133694.vgtest 2009-02-25 04:20:54 UTC (rev 9259)
+++ branches/DARWIN/memcheck/tests/x86/bug133694.vgtest 2009-02-25 04:27:25 UTC (rev 9260)
@@ -1,2 +0,0 @@
-prog: bug133694
-vgopts: -q
Modified: branches/DARWIN/memcheck/tests/x86-linux/Makefile.am
===================================================================
--- branches/DARWIN/memcheck/tests/x86-linux/Makefile.am 2009-02-25 04:20:54 UTC (rev 9259)
+++ branches/DARWIN/memcheck/tests/x86-linux/Makefile.am 2009-02-25 04:27:25 UTC (rev 9260)
@@ -6,6 +6,7 @@
noinst_HEADERS = scalar.h
EXTRA_DIST = $(noinst_SCRIPTS) \
+ bug133694.vgtest bug133694.stderr.exp bug133694.stdout.exp \
scalar.stderr.exp scalar.vgtest \
scalar_fork.stderr.exp scalar_fork.vgtest \
scalar_exit_group.stderr.exp \
@@ -15,6 +16,7 @@
scalar_vfork.stderr.exp scalar_vfork.vgtest
check_PROGRAMS = \
+ bug133694 \
scalar scalar_exit_group scalar_fork scalar_supp scalar_vfork
Copied: branches/DARWIN/memcheck/tests/x86-linux/bug133694.c (from rev 9259, trunk/memcheck/tests/x86-linux/bug133694.c)
===================================================================
--- branches/DARWIN/memcheck/tests/x86-linux/bug133694.c (rev 0)
+++ branches/DARWIN/memcheck/tests/x86-linux/bug133694.c 2009-02-25 04:27:25 UTC (rev 9260)
@@ -0,0 +1,35 @@
+#include <stdio.h>
+#include <stdlib.h>
+#include <sys/mman.h>
+
+int main(int argc, char **argv)
+{
+ void *a1;
+
+ if ((a1 = mmap((void *)0x200000, 4096, PROT_READ|PROT_WRITE, MAP_PRIVATE|MAP_FIXED|MAP_ANONYMOUS, -1, 0)) == MAP_FAILED)
+ {
+ perror("mmap1");
+ exit(1);
+ }
+
+ if (munmap(a1, 4096) < 0)
+ {
+ perror("munmap1");
+ exit(1);
+ }
+
+ if (mmap((void *)0x100000, 4096, PROT_READ|PROT_WRITE, MAP_PRIVATE|MAP_FIXED|MAP_ANONYMOUS, -1, 0) == MAP_FAILED)
+ {
+ perror("mmap2");
+ exit(1);
+ }
+
+ if (mmap((void *)0x100000, 4096, PROT_READ|PROT_WRITE, MAP_PRIVATE|MAP_ANONYMOUS, -1, 0) == MAP_FAILED)
+ {
+ perror("mmap2");
+ exit(1);
+ }
+
+ printf("success\n");
+ exit(0);
+}
Copied: branches/DARWIN/memcheck/tests/x86-linux/bug133694.stderr.exp (from rev 9259, trunk/memcheck/tests/x86-linux/bug133694.stderr.exp)
===================================================================
Copied: branches/DARWIN/memcheck/tests/x86-linux/bug133694.stdout.exp (from rev 9259, trunk/memcheck/tests/x86-linux/bug133694.stdout.exp)
===================================================================
--- branches/DARWIN/memcheck/tests/x86-linux/bug133694.stdout.exp (rev 0)
+++ branches/DARWIN/memcheck/tests/x86-linux/bug133694.stdout.exp 2009-02-25 04:27:25 UTC (rev 9260)
@@ -0,0 +1 @@
+success
Copied: branches/DARWIN/memcheck/tests/x86-linux/bug133694.vgtest (from rev 9259, trunk/memcheck/tests/x86-linux/bug133694.vgtest)
===================================================================
--- branches/DARWIN/memcheck/tests/x86-linux/bug133694.vgtest (rev 0)
+++ branches/DARWIN/memcheck/tests/x86-linux/bug133694.vgtest 2009-02-25 04:27:25 UTC (rev 9260)
@@ -0,0 +1,2 @@
+prog: bug133694
+vgopts: -q
|
