Move a heap of tests from corecheck/tests/ into none/tests/. There's

no real point in having them in corecheck/tests since they're not testing
anything that Nulgrind doesn't provide.

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

diff --git a/corecheck/tests/Makefile.am b/corecheck/tests/Makefile.am
index 617887cb4f1b4c893ea5aa5439eac646594eff07..245c9effb1c033d9045f256383eef2685b167d1d 100644 (file)
--- a/corecheck/tests/Makefile.am
+++ b/corecheck/tests/Makefile.am
@@ -4,28 +4,10 @@
 ## blocking syscalls, etc.
 ##---------------------------------------------------------------------------
 
-noinst_SCRIPTS = filter_stderr filter_as_mmap filter_fdleak
+noinst_SCRIPTS = filter_stderr
 
 EXTRA_DIST = $(noinst_SCRIPTS) \
-       as_mmap.stderr.exp as_mmap.stderr.exp2 as_mmap.vgtest \
-       as_shm.stderr.exp as_shm.stdout.exp as_shm.vgtest \
        erringfds.stderr.exp erringfds.stdout.exp erringfds.vgtest \
-       fdleak_cmsg.stderr.exp fdleak_cmsg.stderr.exp2 fdleak_cmsg.vgtest \
-       fdleak_creat.stderr.exp fdleak_creat.stderr.exp2 \
-       fdleak_creat.stderr.exp3 fdleak_creat.vgtest \
-       fdleak_dup.stderr.exp fdleak_dup.stderr.exp2 \
-       fdleak_dup.stderr.exp3 fdleak_dup.vgtest \
-       fdleak_dup2.stderr.exp fdleak_dup2.stderr.exp2 \
-       fdleak_dup2.stderr.exp3 fdleak_dup2.vgtest \
-       fdleak_fcntl.stderr.exp fdleak_fcntl.stderr.exp2 \
-       fdleak_fcntl.stderr.exp3 fdleak_fcntl.stderr.exp4 \
-       fdleak_fcntl.vgtest \
-       fdleak_ipv4.stderr.exp fdleak_ipv4.stderr.exp2 \
-       fdleak_ipv4.stdout.exp fdleak_ipv4.vgtest \
-       fdleak_open.stderr.exp fdleak_open.stderr.exp2 fdleak_open.vgtest \
-       fdleak_pipe.stderr.exp fdleak_pipe.stderr.exp2 fdleak_pipe.vgtest \
-       fdleak_socketpair.stderr.exp fdleak_socketpair.stderr.exp2 \
-       fdleak_socketpair.vgtest \
        pth_atfork1.stderr.exp pth_atfork1.stdout.exp pth_atfork1.vgtest \
        pth_cancel1.stderr.exp pth_cancel1.stdout.exp pth_cancel1.vgtest \
        pth_cancel2.stderr.exp pth_cancel2.vgtest \
@@ -41,38 +23,20 @@ EXTRA_DIST = $(noinst_SCRIPTS) \
        stack_changes.vgtest \
        res_search.stderr.exp res_search.stdout.exp res_search.vgtest \
        threadederrno.stderr.exp threadederrno.stdout.exp \
-       threadederrno.vgtest \
-       vgprintf.stderr.exp vgprintf.stdout.exp vgprintf.vgtest
+       threadederrno.vgtest
 
 check_PROGRAMS = \
-       erringfds fdleak_cmsg fdleak_creat fdleak_dup fdleak_dup2 \
-       fdleak_fcntl fdleak_ipv4 fdleak_open fdleak_pipe \
-       fdleak_socketpair sigkill res_search \
+       erringfds \
+       sigkill res_search \
        pth_atfork1 pth_cancel1 pth_cancel2 pth_cvsimple pth_empty \
        pth_exit pth_exit2 pth_mutexspeed pth_once pth_rwlock \
-       as_mmap as_shm threadederrno \
-       stack_changes vgprintf
+       threadederrno \
+       stack_changes
 
 AM_CFLAGS   = $(WERROR) -Winline -Wall -Wshadow -g -O0
 AM_CPPFLAGS = -I$(top_srcdir)/include
 AM_CXXFLAGS = $(AM_CFLAGS)
 
-vgprintf_SOURCES       = vgprintf.c
-
-# Client address space checks
-as_mmap_SOURCES                = as_mmap.c
-as_shm_SOURCES         = as_shm.c
-
-# Leak tests
-fdleak_cmsg_SOURCES    = fdleak_cmsg.c
-fdleak_creat_SOURCES   = fdleak_creat.c
-fdleak_dup_SOURCES     = fdleak_dup.c
-fdleak_dup2_SOURCES    = fdleak_dup2.c
-fdleak_fcntl_SOURCES   = fdleak_fcntl.c
-fdleak_ipv4_SOURCES    = fdleak_ipv4.c
-fdleak_open_SOURCES    = fdleak_open.c
-fdleak_pipe_SOURCES    = fdleak_pipe.c
-fdleak_socketpair_SOURCES = fdleak_socketpair.c
 sigkill_SOURCES                = sigkill.c
 
 # Pthread ones

diff --git a/corecheck/tests/vgprintf.stderr.exp b/corecheck/tests/vgprintf.stderr.exp
deleted file mode 100644 (file)
index a9e6b58..0000000
--- a/corecheck/tests/vgprintf.stderr.exp
+++ /dev/null
@@ -1,4 +0,0 @@
-
-Yo
-
-ERROR SUMMARY: 0 errors from 0 contexts (suppressed: 0 from 0)

