|
From: <sv...@va...> - 2005-06-30 04:42:27
|
Author: njn
Date: 2005-06-30 05:41:56 +0100 (Thu, 30 Jun 2005)
New Revision: 4065
Log:
Move some more Corecheck tests into none/tests.
Added:
trunk/none/tests/res_search.c
trunk/none/tests/res_search.stderr.exp
trunk/none/tests/res_search.stdout.exp
trunk/none/tests/res_search.vgtest
trunk/none/tests/threadederrno.c
trunk/none/tests/threadederrno.stderr.exp
trunk/none/tests/threadederrno.stdout.exp
trunk/none/tests/threadederrno.vgtest
Removed:
trunk/corecheck/tests/res_search.c
trunk/corecheck/tests/res_search.stderr.exp
trunk/corecheck/tests/res_search.stdout.exp
trunk/corecheck/tests/res_search.vgtest
trunk/corecheck/tests/threadederrno.c
trunk/corecheck/tests/threadederrno.stderr.exp
trunk/corecheck/tests/threadederrno.stdout.exp
trunk/corecheck/tests/threadederrno.vgtest
Modified:
trunk/corecheck/tests/Makefile.am
trunk/none/tests/Makefile.am
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-06-30 04:09:11 UTC (rev 4064)
+++ trunk/corecheck/tests/Makefile.am 2005-06-30 04:41:56 UTC (rev 4065)
@@ -9,16 +9,10 @@
EXTRA_DIST =3D $(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
=20
check_PROGRAMS =3D \
- erringfds \
- sigkill res_search \
- threadederrno \
- stack_changes
+ erringfds sigkill stack_changes
=20
AM_CFLAGS =3D $(WERROR) -Winline -Wall -Wshadow -g -O0
AM_CPPFLAGS =3D -I$(top_srcdir)/include
@@ -26,10 +20,5 @@
=20
sigkill_SOURCES =3D sigkill.c
=20
-res_search_SOURCES =3D res_search.c
-res_search_LDADD =3D -lresolv -lpthread
-threadederrno_SOURCES =3D threadederrno.c
-threadederrno_LDADD =3D -lpthread
-
# Stack tests
stack_changes_SOURCES =3D stack_changes.c
Deleted: trunk/corecheck/tests/res_search.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/corecheck/tests/res_search.c 2005-06-30 04:09:11 UTC (rev 4064)
+++ trunk/corecheck/tests/res_search.c 2005-06-30 04:41:56 UTC (rev 4065)
@@ -1,66 +0,0 @@
-#include <stdio.h>
-#include <string.h>
-#include <netinet/in.h>
-#include <arpa/nameser.h>
-#include <resolv.h>
-#include <pthread.h>
-
-void* fn(void* arg)
-{
- char* dn =3D (char*)arg;
-
- unsigned char buff[8000];
-
- if(-1 =3D=3D res_search(dn, 1, 1, buff, 8000))
- {
- printf("Error: res_search()\n");
- }
- else
- {
- printf("Success!\n");
- }
- return 0;
-}
-
-int main(int argc, char** argv)
-{
- pthread_t pid;
- if(2 !=3D argc)
- {
- printf("Usage: %s <domain>\n", argv[0]);
- return 1;
- }
-
- _res.options |=3D RES_DEBUG;
- if(0 !=3D res_init())
- {
- printf("Error: res_init()\n");
- return(1);
- }
-#if 1
- /* Test it in a different thread -- the failure case */
- if(0 !=3D pthread_create(&pid, 0, fn, (void*)argv[1]))
- {
- printf("Failed to create thread.\n");
- return 1;
- }
-
- pthread_join(pid, 0);
-#else
- {
- unsigned char buff[8000];
-
- if(-1 =3D=3D res_search(argv[1], 1, 1, buff, 8000))
- {
- printf("Error: res_search()\n");
- }
- else
- {
- printf("Success!\n");
- }
- }
-#endif
- return 0;
-}
-
-
Deleted: trunk/corecheck/tests/res_search.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/corecheck/tests/res_search.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/corecheck/tests/res_search.stdout.exp 2005-06-30 04:09:11 UTC (=
rev 4064)
+++ trunk/corecheck/tests/res_search.stdout.exp 2005-06-30 04:41:56 UTC (=
rev 4065)
@@ -1 +0,0 @@
-Success!
Deleted: trunk/corecheck/tests/res_search.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/corecheck/tests/res_search.vgtest 2005-06-30 04:09:11 UTC (rev =
4064)
+++ trunk/corecheck/tests/res_search.vgtest 2005-06-30 04:41:56 UTC (rev =
4065)
@@ -1,3 +0,0 @@
-prog: res_search
-args: www.yahoo.com
-vgopts: -q
Deleted: trunk/corecheck/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/corecheck/tests/threadederrno.c 2005-06-30 04:09:11 UTC (rev 40=
64)
+++ trunk/corecheck/tests/threadederrno.c 2005-06-30 04:41:56 UTC (rev 40=
65)
@@ -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/corecheck/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/corecheck/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/corecheck/tests/threadederrno.stdout.exp 2005-06-30 04:09:11 UT=
C (rev 4064)
+++ trunk/corecheck/tests/threadederrno.stdout.exp 2005-06-30 04:41:56 UT=
C (rev 4065)
@@ -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/corecheck/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/corecheck/tests/threadederrno.vgtest 2005-06-30 04:09:11 UTC (r=
ev 4064)
+++ trunk/corecheck/tests/threadederrno.vgtest 2005-06-30 04:41:56 UTC (r=
ev 4065)
@@ -1,2 +0,0 @@
-prog: threadederrno
-vgopts: -q
Modified: trunk/none/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/none/tests/Makefile.am 2005-06-30 04:09:11 UTC (rev 4064)
+++ trunk/none/tests/Makefile.am 2005-06-30 04:41:56 UTC (rev 4065)
@@ -76,6 +76,7 @@
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 @@
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 @@
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
=20
@@ -185,6 +189,8 @@
pth_stackalign_LDADD =3D -lpthread
rcrl_SOURCES =3D rcrl.c
readline1_SOURCES =3D readline1.c
+res_search_SOURCES =3D res_search.c
+res_search_LDADD =3D -lresolv -lpthread
resolv_SOURCES =3D resolv.c
rlimit_nofile_SOURCES =3D rlimit_nofile.c
selfrun_SOURCES =3D selfrun.c
@@ -206,6 +212,8 @@
thread_exits_LDADD =3D -lpthread
threaded_fork_SOURCES =3D threaded-fork.c
threaded_fork_LDADD =3D -lpthread
+threadederrno_SOURCES =3D threadederrno.c
+threadederrno_LDADD =3D -lpthread
tls_SOURCES =3D tls.c tls2.c
tls_DEPENDENCIES =3D tls.so
tls_LDFLAGS =3D -Wl,-rpath,$(top_builddir)/none/tests
Copied: trunk/none/tests/res_search.c (from rev 4052, trunk/corecheck/tes=
ts/res_search.c)
Copied: trunk/none/tests/res_search.stderr.exp (from rev 4052, trunk/core=
check/tests/res_search.stderr.exp)
Copied: trunk/none/tests/res_search.stdout.exp (from rev 4052, trunk/core=
check/tests/res_search.stdout.exp)
Copied: trunk/none/tests/res_search.vgtest (from rev 4052, trunk/corechec=
k/tests/res_search.vgtest)
Copied: trunk/none/tests/threadederrno.c (from rev 4052, trunk/corecheck/=
tests/threadederrno.c)
Copied: trunk/none/tests/threadederrno.stderr.exp (from rev 4052, trunk/c=
orecheck/tests/threadederrno.stderr.exp)
Copied: trunk/none/tests/threadederrno.stdout.exp (from rev 4052, trunk/c=
orecheck/tests/threadederrno.stdout.exp)
Copied: trunk/none/tests/threadederrno.vgtest (from rev 4052, trunk/corec=
heck/tests/threadederrno.vgtest)
|