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

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

corecheck/tests/vgprintf.stderr.exp

@@ -1,4 +0,0 @@
-
-Yo
-
-ERROR SUMMARY: 0 errors from 0 contexts (suppressed: 0 from 0)

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

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)

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)

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)

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)

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)

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)

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)

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)

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)

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)

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)

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)

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)

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)

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)

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)

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)

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)

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)

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)

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)

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)

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)

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)

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)

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)

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:.../"  |
 

none/tests/vgprintf.stderr.exp

@@ -0,0 +1,3 @@
+
+Yo
+

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"