diff --git a/none/tests/Makefile.am b/none/tests/Makefile.am
index d0faa6f19a6915c898faeed6d25ea381f67abd08..523c3d8eb73d6bc588f86389094f9a152dec3b50 100644 (file)
--- a/none/tests/Makefile.am
+++ b/none/tests/Makefile.am
@@ -1,11 +1,14 @@
 SUBDIRS      = ${VG_ARCH}     .
 DIST_SUBDIRS = ${VG_ARCH_ALL} .
 
-noinst_SCRIPTS = filter_none_discards filter_stderr
+noinst_SCRIPTS = 
+       filter_as_mmap filter_fdleak filter_none_discards filter_stderr
 
 EXTRA_DIST = $(noinst_SCRIPTS) \
        ansi.stderr.exp ansi.vgtest \
        args.stderr.exp args.stdout.exp args.vgtest \
+       as_mmap.stderr.exp as_mmap.stderr.exp2 as_mmap.vgtest \
+       as_shm.stderr.exp as_shm.stdout.exp as_shm.vgtest \
        async-sigs.stderr.exp async-sigs.stdout.exp async-sigs.vgtest \
        bitfield1.stderr.exp bitfield1.vgtest \
        blockfault.vgtest blockfault.stderr.exp blockfault.stdout.exp \
@@ -26,6 +29,23 @@ EXTRA_DIST = $(noinst_SCRIPTS) \
        execve.vgtest execve.stdout.exp execve.stderr.exp \
        faultstatus.vgtest faultstatus.stderr.exp \
        fcntl_setown.vgtest fcntl_setown.stdout.exp fcntl_setown.stderr.exp \
+       fdleak_cmsg.stderr.exp fdleak_cmsg.stderr.exp2 fdleak_cmsg.exp3 \
+       fdleak_cmsg.vgtest \
+       fdleak_creat.stderr.exp fdleak_creat.stderr.exp2 \
+       fdleak_creat.stderr.exp3 fdleak_creat.vgtest \
+       fdleak_dup.stderr.exp fdleak_dup.stderr.exp2 \
+       fdleak_dup.stderr.exp3 fdleak_dup.vgtest \
+       fdleak_dup2.stderr.exp fdleak_dup2.stderr.exp2 \
+       fdleak_dup2.stderr.exp3 fdleak_dup2.vgtest \
+       fdleak_fcntl.stderr.exp fdleak_fcntl.stderr.exp2 \
+       fdleak_fcntl.stderr.exp3 fdleak_fcntl.stderr.exp4 \
+       fdleak_fcntl.vgtest \
+       fdleak_ipv4.stderr.exp fdleak_ipv4.stderr.exp2 \
+       fdleak_ipv4.stdout.exp fdleak_ipv4.vgtest \
+       fdleak_open.stderr.exp fdleak_open.stderr.exp2 fdleak_open.vgtest \
+       fdleak_pipe.stderr.exp fdleak_pipe.stderr.exp2 fdleak_pipe.vgtest \
+       fdleak_socketpair.stderr.exp fdleak_socketpair.stderr.exp2 \
+       fdleak_socketpair.vgtest \
        floored.stderr.exp floored.stdout.exp \
        floored.vgtest \
        fork.stderr.exp fork.stdout.exp fork.vgtest \
@@ -63,13 +83,17 @@ EXTRA_DIST = $(noinst_SCRIPTS) \
        thread-exits.stderr.exp thread-exits.stdout.exp thread-exits.vgtest \
        threaded-fork.stderr.exp threaded-fork.stdout.exp threaded-fork.vgtest \
        tls.stderr.exp tls.stdout.exp  \
+       vgprintf.stderr.exp vgprintf.stdout.exp vgprintf.vgtest \
        yield.stderr.exp yield.stdout.exp yield.vgtest
 
 check_PROGRAMS = \
-       ansi args async-sigs bitfield1 blockfault closeall coolo_strlen \
-       discard exec-sigmask execve faultstatus fcntl_setown floored fork \
-       fucomip \
-       manythreads \
+       ansi args as_mmap as_shm \
+       async-sigs bitfield1 blockfault closeall coolo_strlen \
+       discard exec-sigmask execve faultstatus fcntl_setown \
+       fdleak_cmsg fdleak_creat fdleak_dup fdleak_dup2 \
+       fdleak_fcntl fdleak_ipv4 fdleak_open fdleak_pipe \
+       fdleak_socketpair \
+       floored fork fucomip manythreads \
        munmap_exe map_unaligned map_unmap mq mremap rcrl readline1 \
        resolv rlimit_nofile selfrun sem semlimit sha1_test \
        shortpush shorts \
@@ -77,8 +101,8 @@ check_PROGRAMS = \
        smc1 susphello pending pth_blockedsig pth_stackalign \
        syscall-restart1 syscall-restart2 system \
        thread-exits threaded-fork \
-       tls tls.so tls2.so \
-       coolo_sigaction gxx304 yield
+       tls tls.so tls2.so yield vgprintf \
+       coolo_sigaction gxx304
 
 AM_CFLAGS   = $(WERROR) -Winline -Wall -Wshadow -g
 AM_CPPFLAGS = -I$(top_srcdir) -I$(top_srcdir)/include -I$(top_builddir)/include
