|
From: <sv...@va...> - 2005-05-04 00:27:06
|
Author: sewardj
Date: 2005-05-04 01:26:57 +0100 (Wed, 04 May 2005)
New Revision: 3611
Added:
trunk/corecheck/tests/threadederrno.c
trunk/corecheck/tests/threadederrno.stderr.exp
trunk/corecheck/tests/threadederrno.stdout.exp
trunk/corecheck/tests/threadederrno.vgtest
Removed:
trunk/memcheck/tests/threadederrno.c
trunk/memcheck/tests/threadederrno.stderr.exp
trunk/memcheck/tests/threadederrno.stdout.exp
trunk/memcheck/tests/threadederrno.vgtest
Modified:
trunk/corecheck/tests/Makefile.am
trunk/memcheck/tests/Makefile.am
Log:
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.
Modified: trunk/corecheck/tests/Makefile.am
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- trunk/corecheck/tests/Makefile.am 2005-05-03 22:31:22 UTC (rev 3610)
+++ trunk/corecheck/tests/Makefile.am 2005-05-04 00:26:57 UTC (rev 3611)
@@ -32,6 +32,8 @@
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
=20
check_PROGRAMS =3D \
@@ -40,7 +42,7 @@
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
=20
AM_CFLAGS =3D $(WERROR) -Winline -Wall -Wshadow -g -O0
@@ -88,5 +90,5 @@
pth_rwlock_LDADD =3D -lpthread
res_search_SOURCES =3D res_search.c
res_search_LDADD =3D -lresolv -lpthread
-
-
+threadederrno_SOURCES =3D threadederrno.c
+threadederrno_LDADD =3D -lpthread
Copied: trunk/corecheck/tests/threadederrno.c (from rev 3608, trunk/memch=
eck/tests/threadederrno.c)
Copied: trunk/corecheck/tests/threadederrno.stderr.exp (from rev 3608, tr=
unk/memcheck/tests/threadederrno.stderr.exp)
Copied: trunk/corecheck/tests/threadederrno.stdout.exp (from rev 3608, tr=
unk/memcheck/tests/threadederrno.stdout.exp)
Copied: trunk/corecheck/tests/threadederrno.vgtest (from rev 3608, trunk/=
memcheck/tests/threadederrno.vgtest)
Modified: trunk/memcheck/tests/Makefile.am
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- trunk/memcheck/tests/Makefile.am 2005-05-03 22:31:22 UTC (rev 3610)
+++ trunk/memcheck/tests/Makefile.am 2005-05-04 00:26:57 UTC (rev 3611)
@@ -80,8 +80,6 @@
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 @@
sigaltstack signal2 sigprocmask \
str_tester supp1 supp2 suppfree \
trivialleak weirdioctl \
- mismatches new_override metadata threadederrno \
+ mismatches new_override metadata \
vgtest_ume \
writev zeropage
=20
@@ -185,8 +183,6 @@
metadata_SOURCES =3D metadata.c
str_tester_SOURCES =3D str_tester.c
str_tester_CFLAGS =3D $(AM_CFLAGS) -Wno-shadow
-threadederrno_SOURCES =3D threadederrno.c
-threadederrno_LDADD =3D -lpthread
writev_SOURCES =3D writev.c
zeropage_SOURCES =3D zeropage.c
=20
Deleted: trunk/memcheck/tests/threadederrno.c
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- trunk/memcheck/tests/threadederrno.c 2005-05-03 22:31:22 UTC (rev 361=
0)
+++ trunk/memcheck/tests/threadederrno.c 2005-05-04 00:26:57 UTC (rev 361=
1)
@@ -1,35 +0,0 @@
-
-#include <pthread.h>
-#include <stdio.h>
-#include <errno.h>
-#include <string.h>
-
-
-void* thr2 ( void* v )
-{
- FILE* f =3D fopen("bogus2", "r");
- printf("f =3D %p, errno =3D %d (%s)\n", f, errno, strerror(errno));
- return NULL;
-}
-
-void* thr3 ( void* v )
-{
- FILE* f =3D fopen("bogus3", "r");
- printf("f =3D %p, errno =3D %d (%s)\n", f, errno, strerror(errno));
- return NULL;
-}
-
-
-int main ( void )
-{
- FILE* f;
- pthread_t tid2, tid3;
- pthread_create(&tid2, NULL, &thr2, NULL);
- pthread_create(&tid3, NULL, &thr3, NULL);
- f =3D fopen("bogus", "r");
- printf("f =3D %p, errno =3D %d (%s)\n", f, errno, strerror(errno));
- pthread_join(tid2, NULL);
- pthread_join(tid3, NULL);
- return 0;
-}
-
Deleted: trunk/memcheck/tests/threadederrno.stderr.exp
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
Deleted: trunk/memcheck/tests/threadederrno.stdout.exp
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- trunk/memcheck/tests/threadederrno.stdout.exp 2005-05-03 22:31:22 UTC=
(rev 3610)
+++ trunk/memcheck/tests/threadederrno.stdout.exp 2005-05-04 00:26:57 UTC=
(rev 3611)
@@ -1,3 +0,0 @@
-f =3D (nil), errno =3D 2 (No such file or directory)
-f =3D (nil), errno =3D 2 (No such file or directory)
-f =3D (nil), errno =3D 2 (No such file or directory)
Deleted: trunk/memcheck/tests/threadederrno.vgtest
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- trunk/memcheck/tests/threadederrno.vgtest 2005-05-03 22:31:22 UTC (re=
v 3610)
+++ trunk/memcheck/tests/threadederrno.vgtest 2005-05-04 00:26:57 UTC (re=
v 3611)
@@ -1,2 +0,0 @@
-prog: threadederrno
-vgopts: -q
|