Move some more Corecheck tests into none/tests.

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

diff --git a/corecheck/tests/Makefile.am b/corecheck/tests/Makefile.am
index ad60c56a87caa3b24615e8f989ab8bd95a14d8b1..319c8de6e2f10b0e0a4d310ce5f1877fae1ed0f9 100644 (file)
--- a/corecheck/tests/Makefile.am
+++ b/corecheck/tests/Makefile.am
@@ -9,16 +9,10 @@ noinst_SCRIPTS = filter_stderr
 EXTRA_DIST = $(noinst_SCRIPTS) \
        erringfds.stderr.exp erringfds.stdout.exp erringfds.vgtest \
        sigkill.stderr.exp sigkill.stderr.exp2 sigkill.vgtest \
-       stack_changes.vgtest \
-       res_search.stderr.exp res_search.stdout.exp res_search.vgtest \
-       threadederrno.stderr.exp threadederrno.stdout.exp \
-       threadederrno.vgtest
+       stack_changes.vgtest
 
 check_PROGRAMS = \
-       erringfds \
-       sigkill res_search \
-       threadederrno \
-       stack_changes
+       erringfds sigkill stack_changes
 
 AM_CFLAGS   = $(WERROR) -Winline -Wall -Wshadow -g -O0
 AM_CPPFLAGS = -I$(top_srcdir)/include
@@ -26,10 +20,5 @@ AM_CXXFLAGS = $(AM_CFLAGS)
 
 sigkill_SOURCES                = sigkill.c
 
-res_search_SOURCES      = res_search.c
-res_search_LDADD        = -lresolv -lpthread
-threadederrno_SOURCES  = threadederrno.c
-threadederrno_LDADD    = -lpthread
-
 # Stack tests
 stack_changes_SOURCES   = stack_changes.c

diff --git a/none/tests/Makefile.am b/none/tests/Makefile.am
index e463f9cebd2ed786eeb21a6a1003e0569d63a3e5..2b86ae78f0750c47dd7807cffcdebca236ef3ed5 100644 (file)
--- a/none/tests/Makefile.am
+++ b/none/tests/Makefile.am
@@ -76,6 +76,7 @@ EXTRA_DIST = $(noinst_SCRIPTS) \
        rcrl.stderr.exp rcrl.stdout.exp rcrl.vgtest \
        readline1.stderr.exp readline1.stdout.exp \
        readline1.vgtest \
+       res_search.stderr.exp res_search.stdout.exp res_search.vgtest \
        resolv.stderr.exp resolv.stdout.exp resolv.vgtest \
        rlimit_nofile.stderr.exp rlimit_nofile.stdout.exp rlimit_nofile.vgtest \
        selfrun.stderr.exp selfrun.stdout.exp selfrun.vgtest \
@@ -93,6 +94,8 @@ EXTRA_DIST = $(noinst_SCRIPTS) \
        system.stderr.exp system.vgtest \
        thread-exits.stderr.exp thread-exits.stdout.exp thread-exits.vgtest \
        threaded-fork.stderr.exp threaded-fork.stdout.exp threaded-fork.vgtest \
+       threadederrno.stderr.exp threadederrno.stdout.exp \
+       threadederrno.vgtest \
        tls.stderr.exp tls.stdout.exp  \
        vgprintf.stderr.exp vgprintf.stdout.exp vgprintf.vgtest \
        yield.stderr.exp yield.stdout.exp yield.vgtest
@@ -110,10 +113,11 @@ check_PROGRAMS = \
        pth_atfork1 pth_blockedsig pth_cancel1 pth_cancel2 pth_cvsimple \
        pth_empty pth_exit pth_exit2 pth_mutexspeed pth_once pth_rwlock \
        pth_stackalign \
-       rcrl readline1 resolv rlimit_nofile selfrun sem semlimit sha1_test \
+       rcrl readline1 res_search resolv \
+       rlimit_nofile selfrun sem semlimit sha1_test \
        shortpush shorts stackgrowth sigstackgrowth smc1 susphello \
        syscall-restart1 syscall-restart2 system \
-       thread-exits threaded-fork \
+       thread-exits threaded-fork threadederrno \
        tls tls.so tls2.so yield vgprintf \
        coolo_sigaction gxx304
 
@@ -185,6 +189,8 @@ pth_stackalign_SOURCES      = pth_stackalign.c
 pth_stackalign_LDADD   = -lpthread
 rcrl_SOURCES           = rcrl.c
 readline1_SOURCES      = readline1.c
+res_search_SOURCES      = res_search.c
+res_search_LDADD        = -lresolv -lpthread
 resolv_SOURCES                 = resolv.c
 rlimit_nofile_SOURCES  = rlimit_nofile.c
 selfrun_SOURCES                = selfrun.c
@@ -206,6 +212,8 @@ thread_exits_SOURCES        = thread-exits.c
 thread_exits_LDADD     = -lpthread
 threaded_fork_SOURCES  = threaded-fork.c
 threaded_fork_LDADD    = -lpthread
+threadederrno_SOURCES  = threadederrno.c
+threadederrno_LDADD    = -lpthread
 tls_SOURCES            = tls.c tls2.c
 tls_DEPENDENCIES       = tls.so
 tls_LDFLAGS            = -Wl,-rpath,$(top_builddir)/none/tests

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

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

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

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

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

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

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

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