@@ -88,6 +112,8 @@ AM_CXXFLAGS = $(AM_CFLAGS)
 ansi_SOURCES           = ansi.c
 ansi_CFLAGS            = -ansi
 args_SOURCES           = args.c
+as_mmap_SOURCES                = as_mmap.c
+as_shm_SOURCES         = as_shm.c
 async_sigs_SOURCES     = async-sigs.c
 bitfield1_SOURCES      = bitfield1.c
 blockfault_SOURCES     = blockfault.c
@@ -98,6 +124,15 @@ exec_sigmask_SOURCES        = exec-sigmask.c
 execve_SOURCES         = execve.c
 faultstatus_SOURCES    = faultstatus.c
 fcntl_setown_SOURCES   = fcntl_setown.c
+fdleak_cmsg_SOURCES    = fdleak_cmsg.c
+fdleak_creat_SOURCES   = fdleak_creat.c
+fdleak_dup_SOURCES     = fdleak_dup.c
+fdleak_dup2_SOURCES    = fdleak_dup2.c
+fdleak_fcntl_SOURCES   = fdleak_fcntl.c
+fdleak_ipv4_SOURCES    = fdleak_ipv4.c
+fdleak_open_SOURCES    = fdleak_open.c
+fdleak_pipe_SOURCES    = fdleak_pipe.c
+fdleak_socketpair_SOURCES = fdleak_socketpair.c
 fork_SOURCES           = fork.c
 floored_SOURCES        = floored.c
 floored_LDADD          = -lm
@@ -149,6 +184,7 @@ tls_so_LDFLAGS              = -Wl,-rpath,$(top_builddir)/none/tests -shared -fPIC
 tls_so_CFLAGS          = -fPIC
 tls2_so_SOURCES                = tls2_so.c
 tls2_so_LDFLAGS                = -shared
+vgprintf_SOURCES       = vgprintf.c
 yield_SOURCES          = yield.c
 yield_CFLAGS           = $(AM_CFLAGS) -D__$(VG_ARCH)__
 yield_LDADD            = -lpthread

diff --git a/corecheck/tests/as_mmap.c b/none/tests/as_mmap.c
similarity index 100%
rename from corecheck/tests/as_mmap.c
rename to none/tests/as_mmap.c

diff --git a/corecheck/tests/as_mmap.stderr.exp b/none/tests/as_mmap.stderr.exp
similarity index 75%
rename from corecheck/tests/as_mmap.stderr.exp
rename to none/tests/as_mmap.stderr.exp
index 345197ce82aa0f1de415bec867ce5942ab44c129..2ec923ab785bca665efc355d7dfda661c15bce54 100644 (file)
--- a/corecheck/tests/as_mmap.stderr.exp
+++ b/none/tests/as_mmap.stderr.exp
@@ -9,4 +9,3 @@ mmap @ top
 Warning: client syscall mmap2 tried to modify addresses 0x........-0x........
 mmap @ top+.5G
 
-ERROR SUMMARY: 0 errors from 0 contexts (suppressed: 0 from 0)

diff --git a/corecheck/tests/as_mmap.stderr.exp2 b/none/tests/as_mmap.stderr.exp2
similarity index 76%
rename from corecheck/tests/as_mmap.stderr.exp2
rename to none/tests/as_mmap.stderr.exp2
index a9518b8363956ef673db92eae551af83fb7f42da..acd43fa9786f7aff420244b14816b18eb9c2d219 100644 (file)
--- a/corecheck/tests/as_mmap.stderr.exp2
+++ b/none/tests/as_mmap.stderr.exp2
@@ -9,4 +9,3 @@ mmap @ top
 Warning: client syscall old_mmap tried to modify addresses 0x........-0x........
 mmap @ top+.5G
 
-ERROR SUMMARY: 0 errors from 0 contexts (suppressed: 0 from 0)

diff --git a/corecheck/tests/as_mmap.vgtest b/none/tests/as_mmap.vgtest
similarity index 100%
rename from corecheck/tests/as_mmap.vgtest
rename to none/tests/as_mmap.vgtest

diff --git a/corecheck/tests/as_shm.c b/none/tests/as_shm.c
similarity index 100%
rename from corecheck/tests/as_shm.c
rename to none/tests/as_shm.c

diff --git a/corecheck/tests/as_shm.stderr.exp b/none/tests/as_shm.stderr.exp
similarity index 63%
rename from corecheck/tests/as_shm.stderr.exp
rename to none/tests/as_shm.stderr.exp
index d294b55168ef45646bbc1572362b954f519eba30..4d0f1b4cc3fbc7d2c7b13a890736251d914327fb 100644 (file)
--- a/corecheck/tests/as_shm.stderr.exp
+++ b/none/tests/as_shm.stderr.exp
@@ -2,4 +2,3 @@
 Warning: client syscall shmat tried to modify addresses 0x........-0x........
 shmat @ top: Invalid argument
 
-ERROR SUMMARY: 0 errors from 0 contexts (suppressed: 0 from 0)

diff --git a/corecheck/tests/as_shm.stdout.exp b/none/tests/as_shm.stdout.exp
similarity index 100%
rename from corecheck/tests/as_shm.stdout.exp
rename to none/tests/as_shm.stdout.exp

