From: Nicholas Nethercote Date: Wed, 29 Jun 2005 03:46:32 +0000 (+0000) Subject: Move a heap of tests from corecheck/tests/ into none/tests/. There's X-Git-Tag: svn/VALGRIND_3_0_0~270 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=a1527f699373d88652dc00ef7ec0093a52405043;p=thirdparty%2Fvalgrind.git 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 617887cb4f..245c9effb1 100644 --- 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 index a9e6b58c1a..0000000000 --- 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 d0faa6f19a..523c3d8eb7 100644 --- 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 345197ce82..2ec923ab78 100644 --- 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 a9518b8363..acd43fa978 100644 --- 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 d294b55168..4d0f1b4cc3 100644 --- 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 9d04d85885..5e98467c36 100644 --- a/corecheck/tests/fdleak_cmsg.stderr.exp +++ b/none/tests/fdleak_cmsg.stderr.exp @@ -29,7 +29,6 @@ Open file descriptor .: /dev/null -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 -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 ed319ece4e..62a3ab10dc 100644 --- a/corecheck/tests/fdleak_cmsg.stderr.exp2 +++ b/none/tests/fdleak_cmsg.stderr.exp2 @@ -31,7 +31,6 @@ Open file descriptor .: /dev/null -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 -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 9817b8292e..aa0046aaef 100644 --- a/corecheck/tests/fdleak_creat.stderr.exp +++ b/none/tests/fdleak_creat.stderr.exp @@ -17,4 +17,3 @@ Open file descriptor .: /dev/null -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 c29fd9699c..e9ea3611c0 100644 --- a/corecheck/tests/fdleak_creat.stderr.exp2 +++ b/none/tests/fdleak_creat.stderr.exp2 @@ -16,4 +16,3 @@ Open file descriptor .: /dev/null -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 2593e95901..169fa09657 100644 --- a/corecheck/tests/fdleak_creat.stderr.exp3 +++ b/none/tests/fdleak_creat.stderr.exp3 @@ -16,4 +16,3 @@ Open file descriptor .: /dev/null -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 480075761f..7f1907fa4f 100644 --- a/corecheck/tests/fdleak_dup.stderr.exp +++ b/none/tests/fdleak_dup.stderr.exp @@ -21,4 +21,3 @@ Open file descriptor .: /dev/null -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 5ac3997269..46aed90fb8 100644 --- a/corecheck/tests/fdleak_dup.stderr.exp2 +++ b/none/tests/fdleak_dup.stderr.exp2 @@ -20,4 +20,3 @@ Open file descriptor .: /dev/null -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 9940753a0d..de4666f055 100644 --- a/corecheck/tests/fdleak_dup.stderr.exp3 +++ b/none/tests/fdleak_dup.stderr.exp3 @@ -19,4 +19,3 @@ Open file descriptor .: /dev/null -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 0548b64c96..9a7237f3c2 100644 --- a/corecheck/tests/fdleak_dup2.stderr.exp +++ b/none/tests/fdleak_dup2.stderr.exp @@ -26,4 +26,3 @@ Open file descriptor .: /dev/null -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 a16d572ce7..26eeec680f 100644 --- a/corecheck/tests/fdleak_dup2.stderr.exp2 +++ b/none/tests/fdleak_dup2.stderr.exp2 @@ -25,4 +25,3 @@ Open file descriptor .: /dev/null -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 17d0752a95..4b736c5d87 100644 --- a/corecheck/tests/fdleak_dup2.stderr.exp3 +++ b/none/tests/fdleak_dup2.stderr.exp3 @@ -23,4 +23,3 @@ Open file descriptor .: /dev/null -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 bbd64e0015..3505d59640 100644 --- a/corecheck/tests/fdleak_fcntl.stderr.exp +++ b/none/tests/fdleak_fcntl.stderr.exp @@ -20,4 +20,3 @@ Open file descriptor .: /dev/null -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 670f1a1854..7d7f721a13 100644 --- a/corecheck/tests/fdleak_fcntl.stderr.exp2 +++ b/none/tests/fdleak_fcntl.stderr.exp2 @@ -21,4 +21,3 @@ Open file descriptor .: /dev/null -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 a795baff77..32b1a3b48a 100644 --- a/corecheck/tests/fdleak_fcntl.stderr.exp3 +++ b/none/tests/fdleak_fcntl.stderr.exp3 @@ -21,4 +21,3 @@ Open file descriptor .: /dev/null -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 c4d65f0d17..872fd5c907 100644 --- a/corecheck/tests/fdleak_fcntl.stderr.exp4 +++ b/none/tests/fdleak_fcntl.stderr.exp4 @@ -19,4 +19,3 @@ Open file descriptor .: /dev/null -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 2755476339..4317fe83f8 100644 --- a/corecheck/tests/fdleak_ipv4.stderr.exp +++ b/none/tests/fdleak_ipv4.stderr.exp @@ -21,7 +21,6 @@ Open file descriptor .: /dev/null -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 -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 cfe029ed4c..ad2e664058 100644 --- a/corecheck/tests/fdleak_ipv4.stderr.exp2 +++ b/none/tests/fdleak_ipv4.stderr.exp2 @@ -19,7 +19,6 @@ Open file descriptor .: /dev/null -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 -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 63a7ff63b0..facc75111f 100644 --- a/corecheck/tests/fdleak_open.stderr.exp +++ b/none/tests/fdleak_open.stderr.exp @@ -16,4 +16,3 @@ Open file descriptor .: /dev/null -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 098cebc581..c16d17cdc6 100644 --- a/corecheck/tests/fdleak_open.stderr.exp2 +++ b/none/tests/fdleak_open.stderr.exp2 @@ -15,4 +15,3 @@ Open file descriptor .: /dev/null -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 7d4bbdabb5..205653e731 100644 --- a/corecheck/tests/fdleak_pipe.stderr.exp +++ b/none/tests/fdleak_pipe.stderr.exp @@ -21,4 +21,3 @@ Open file descriptor .: /dev/null -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 1e3a0829fa..743f451e55 100644 --- a/corecheck/tests/fdleak_pipe.stderr.exp2 +++ b/none/tests/fdleak_pipe.stderr.exp2 @@ -19,4 +19,3 @@ Open file descriptor .: /dev/null -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 f56ae1cf24..2075bade17 100644 --- a/corecheck/tests/fdleak_socketpair.stderr.exp +++ b/none/tests/fdleak_socketpair.stderr.exp @@ -19,4 +19,3 @@ Open file descriptor .: /dev/null -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 79b389631a..3f343ee8a8 100644 --- a/corecheck/tests/fdleak_socketpair.stderr.exp2 +++ b/none/tests/fdleak_socketpair.stderr.exp2 @@ -21,4 +21,3 @@ Open file descriptor .: /dev/null -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 653be58864..b237bd0bc4 100755 --- 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 index 0000000000..f79bb06a4a --- /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 ca70e5bbc4..2ea84cc880 100755 --- 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"