Move this test to a more sensible place. Originally it was intended

to check that the threading library hadn't messed up errno.  Now that
doesn't make much sense any more.  Anyway, now it annoyingly fails due
to memcheck reporting bugs in libpthread et al.  Move it to corecheck
so at least it can continue to run and hopefully not continually fail.

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

diff --git a/corecheck/tests/Makefile.am b/corecheck/tests/Makefile.am
index 205875cd164e0ff17059b08e973505bc3d17bc1b..0ea4d4b6ff74be904fcc678a46a3a750619ae192 100644 (file)
--- a/corecheck/tests/Makefile.am
+++ b/corecheck/tests/Makefile.am
@@ -32,6 +32,8 @@ EXTRA_DIST = $(noinst_SCRIPTS) \
        pth_rwlock.stderr.exp pth_rwlock.vgtest \
        sigkill.stderr.exp sigkill.stderr.exp2 sigkill.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
 
 check_PROGRAMS = \
@@ -40,7 +42,7 @@ check_PROGRAMS = \
        fdleak_socketpair 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 \
+       as_mmap as_shm threadederrno \
        vgprintf
 
 AM_CFLAGS   = $(WERROR) -Winline -Wall -Wshadow -g -O0
@@ -88,5 +90,5 @@ pth_rwlock_SOURCES    = pth_rwlock.c
 pth_rwlock_LDADD       = -lpthread
 res_search_SOURCES      = res_search.c
 res_search_LDADD        = -lresolv -lpthread
-
-
+threadederrno_SOURCES  = threadederrno.c
+threadederrno_LDADD    = -lpthread

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

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

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

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

diff --git a/memcheck/tests/Makefile.am b/memcheck/tests/Makefile.am
index 3f989ebf0d9a69ba3dea91c574328debf3f78150..936c928710216cbf5a957ed94db24cb5da28488e 100644 (file)
--- a/memcheck/tests/Makefile.am
+++ b/memcheck/tests/Makefile.am
@@ -80,8 +80,6 @@ EXTRA_DIST = $(noinst_SCRIPTS) \
        trivialleak.stderr.exp trivialleak.vgtest \
        weirdioctl.stderr.exp weirdioctl.stdout.exp weirdioctl.vgtest \
        metadata.stderr.exp metadata.stdout.exp metadata.vgtest \
-       threadederrno.stderr.exp threadederrno.stdout.exp \
-       threadederrno.vgtest \
        vgtest_ume.stderr.exp vgtest_ume.vgtest \
        writev.stderr.exp writev.stderr.exp2 writev.stderr.exp3 writev.vgtest \
        zeropage.stderr.exp zeropage.stderr.exp2 zeropage.vgtest
@@ -107,7 +105,7 @@ check_PROGRAMS = \
        sigaltstack signal2 sigprocmask \
        str_tester supp1 supp2 suppfree \
        trivialleak weirdioctl  \
-       mismatches new_override metadata threadederrno \
+       mismatches new_override metadata \
        vgtest_ume \
        writev zeropage
 
@@ -185,8 +183,6 @@ weirdioctl_SOURCES  = weirdioctl.c
 metadata_SOURCES       = metadata.c
 str_tester_SOURCES     = str_tester.c
 str_tester_CFLAGS      = $(AM_CFLAGS) -Wno-shadow
-threadederrno_SOURCES  = threadederrno.c
-threadederrno_LDADD    = -lpthread
 writev_SOURCES         = writev.c
 zeropage_SOURCES       = zeropage.c