diff --git a/corecheck/tests/as_shm.vgtest b/none/tests/as_shm.vgtest
similarity index 100%
rename from corecheck/tests/as_shm.vgtest
rename to none/tests/as_shm.vgtest

diff --git a/corecheck/tests/fdleak_cmsg.c b/none/tests/fdleak_cmsg.c
similarity index 100%
rename from corecheck/tests/fdleak_cmsg.c
rename to none/tests/fdleak_cmsg.c

diff --git a/corecheck/tests/fdleak_cmsg.stderr.exp b/none/tests/fdleak_cmsg.stderr.exp
similarity index 92%
rename from corecheck/tests/fdleak_cmsg.stderr.exp
rename to none/tests/fdleak_cmsg.stderr.exp
index 9d04d85885017e094ebbb1a9c665f1e22c09b148..5e98467c36d07b8d997135b4422b179fb0d36aeb 100644 (file)
--- a/corecheck/tests/fdleak_cmsg.stderr.exp
+++ b/none/tests/fdleak_cmsg.stderr.exp
@@ -29,7 +29,6 @@ Open file descriptor .: /dev/null
    <inherited from parent>
 
 
-ERROR SUMMARY: 0 errors from 0 contexts (suppressed: 0 from 0)
 
 FILE DESCRIPTORS: 6 open at exit.
 Open file descriptor .: /tmp/data2
@@ -57,4 +56,3 @@ Open file descriptor .: /dev/null
    <inherited from parent>
 
 
-ERROR SUMMARY: 0 errors from 0 contexts (suppressed: 0 from 0)

diff --git a/corecheck/tests/fdleak_cmsg.stderr.exp2 b/none/tests/fdleak_cmsg.stderr.exp2
similarity index 92%
rename from corecheck/tests/fdleak_cmsg.stderr.exp2
rename to none/tests/fdleak_cmsg.stderr.exp2
index ed319ece4eca7ead6c66f7fb2e0547681be4c7d5..62a3ab10dc78d4e233861a1e57ba4cfa0a33acfc 100644 (file)
--- a/corecheck/tests/fdleak_cmsg.stderr.exp2
+++ b/none/tests/fdleak_cmsg.stderr.exp2
@@ -31,7 +31,6 @@ Open file descriptor .: /dev/null
    <inherited from parent>
 
 
-ERROR SUMMARY: 0 errors from 0 contexts (suppressed: 0 from 0)
 
 FILE DESCRIPTORS: 6 open at exit.
 Open file descriptor .: /tmp/data2
@@ -59,4 +58,3 @@ Open file descriptor .: /dev/null
    <inherited from parent>
 
 
-ERROR SUMMARY: 0 errors from 0 contexts (suppressed: 0 from 0)

diff --git a/corecheck/tests/fdleak_cmsg.vgtest b/none/tests/fdleak_cmsg.vgtest
similarity index 100%
rename from corecheck/tests/fdleak_cmsg.vgtest
rename to none/tests/fdleak_cmsg.vgtest

diff --git a/corecheck/tests/fdleak_creat.c b/none/tests/fdleak_creat.c
similarity index 100%
rename from corecheck/tests/fdleak_creat.c
rename to none/tests/fdleak_creat.c

diff --git a/corecheck/tests/fdleak_creat.stderr.exp b/none/tests/fdleak_creat.stderr.exp
similarity index 85%
rename from corecheck/tests/fdleak_creat.stderr.exp
rename to none/tests/fdleak_creat.stderr.exp
index 9817b8292e198463e0126c7de3981575b5f9e778..aa0046aaefe4d3d783938652b21e01aa69010114 100644 (file)
--- a/corecheck/tests/fdleak_creat.stderr.exp
+++ b/none/tests/fdleak_creat.stderr.exp
@@ -17,4 +17,3 @@ Open file descriptor .: /dev/null
    <inherited from parent>
 
 
-ERROR SUMMARY: 0 errors from 0 contexts (suppressed: 0 from 0)

diff --git a/corecheck/tests/fdleak_creat.stderr.exp2 b/none/tests/fdleak_creat.stderr.exp2
similarity index 83%
rename from corecheck/tests/fdleak_creat.stderr.exp2
rename to none/tests/fdleak_creat.stderr.exp2
index c29fd9699c0b786203a47e2355459b6eadd73709..e9ea3611c09618489dfd1539a675b0c9e6529de4 100644 (file)
--- a/corecheck/tests/fdleak_creat.stderr.exp2
+++ b/none/tests/fdleak_creat.stderr.exp2
@@ -16,4 +16,3 @@ Open file descriptor .: /dev/null
    <inherited from parent>
 
 
-ERROR SUMMARY: 0 errors from 0 contexts (suppressed: 0 from 0)

diff --git a/corecheck/tests/fdleak_creat.stderr.exp3 b/none/tests/fdleak_creat.stderr.exp3
similarity index 83%
rename from corecheck/tests/fdleak_creat.stderr.exp3
rename to none/tests/fdleak_creat.stderr.exp3
index 2593e9590159708951fdb3a0460c8136bb0fad83..169fa09657122f952d32b17c5c5df6db710b275a 100644 (file)
--- a/corecheck/tests/fdleak_creat.stderr.exp3
+++ b/none/tests/fdleak_creat.stderr.exp3
@@ -16,4 +16,3 @@ Open file descriptor .: /dev/null
    <inherited from parent>
 
 
-ERROR SUMMARY: 0 errors from 0 contexts (suppressed: 0 from 0)

