Fix 247386 make perf does not run all performance tests :

* move memcheck/perf/many-loss-records test to perf directory
       massif/perf/many-xpts test to perf directory
* modified many-loss-records.vgperf and many-xpts.vgperf,
  so as to have tool specific options prefixed with their tool
* remove directory memcheck/perf and massif/perf (containing no test anymore)

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

diff --git a/NEWS b/NEWS
index 29ffd5a38d4e4b40e96f26e45ce0775e1f00a178..b5eb516a49d3573efffbf30bdabf228e1da445f4 100644 (file)
--- a/NEWS
+++ b/NEWS
@@ -23,6 +23,7 @@ To see details of a given bug, visit
 https://bugs.kde.org/show_bug.cgi?id=XXXXXX
 where XXXXXX is the bug number as listed below.
 
+247386  make perf does not run all performance tests
 276993  fix mremap 'no thrash checks' 
 283413  Fix wrong sanity check
 286270  vgpreload is not friendly to 64->32 bit execs, gives ld.so warnings

diff --git a/configure.in b/configure.in
index 39097c11164ebe51c70e3debbd4c369bad47b7b6..40f662ec574c2b5ac63b60906f7709e15b9d3ba1 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -2081,7 +2081,6 @@ AC_CONFIG_FILES([
    memcheck/tests/x86-linux/Makefile
    memcheck/tests/ppc32/Makefile
    memcheck/tests/ppc64/Makefile
-   memcheck/perf/Makefile
    cachegrind/Makefile
    cachegrind/tests/Makefile
    cachegrind/tests/x86/Makefile
@@ -2095,7 +2094,6 @@ AC_CONFIG_FILES([
    helgrind/tests/Makefile
    massif/Makefile
    massif/tests/Makefile
-   massif/perf/Makefile
    massif/ms_print
    lackey/Makefile
    lackey/tests/Makefile

diff --git a/massif/Makefile.am b/massif/Makefile.am
index 94bcd68bc81fcd424febef747314faaff2ef1126..6c26780c124ccdcc35a7c279067d044e4ef3791f 100644 (file)
--- a/massif/Makefile.am
+++ b/massif/Makefile.am
@@ -1,7 +1,5 @@
 include $(top_srcdir)/Makefile.tool.am
 
-SUBDIRS += perf
-
 EXTRA_DIST = \
        docs/ms-manual.xml \
        docs/ms_print-manpage.xml

diff --git a/massif/perf/Makefile.am b/massif/perf/Makefile.am
deleted file mode 100644 (file)
index 8e6fb42..0000000
--- a/massif/perf/Makefile.am
+++ /dev/null
@@ -1,12 +0,0 @@
-
-include $(top_srcdir)/Makefile.tool-tests.am
-
-EXTRA_DIST = \
-       many-xpts.vgperf
-
-check_PROGRAMS = \
-       many-xpts
-
-AM_CFLAGS   += -O $(AM_FLAG_M3264_PRI)
-AM_CXXFLAGS += -O $(AM_FLAG_M3264_PRI)
-

diff --git a/massif/perf/many-xpts.vgperf b/massif/perf/many-xpts.vgperf
deleted file mode 100644 (file)
index d6ce056..0000000
--- a/massif/perf/many-xpts.vgperf
+++ /dev/null
@@ -1,2 +0,0 @@
-prog: many-xpts
-vgopts: --time-unit=B --depth=100

diff --git a/memcheck/Makefile.am b/memcheck/Makefile.am
index 5f8fd2e2fe886a2ed50d4e65f929160f4d2a5c36..c4dbe9808c920efde4d68a981124603377b2563f 100644 (file)
--- a/memcheck/Makefile.am
+++ b/memcheck/Makefile.am
@@ -1,7 +1,5 @@
 include $(top_srcdir)/Makefile.tool.am
 
-SUBDIRS += perf
-
 EXTRA_DIST = docs/mc-manual.xml docs/mc-tech-docs.xml
 
 #----------------------------------------------------------------------------

diff --git a/memcheck/perf/Makefile.am b/memcheck/perf/Makefile.am
deleted file mode 100644 (file)
index ab6a5c7..0000000
--- a/memcheck/perf/Makefile.am
+++ /dev/null
@@ -1,11 +0,0 @@
-
-include $(top_srcdir)/Makefile.tool-tests.am
-
-EXTRA_DIST = \
-       many-loss-records.vgperf
-
-check_PROGRAMS = \
-       many-loss-records
-
-AM_CFLAGS   += -O $(AM_FLAG_M3264_PRI)
-AM_CXXFLAGS += -O $(AM_FLAG_M3264_PRI)

diff --git a/memcheck/perf/many-loss-records.vgperf b/memcheck/perf/many-loss-records.vgperf
deleted file mode 100644 (file)
index 37d4f49..0000000
--- a/memcheck/perf/many-loss-records.vgperf
+++ /dev/null
@@ -1,2 +0,0 @@
-prog: many-loss-records
-vgopts: --leak-check=yes --leak-resolution=high

diff --git a/perf/Makefile.am b/perf/Makefile.am
index 6d4eb42403408752d2ad0908015ab3b12b2442b5..ad5ceac6084f180b714d3a0a9c0e14228788f845 100644 (file)
--- a/perf/Makefile.am
+++ b/perf/Makefile.am
@@ -10,12 +10,14 @@ EXTRA_DIST = \
        fbench.vgperf \
        ffbench.vgperf \
        heap.vgperf \
+       many-loss-records.vgperf \
+       many-xpts.vgperf \
        sarp.vgperf \
        tinycc.vgperf \
        test_input_for_tinycc.c
 
 check_PROGRAMS = \
-       bigcode bz2 fbench ffbench heap sarp tinycc
+       bigcode bz2 fbench ffbench heap many-loss-records many-xpts sarp tinycc
 
 AM_CFLAGS   += -O $(AM_FLAG_M3264_PRI)
 AM_CXXFLAGS += -O $(AM_FLAG_M3264_PRI)

diff --git a/memcheck/perf/many-loss-records.c b/perf/many-loss-records.c
similarity index 100%
rename from memcheck/perf/many-loss-records.c
rename to perf/many-loss-records.c

diff --git a/perf/many-loss-records.vgperf b/perf/many-loss-records.vgperf
new file mode 100644 (file)
index 0000000..39d5a39
--- /dev/null
+++ b/perf/many-loss-records.vgperf
@@ -0,0 +1,2 @@
+prog: many-loss-records
+vgopts: --memcheck:leak-check=yes --memcheck:leak-resolution=high

diff --git a/massif/perf/many-xpts.c b/perf/many-xpts.c
similarity index 100%
rename from massif/perf/many-xpts.c
rename to perf/many-xpts.c

diff --git a/perf/many-xpts.vgperf b/perf/many-xpts.vgperf
new file mode 100644 (file)
index 0000000..b2aff1a
--- /dev/null
+++ b/perf/many-xpts.vgperf
@@ -0,0 +1,2 @@
+prog: many-xpts
+vgopts: --massif:time-unit=B --massif:depth=100