trunk/memcheck/tests/Makefile.am
trunk/memcheck/tests/vcpu_bz2.c
trunk/memcheck/tests/vcpu_bz2.vgtest
vcpu_bz2.c was (I think) an "svn copy" of perf/bz2.c. Because it's a
copy, the two can get out of sync, which was a problem with Greg
Parker's Darwin patch. So we remove vcpu_bz2.c, and make
vcpu_bz2.vgtest invoke perf/bz2 directly.
trunk/cachegrind/tests/wrap5.c
trunk/cachegrind/tests/Makefile.am
trunk/cachegrind/tests/wrap5.vgtest
wrap5.c was likewise an "svn copy" of memcheck/tests/wrap5.c, so we do
the equivalent thing with it.
trunk/Makefile.am
Fix a typo.
git-svn-id: svn://svn.valgrind.org/valgrind/trunk@8919 a5019735-40e9-0310-863c-91ae7b9d1cf9
diff --git a/Makefile.am b/Makefile.am
index 14b728e..e66b4bc 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -76,7 +76,7 @@
exp-regtest: check
@PERL@ tests/vg_regtest $(EXP_TOOLS)
-## Preprend @PERL@ because tests/vg_per isn't executable
+## Preprend @PERL@ because tests/vg_perf isn't executable
perf: check
@PERL@ perf/vg_perf perf
diff --git a/cachegrind/tests/Makefile.am b/cachegrind/tests/Makefile.am
index 4a40e77..e49b01c 100644
--- a/cachegrind/tests/Makefile.am
+++ b/cachegrind/tests/Makefile.am
@@ -27,7 +27,7 @@
wrap5.vgtest wrap5.stderr.exp wrap5.stdout.exp
check_PROGRAMS = \
- chdir clreq dlclose myprint.so wrap5
+ chdir clreq dlclose myprint.so
AM_CPPFLAGS = -I$(top_srcdir)/include
AM_CFLAGS = $(WERROR) -Winline -Wall -Wshadow -g $(AM_FLAG_M3264_PRI)
@@ -37,14 +37,3 @@
myprint_so_SOURCES = myprint.c
myprint_so_LDFLAGS = $(AM_FLAG_M3264_PRI) -shared -fPIC
myprint_so_CFLAGS = $(AM_FLAG_M3264_PRI) -fPIC
-
-if VGP_PPC32_AIX5
-if VGP_PPC64_AIX5
-else
- # persuade the AIX linker not to junk apparently unused
- # function descriptors. Unfortunately -Wl,-G -Wl,-bnogc
- # produces a link error on 64-bit AIX, hence only 32-bit
- # gets these flags.
- wrap5_LDFLAGS = $(AM_FLAG_M3264_PRI) -Wl,-G -Wl,-bnogc
-endif
-endif
diff --git a/cachegrind/tests/wrap5.c b/cachegrind/tests/wrap5.c
deleted file mode 120000
index c8e8aa4..0000000
--- a/cachegrind/tests/wrap5.c
+++ /dev/null
@@ -1 +0,0 @@
-../../memcheck/tests/wrap5.c
\ No newline at end of file
diff --git a/cachegrind/tests/wrap5.vgtest b/cachegrind/tests/wrap5.vgtest
index add0500..51a172f 100644
--- a/cachegrind/tests/wrap5.vgtest
+++ b/cachegrind/tests/wrap5.vgtest
@@ -1,2 +1,2 @@
-prog: wrap5
+prog: ../../memcheck/tests/wrap5
cleanup: rm cachegrind.out.*
diff --git a/memcheck/tests/Makefile.am b/memcheck/tests/Makefile.am
index d87bb4b..eedbd19 100644
--- a/memcheck/tests/Makefile.am
+++ b/memcheck/tests/Makefile.am
@@ -222,7 +222,7 @@
mismatches new_override metadata \
varinfo1 varinfo2 varinfo3 varinfo4 \
varinfo5 varinfo5so.so varinfo6 \
- vcpu_bz2 vcpu_fbench vcpu_fnfns \
+ vcpu_fbench vcpu_fnfns \
xml1 \
wrap1 wrap2 wrap3 wrap4 wrap5 wrap6 wrap7 wrap7so.so wrap8 \
writev zeropage
diff --git a/memcheck/tests/vcpu_bz2.c b/memcheck/tests/vcpu_bz2.c
deleted file mode 120000
index 0137af4..0000000
--- a/memcheck/tests/vcpu_bz2.c
+++ /dev/null
@@ -1 +0,0 @@
-../../perf/bz2.c
\ No newline at end of file
diff --git a/memcheck/tests/vcpu_bz2.vgtest b/memcheck/tests/vcpu_bz2.vgtest
index 546133d..4cc209b 100644
--- a/memcheck/tests/vcpu_bz2.vgtest
+++ b/memcheck/tests/vcpu_bz2.vgtest
@@ -1,3 +1,3 @@
-prog: vcpu_bz2
+prog: ../../perf/bz2
args: x
vgopts: -q