diff --git a/corecheck/tests/fdleak_creat.vgtest b/none/tests/fdleak_creat.vgtest
similarity index 100%
rename from corecheck/tests/fdleak_creat.vgtest
rename to none/tests/fdleak_creat.vgtest

diff --git a/corecheck/tests/fdleak_dup.c b/none/tests/fdleak_dup.c
similarity index 100%
rename from corecheck/tests/fdleak_dup.c
rename to none/tests/fdleak_dup.c

diff --git a/corecheck/tests/fdleak_dup.stderr.exp b/none/tests/fdleak_dup.stderr.exp
similarity index 88%
rename from corecheck/tests/fdleak_dup.stderr.exp
rename to none/tests/fdleak_dup.stderr.exp
index 480075761ffc607c1e8890ad03ae427e4a098964..7f1907fa4f1cbd9907c53ecc07935f1940c31a20 100644 (file)
--- a/corecheck/tests/fdleak_dup.stderr.exp
+++ b/none/tests/fdleak_dup.stderr.exp
@@ -21,4 +21,3 @@ Open file descriptor .: /dev/null
    <inherited from parent>
 
 
-ERROR SUMMARY: 0 errors from 0 contexts (suppressed: 0 from 0)

diff --git a/corecheck/tests/fdleak_dup.stderr.exp2 b/none/tests/fdleak_dup.stderr.exp2
similarity index 88%
rename from corecheck/tests/fdleak_dup.stderr.exp2
rename to none/tests/fdleak_dup.stderr.exp2
index 5ac39972693f7e9a367ba63ebedeb6c42b031479..46aed90fb883ad76a41eacb8b918c999518c40ff 100644 (file)
--- a/corecheck/tests/fdleak_dup.stderr.exp2
+++ b/none/tests/fdleak_dup.stderr.exp2
@@ -20,4 +20,3 @@ Open file descriptor .: /dev/null
    <inherited from parent>
 
 
-ERROR SUMMARY: 0 errors from 0 contexts (suppressed: 0 from 0)

diff --git a/corecheck/tests/fdleak_dup.stderr.exp3 b/none/tests/fdleak_dup.stderr.exp3
similarity index 87%
rename from corecheck/tests/fdleak_dup.stderr.exp3
rename to none/tests/fdleak_dup.stderr.exp3
index 9940753a0d7279f0377148d2ce5d8c9123072b5a..de4666f05574cbd2291eca4e01deab2d02777a36 100644 (file)
--- a/corecheck/tests/fdleak_dup.stderr.exp3
+++ b/none/tests/fdleak_dup.stderr.exp3
@@ -19,4 +19,3 @@ Open file descriptor .: /dev/null
    <inherited from parent>
 
 
-ERROR SUMMARY: 0 errors from 0 contexts (suppressed: 0 from 0)

diff --git a/corecheck/tests/fdleak_dup.vgtest b/none/tests/fdleak_dup.vgtest
similarity index 100%
rename from corecheck/tests/fdleak_dup.vgtest
rename to none/tests/fdleak_dup.vgtest

diff --git a/corecheck/tests/fdleak_dup2.c b/none/tests/fdleak_dup2.c
similarity index 100%
rename from corecheck/tests/fdleak_dup2.c
rename to none/tests/fdleak_dup2.c

diff --git a/corecheck/tests/fdleak_dup2.stderr.exp b/none/tests/fdleak_dup2.stderr.exp
similarity index 91%
rename from corecheck/tests/fdleak_dup2.stderr.exp
rename to none/tests/fdleak_dup2.stderr.exp
index 0548b64c96055c1f279a2a070a70abdc0f48368a..9a7237f3c21a66a2529ee8a456c8870154a73023 100644 (file)
--- a/corecheck/tests/fdleak_dup2.stderr.exp
+++ b/none/tests/fdleak_dup2.stderr.exp
@@ -26,4 +26,3 @@ Open file descriptor .: /dev/null
    <inherited from parent>
 
 
-ERROR SUMMARY: 0 errors from 0 contexts (suppressed: 0 from 0)

diff --git a/corecheck/tests/fdleak_dup2.stderr.exp2 b/none/tests/fdleak_dup2.stderr.exp2
similarity index 90%
rename from corecheck/tests/fdleak_dup2.stderr.exp2
rename to none/tests/fdleak_dup2.stderr.exp2
index a16d572ce7ccc7b7787ce5476fd7d67bdd655dec..26eeec680f011249dcca32ffdcc42b64b40a1ef6 100644 (file)
--- a/corecheck/tests/fdleak_dup2.stderr.exp2
+++ b/none/tests/fdleak_dup2.stderr.exp2
@@ -25,4 +25,3 @@ Open file descriptor .: /dev/null
    <inherited from parent>
 
 
-ERROR SUMMARY: 0 errors from 0 contexts (suppressed: 0 from 0)

diff --git a/corecheck/tests/fdleak_dup2.stderr.exp3 b/none/tests/fdleak_dup2.stderr.exp3
similarity index 89%
rename from corecheck/tests/fdleak_dup2.stderr.exp3
rename to none/tests/fdleak_dup2.stderr.exp3
index 17d0752a957f4b09379dbb45349a11768a24c0df..4b736c5d878234775910288824b981cd8c940ddb 100644 (file)
--- a/corecheck/tests/fdleak_dup2.stderr.exp3
+++ b/none/tests/fdleak_dup2.stderr.exp3
@@ -23,4 +23,3 @@ Open file descriptor .: /dev/null
    <inherited from parent>
 
 
