Remove nanoleak.vgtest, it's a trivial test. nanoleak.c is used by

nanoleak_supp.vgtest, however, so rename it nanoleak_supp.c to make the
connection more obvious.

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

diff --git a/memcheck/tests/Makefile.am b/memcheck/tests/Makefile.am
index df608cc0a5ffe508df8332dffd0653a33dbb1c8d..1d2e9a62cab88c9a3283e5fe6c2fe07ac3750ba1 100644 (file)
--- a/memcheck/tests/Makefile.am
+++ b/memcheck/tests/Makefile.am
@@ -94,7 +94,6 @@ EXTRA_DIST = $(noinst_SCRIPTS) \
        metadata.stderr.exp metadata.stdout.exp metadata.vgtest \
        mismatches.stderr.exp mismatches.vgtest \
        mmaptest.stderr.exp mmaptest.vgtest \
-       nanoleak.stderr.exp nanoleak.vgtest \
        nanoleak_supp.stderr.exp nanoleak_supp.vgtest nanoleak.supp \
        nanoleak2.stderr.exp nanoleak2.vgtest \
        new_nothrow.stderr.exp new_nothrow.vgtest \
@@ -198,7 +197,7 @@ check_PROGRAMS = \
        match-overrun \
        memalign_test memalign2 memcmptest mempool mmaptest \
        mismatches new_override metadata \
-       nanoleak nanoleak2 new_nothrow \
+       nanoleak_supp nanoleak2 new_nothrow \
        noisy_child \
        null_socket \
        origin1-yes origin2-not-quite origin3-no \

diff --git a/memcheck/tests/nanoleak.stderr.exp b/memcheck/tests/nanoleak.stderr.exp
deleted file mode 100644 (file)
index 91683c1..0000000
--- a/memcheck/tests/nanoleak.stderr.exp
+++ /dev/null
@@ -1,4 +0,0 @@
-
-1,000 bytes in 1 blocks are definitely lost in loss record ... of ...
-   at 0x........: malloc (vg_replace_malloc.c:...)
-   by 0x........: main (nanoleak.c:6)

diff --git a/memcheck/tests/nanoleak.vgtest b/memcheck/tests/nanoleak.vgtest
deleted file mode 100644 (file)
index 30053e6..0000000
--- a/memcheck/tests/nanoleak.vgtest
+++ /dev/null
@@ -1,2 +0,0 @@
-vgopts: --leak-check=yes -q
-prog: nanoleak

diff --git a/memcheck/tests/nanoleak.c b/memcheck/tests/nanoleak_supp.c
similarity index 100%
rename from memcheck/tests/nanoleak.c
rename to memcheck/tests/nanoleak_supp.c

diff --git a/memcheck/tests/nanoleak_supp.vgtest b/memcheck/tests/nanoleak_supp.vgtest
index e300df8959ddb038764e841d7ad720f9d5f983ec..5a0782c08f1997d0f9147025f1b4b76ba0d208c8 100644 (file)
--- a/memcheck/tests/nanoleak_supp.vgtest
+++ b/memcheck/tests/nanoleak_supp.vgtest
@@ -1,2 +1,2 @@
 vgopts: --leak-check=yes --suppressions=nanoleak.supp -q
-prog: nanoleak
+prog: nanoleak_supp