Remove writev.stderr.exp3 -- not necessary if we pass -q to Valgrind.
Add writev.stderr.exp2 to the Makefile.am so it gets included in the distro.
git-svn-id: svn://svn.valgrind.org/valgrind/trunk@2939 a5019735-40e9-0310-863c-91ae7b9d1cf9
diff --git a/memcheck/tests/Makefile.am b/memcheck/tests/Makefile.am
index c5041cc..d0bc26e 100644
--- a/memcheck/tests/Makefile.am
+++ b/memcheck/tests/Makefile.am
@@ -65,7 +65,7 @@
threadederrno.stderr.exp threadederrno.stdout.exp \
threadederrno.vgtest \
vgtest_ume.stderr.exp vgtest_ume.vgtest \
- writev.stderr.exp writev.vgtest \
+ writev.stderr.exp writev.stderr.exp2 writev.vgtest \
zeropage.stderr.exp zeropage.stderr.exp2 zeropage.vgtest
check_PROGRAMS = \
diff --git a/memcheck/tests/writev.stderr.exp b/memcheck/tests/writev.stderr.exp
index 685d9c6..67b273c 100644
--- a/memcheck/tests/writev.stderr.exp
+++ b/memcheck/tests/writev.stderr.exp
@@ -1,4 +1,3 @@
-
Test file created.
Syscall param writev(vector[...]) contains uninitialised or unaddressable byte(s)
at 0x........: writev (in /...libc...)
@@ -17,9 +16,3 @@
by 0x........: main (writev.c:76)
Address 0x........ is not stack'd, malloc'd or (recently) free'd
Received EINVAL as expected
-
-ERROR SUMMARY: 3 errors from 3 contexts (suppressed: 0 from 0)
-malloc/free: in use at exit: 0 bytes in 0 blocks.
-malloc/free: 0 allocs, 0 frees, 0 bytes allocated.
-For a detailed leak analysis, rerun with: --leak-check=yes
-For counts of detected errors, rerun with: -v
diff --git a/memcheck/tests/writev.stderr.exp2 b/memcheck/tests/writev.stderr.exp2
index 001b2b2..18dfcf0 100644
--- a/memcheck/tests/writev.stderr.exp2
+++ b/memcheck/tests/writev.stderr.exp2
@@ -1,4 +1,3 @@
-
Test file created.
Syscall param writev(vector[...]) contains uninitialised or unaddressable byte(s)
at 0x........: (within /...libc...)
@@ -17,9 +16,3 @@
by 0x........: main (writev.c:76)
Address 0x........ is not stack'd, malloc'd or (recently) free'd
Received EINVAL as expected
-
-ERROR SUMMARY: 3 errors from 3 contexts (suppressed: 0 from 0)
-malloc/free: in use at exit: 0 bytes in 0 blocks.
-malloc/free: 0 allocs, 0 frees, 0 bytes allocated.
-For a detailed leak analysis, rerun with: --leak-check=yes
-For counts of detected errors, rerun with: -v
diff --git a/memcheck/tests/writev.stderr.exp3 b/memcheck/tests/writev.stderr.exp3
deleted file mode 100644
index b241699..0000000
--- a/memcheck/tests/writev.stderr.exp3
+++ /dev/null
@@ -1,25 +0,0 @@
-
-Test file created.
-Syscall param writev(vector[...]) contains uninitialised or unaddressable byte(s)
- at 0x........: writev (in /...libc...)
- by 0x........: main (writev.c:56)
- Address 0x........ is not stack'd, malloc'd or (recently) free'd
-Received EFAULT as expected
-
-Syscall param writev(vector) contains uninitialised or unaddressable byte(s)
- at 0x........: writev (in /...libc...)
- by 0x........: main (writev.c:68)
- Address 0x........ is not stack'd, malloc'd or (recently) free'd
-Received EINVAL as expected
-
-Syscall param readv(vector) contains uninitialised or unaddressable byte(s)
- at 0x........: readv (in /...libc...)
- by 0x........: main (writev.c:76)
- Address 0x........ is not stack'd, malloc'd or (recently) free'd
-Received EINVAL as expected
-
-ERROR SUMMARY: 3 errors from 3 contexts (suppressed: 0 from 0)
-malloc/free: in use at exit: 0 bytes in 0 blocks.
-malloc/free: 1 allocs, 1 frees, 24 bytes allocated.
-For a detailed leak analysis, rerun with: --leak-check=yes
-For counts of detected errors, rerun with: -v
diff --git a/memcheck/tests/writev.vgtest b/memcheck/tests/writev.vgtest
index 0670cc7..69993c2 100644
--- a/memcheck/tests/writev.vgtest
+++ b/memcheck/tests/writev.vgtest
@@ -1 +1,2 @@
prog: writev
+vgopts: -q