-ERROR SUMMARY: 0 errors from 0 contexts (suppressed: 0 from 0)

diff --git a/corecheck/tests/fdleak_dup2.vgtest b/none/tests/fdleak_dup2.vgtest
similarity index 100%
rename from corecheck/tests/fdleak_dup2.vgtest
rename to none/tests/fdleak_dup2.vgtest

diff --git a/corecheck/tests/fdleak_fcntl.c b/none/tests/fdleak_fcntl.c
similarity index 100%
rename from corecheck/tests/fdleak_fcntl.c
rename to none/tests/fdleak_fcntl.c

diff --git a/corecheck/tests/fdleak_fcntl.stderr.exp b/none/tests/fdleak_fcntl.stderr.exp
similarity index 88%
rename from corecheck/tests/fdleak_fcntl.stderr.exp
rename to none/tests/fdleak_fcntl.stderr.exp
index bbd64e001568e0e65cd2d219413b348b2fb40fab..3505d59640b7445dd11a5b6b3312373ae763ac10 100644 (file)
--- a/corecheck/tests/fdleak_fcntl.stderr.exp
+++ b/none/tests/fdleak_fcntl.stderr.exp
@@ -20,4 +20,3 @@ Open file descriptor .: /dev/null
    <inherited from parent>
 
 
-ERROR SUMMARY: 0 errors from 0 contexts (suppressed: 0 from 0)

diff --git a/corecheck/tests/fdleak_fcntl.stderr.exp2 b/none/tests/fdleak_fcntl.stderr.exp2
similarity index 89%
rename from corecheck/tests/fdleak_fcntl.stderr.exp2
rename to none/tests/fdleak_fcntl.stderr.exp2
index 670f1a1854d3a543e4ebf2023eceff4aa490295c..7d7f721a13ac54099d52325bcdc7a7f759e3256d 100644 (file)
--- a/corecheck/tests/fdleak_fcntl.stderr.exp2
+++ b/none/tests/fdleak_fcntl.stderr.exp2
@@ -21,4 +21,3 @@ Open file descriptor .: /dev/null
    <inherited from parent>
 
 
-ERROR SUMMARY: 0 errors from 0 contexts (suppressed: 0 from 0)

diff --git a/corecheck/tests/fdleak_fcntl.stderr.exp3 b/none/tests/fdleak_fcntl.stderr.exp3
similarity index 89%
rename from corecheck/tests/fdleak_fcntl.stderr.exp3
rename to none/tests/fdleak_fcntl.stderr.exp3
index a795baff7782bf16d98cface5b58a38826b605b4..32b1a3b48ac874639b0c2f388a5bc194254dcbd4 100644 (file)
--- a/corecheck/tests/fdleak_fcntl.stderr.exp3
+++ b/none/tests/fdleak_fcntl.stderr.exp3
@@ -21,4 +21,3 @@ Open file descriptor .: /dev/null
    <inherited from parent>
 
 
-ERROR SUMMARY: 0 errors from 0 contexts (suppressed: 0 from 0)

diff --git a/corecheck/tests/fdleak_fcntl.stderr.exp4 b/none/tests/fdleak_fcntl.stderr.exp4
similarity index 87%
rename from corecheck/tests/fdleak_fcntl.stderr.exp4
rename to none/tests/fdleak_fcntl.stderr.exp4
index c4d65f0d1758fe9aeff543b259312e21d6fe5d97..872fd5c90784fe7cc8034860b43f10cff7d9cb3e 100644 (file)
--- a/corecheck/tests/fdleak_fcntl.stderr.exp4
+++ b/none/tests/fdleak_fcntl.stderr.exp4
@@ -19,4 +19,3 @@ Open file descriptor .: /dev/null
    <inherited from parent>
 
 
-ERROR SUMMARY: 0 errors from 0 contexts (suppressed: 0 from 0)

diff --git a/corecheck/tests/fdleak_fcntl.vgtest b/none/tests/fdleak_fcntl.vgtest
similarity index 100%
rename from corecheck/tests/fdleak_fcntl.vgtest
rename to none/tests/fdleak_fcntl.vgtest

diff --git a/corecheck/tests/fdleak_ipv4.c b/none/tests/fdleak_ipv4.c
similarity index 100%
rename from corecheck/tests/fdleak_ipv4.c
rename to none/tests/fdleak_ipv4.c

diff --git a/corecheck/tests/fdleak_ipv4.stderr.exp b/none/tests/fdleak_ipv4.stderr.exp
similarity index 88%
rename from corecheck/tests/fdleak_ipv4.stderr.exp
rename to none/tests/fdleak_ipv4.stderr.exp
index 2755476339964e368839551c0a150799243f8da4..4317fe83f826eb8dc9cbd22c81ee306b169459a9 100644 (file)
--- a/corecheck/tests/fdleak_ipv4.stderr.exp
+++ b/none/tests/fdleak_ipv4.stderr.exp
@@ -21,7 +21,6 @@ Open file descriptor .: /dev/null
    <inherited from parent>
 
 
-ERROR SUMMARY: 0 errors from 0 contexts (suppressed: 0 from 0)
 
 FILE DESCRIPTORS: 4 open at exit.
 Open AF_INET socket 3: 127.0.0.1:... <-> 127.0.0.1:...
