From: Florian Krohm <florian@eich-krohm.de>
Date: Tue, 4 Oct 2011 03:33:59 +0000 (+0000)
Subject: Turns out there is at least one version of glibc tat contains
X-Git-Tag: svn/VALGRIND_3_7_0~144
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=d2b0c7d9826fa41b0052f2d1baf51eae77fa7357;p=thirdparty%2Fvalgrind.git

Turns out there is at least one version of glibc tat contains
a file name writev.c. This screws our filename based backtrace
filtering. Rename writev to writev1 to avoid that problem.


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

diff --git a/memcheck/tests/Makefile.am b/memcheck/tests/Makefile.am
index 8dd06ef3c3..2c44fcfa26 100644
--- a/memcheck/tests/Makefile.am
+++ b/memcheck/tests/Makefile.am
@@ -201,7 +201,7 @@ EXTRA_DIST = \
 	wrap7.vgtest wrap7.stdout.exp wrap7.stderr.exp \
 	wrap8.vgtest wrap8.stdout.exp wrap8.stderr.exp \
 	wrap8.stdout.exp2 wrap8.stderr.exp2 \
-	writev.stderr.exp writev.vgtest \
+	writev1.stderr.exp writev1.vgtest \
 	xml1.stderr.exp xml1.stdout.exp xml1.vgtest
 
 check_PROGRAMS = \
@@ -261,7 +261,7 @@ check_PROGRAMS = \
 	vcpu_fbench vcpu_fnfns \
 	xml1 \
 	wrap1 wrap2 wrap3 wrap4 wrap5 wrap6 wrap7 wrap7so.so wrap8 \
-	writev
+	writev1
 
 
 AM_CFLAGS   += $(AM_FLAG_M3264_PRI)
diff --git a/memcheck/tests/writev.vgtest b/memcheck/tests/writev.vgtest
deleted file mode 100644
index 69993c2089..0000000000
--- a/memcheck/tests/writev.vgtest
+++ /dev/null
@@ -1,2 +0,0 @@
-prog: writev
-vgopts: -q
diff --git a/memcheck/tests/writev.c b/memcheck/tests/writev1.c
similarity index 100%
rename from memcheck/tests/writev.c
rename to memcheck/tests/writev1.c
diff --git a/memcheck/tests/writev.stderr.exp b/memcheck/tests/writev1.stderr.exp
similarity index 72%
rename from memcheck/tests/writev.stderr.exp
rename to memcheck/tests/writev1.stderr.exp
index 41845cd60a..6063a3805f 100644
--- a/memcheck/tests/writev.stderr.exp
+++ b/memcheck/tests/writev1.stderr.exp
@@ -1,19 +1,19 @@
 Test file created.
 Syscall param writev(vector[...]) points to unaddressable byte(s)
-   at 0x........: writev (writev.c:51)
-   by 0x........: main (writev.c:56)
+   ...
+   by 0x........: main (writev1.c:56)
  Address 0x........ is not stack'd, malloc'd or (recently) free'd
 
 Received EFAULT as expected
 Syscall param writev(vector) points to unaddressable byte(s)
-   at 0x........: writev (writev.c:51)
-   by 0x........: main (writev.c:68)
+   ...
+   by 0x........: main (writev1.c:68)
  Address 0x........ is not stack'd, malloc'd or (recently) free'd
 
 Received EINVAL as expected
 Syscall param readv(vector) points to unaddressable byte(s)
    ...
-   by 0x........: main (writev.c:76)
+   by 0x........: main (writev1.c:76)
  Address 0x........ is not stack'd, malloc'd or (recently) free'd
 
 Received EINVAL as expected
diff --git a/memcheck/tests/writev1.vgtest b/memcheck/tests/writev1.vgtest
new file mode 100644
index 0000000000..826445f56b
--- /dev/null
+++ b/memcheck/tests/writev1.vgtest
@@ -0,0 +1,2 @@
+prog: writev1
+vgopts: -q