@@ -39,4 +38,3 @@ Open file descriptor .: /dev/null
    <inherited from parent>
 
 
-ERROR SUMMARY: 0 errors from 0 contexts (suppressed: 0 from 0)

diff --git a/corecheck/tests/fdleak_ipv4.stderr.exp2 b/none/tests/fdleak_ipv4.stderr.exp2
similarity index 86%
rename from corecheck/tests/fdleak_ipv4.stderr.exp2
rename to none/tests/fdleak_ipv4.stderr.exp2
index cfe029ed4c8784dc1aacbcecbffd24cf4d0d193c..ad2e664058a39d8301b6dbe47f122862fafbee39 100644 (file)
--- a/corecheck/tests/fdleak_ipv4.stderr.exp2
+++ b/none/tests/fdleak_ipv4.stderr.exp2
@@ -19,7 +19,6 @@ Open file descriptor .: /dev/null
    <inherited from parent>
 
 
-ERROR SUMMARY: 0 errors from 0 contexts (suppressed: 0 from 0)
 
 FILE DESCRIPTORS: 4 open at exit.
 Open AF_INET socket 3: 127.0.0.1:... <-> 127.0.0.1:...
@@ -36,4 +35,3 @@ Open file descriptor .: /dev/null
    <inherited from parent>
 
 
-ERROR SUMMARY: 0 errors from 0 contexts (suppressed: 0 from 0)

diff --git a/corecheck/tests/fdleak_ipv4.stdout.exp b/none/tests/fdleak_ipv4.stdout.exp
similarity index 100%
rename from corecheck/tests/fdleak_ipv4.stdout.exp
rename to none/tests/fdleak_ipv4.stdout.exp

diff --git a/corecheck/tests/fdleak_ipv4.vgtest b/none/tests/fdleak_ipv4.vgtest
similarity index 100%
rename from corecheck/tests/fdleak_ipv4.vgtest
rename to none/tests/fdleak_ipv4.vgtest

diff --git a/corecheck/tests/fdleak_open.c b/none/tests/fdleak_open.c
similarity index 100%
rename from corecheck/tests/fdleak_open.c
rename to none/tests/fdleak_open.c

diff --git a/corecheck/tests/fdleak_open.stderr.exp b/none/tests/fdleak_open.stderr.exp
similarity index 85%
rename from corecheck/tests/fdleak_open.stderr.exp
rename to none/tests/fdleak_open.stderr.exp
index 63a7ff63b068c3abcbf8a955f46aca6d1d970697..facc75111ffe2ec6714563618c294f2587c81fda 100644 (file)
--- a/corecheck/tests/fdleak_open.stderr.exp
+++ b/none/tests/fdleak_open.stderr.exp
@@ -16,4 +16,3 @@ Open file descriptor .: /dev/null
    <inherited from parent>
 
 
-ERROR SUMMARY: 0 errors from 0 contexts (suppressed: 0 from 0)

diff --git a/corecheck/tests/fdleak_open.stderr.exp2 b/none/tests/fdleak_open.stderr.exp2
similarity index 83%
rename from corecheck/tests/fdleak_open.stderr.exp2
rename to none/tests/fdleak_open.stderr.exp2
index 098cebc581c83cbd42671c57e3750f49c633ad77..c16d17cdc613b39b987a32c545bca462eb86af3b 100644 (file)
--- a/corecheck/tests/fdleak_open.stderr.exp2
+++ b/none/tests/fdleak_open.stderr.exp2
@@ -15,4 +15,3 @@ Open file descriptor .: /dev/null
    <inherited from parent>
 
 
-ERROR SUMMARY: 0 errors from 0 contexts (suppressed: 0 from 0)

diff --git a/corecheck/tests/fdleak_open.vgtest b/none/tests/fdleak_open.vgtest
similarity index 100%
rename from corecheck/tests/fdleak_open.vgtest
rename to none/tests/fdleak_open.vgtest

diff --git a/corecheck/tests/fdleak_pipe.c b/none/tests/fdleak_pipe.c
similarity index 100%
rename from corecheck/tests/fdleak_pipe.c
rename to none/tests/fdleak_pipe.c

diff --git a/corecheck/tests/fdleak_pipe.stderr.exp b/none/tests/fdleak_pipe.stderr.exp
similarity index 88%
rename from corecheck/tests/fdleak_pipe.stderr.exp
rename to none/tests/fdleak_pipe.stderr.exp
index 7d4bbdabb5cfa83d730eb88e8b6df022d58efe0c..205653e7310b3ccc929987342f0543ab6cc5f72d 100644 (file)
--- a/corecheck/tests/fdleak_pipe.stderr.exp
+++ b/none/tests/fdleak_pipe.stderr.exp
@@ -21,4 +21,3 @@ Open file descriptor .: /dev/null
    <inherited from parent>
 
 
-ERROR SUMMARY: 0 errors from 0 contexts (suppressed: 0 from 0)

diff --git a/corecheck/tests/fdleak_pipe.stderr.exp2 b/none/tests/fdleak_pipe.stderr.exp2
similarity index 86%
rename from corecheck/tests/fdleak_pipe.stderr.exp2
rename to none/tests/fdleak_pipe.stderr.exp2
index 1e3a0829fa86b75adfb0a6f2cd593422c4fb5dae..743f451e55cb781196a0fac8c6e2a5a180eb4814 100644 (file)
--- a/corecheck/tests/fdleak_pipe.stderr.exp2
+++ b/none/tests/fdleak_pipe.stderr.exp2
@@ -19,4 +19,3 @@ Open file descriptor .: /dev/null
    <inherited from parent>
 
 
-ERROR SUMMARY: 0 errors from 0 contexts (suppressed: 0 from 0)

diff --git a/corecheck/tests/fdleak_pipe.vgtest b/none/tests/fdleak_pipe.vgtest
similarity index 100%
rename from corecheck/tests/fdleak_pipe.vgtest
rename to none/tests/fdleak_pipe.vgtest

diff --git a/corecheck/tests/fdleak_socketpair.c b/none/tests/fdleak_socketpair.c
similarity index 100%
rename from corecheck/tests/fdleak_socketpair.c
rename to none/tests/fdleak_socketpair.c

diff --git a/corecheck/tests/fdleak_socketpair.stderr.exp b/none/tests/fdleak_socketpair.stderr.exp
similarity index 88%
rename from corecheck/tests/fdleak_socketpair.stderr.exp
rename to none/tests/fdleak_socketpair.stderr.exp
index f56ae1cf245699931df5058812870a0cdb7cc1a9..2075bade17f8517d4e53a46851d7e148bfe2a882 100644 (file)
--- a/corecheck/tests/fdleak_socketpair.stderr.exp
+++ b/none/tests/fdleak_socketpair.stderr.exp
@@ -19,4 +19,3 @@ Open file descriptor .: /dev/null
    <inherited from parent>
 
 
-ERROR SUMMARY: 0 errors from 0 contexts (suppressed: 0 from 0)

diff --git a/corecheck/tests/fdleak_socketpair.stderr.exp2 b/none/tests/fdleak_socketpair.stderr.exp2
similarity index 89%
rename from corecheck/tests/fdleak_socketpair.stderr.exp2
rename to none/tests/fdleak_socketpair.stderr.exp2
index 79b389631ad72bae7c786577bf6588e733c02305..3f343ee8a860b24cc917d8726d92b28a786dbd26 100644 (file)
--- a/corecheck/tests/fdleak_socketpair.stderr.exp2
+++ b/none/tests/fdleak_socketpair.stderr.exp2
@@ -21,4 +21,3 @@ Open file descriptor .: /dev/null
    <inherited from parent>
 
 
-ERROR SUMMARY: 0 errors from 0 contexts (suppressed: 0 from 0)

diff --git a/corecheck/tests/fdleak_socketpair.vgtest b/none/tests/fdleak_socketpair.vgtest
similarity index 100%
rename from corecheck/tests/fdleak_socketpair.vgtest
rename to none/tests/fdleak_socketpair.vgtest

diff --git a/corecheck/tests/filter_as_mmap b/none/tests/filter_as_mmap
similarity index 100%
rename from corecheck/tests/filter_as_mmap
rename to none/tests/filter_as_mmap

diff --git a/corecheck/tests/filter_fdleak b/none/tests/filter_fdleak
similarity index 89%
rename from corecheck/tests/filter_fdleak
rename to none/tests/filter_fdleak
index 653be588642be1b4227f8b0a101f5239033ad988..b237bd0bc4e8adb7d334a7a6185776aeceb0c661 100755 (executable)
--- a/corecheck/tests/filter_fdleak
+++ b/none/tests/filter_fdleak
@@ -4,9 +4,6 @@ dir=`dirname $0`
 
 ./filter_stderr                    |
 
-# Anonymise addresses
-$dir/../../tests/filter_addresses                       |
-
 # Anonymise line numbers in mac_replace_strmem.c
 sed "s/mac_replace_strmem.c:[0-9]*/mac_replace_strmem.c:.../"  |
 

diff --git a/corecheck/tests/vgprintf.c b/none/tests/vgprintf.c
similarity index 100%
rename from corecheck/tests/vgprintf.c
rename to none/tests/vgprintf.c

diff --git a/none/tests/vgprintf.stderr.exp b/none/tests/vgprintf.stderr.exp
new file mode 100644 (file)
index 0000000..f79bb06
--- /dev/null
+++ b/none/tests/vgprintf.stderr.exp
@@ -0,0 +1,3 @@
+
+Yo
+

diff --git a/corecheck/tests/vgprintf.stdout.exp b/none/tests/vgprintf.stdout.exp
similarity index 100%
rename from corecheck/tests/vgprintf.stdout.exp
rename to none/tests/vgprintf.stdout.exp

diff --git a/corecheck/tests/vgprintf.vgtest b/none/tests/vgprintf.vgtest
similarity index 100%
rename from corecheck/tests/vgprintf.vgtest
rename to none/tests/vgprintf.vgtest

diff --git a/tests/filter_addresses b/tests/filter_addresses
index ca70e5bbc4cd5509ab2bfe8c1e1f6ef6a0d79749..2ea84cc88088d7c2e74666d2fdd8cde2a0050080 100755 (executable)
--- a/tests/filter_addresses
+++ b/tests/filter_addresses
@@ -1,4 +1,4 @@
 #! /bin/sh
 
-sed "s/0x[0-9A-Fa-f]*/0x......../g"
+sed "s/0x[0-9A-Fa-f]\+/0x......../g"