Initial draft of test harness arrangements, from chiark. cvs rdiff -r tochiark-1998...

diff --git a/src/Makefile b/src/Makefile
index 317af60dbed2376bd59bbdff49433eed828172d9..e4964aff07ab51f64c64adec678f0598137ce01a 100644 (file)
--- a/src/Makefile
+++ b/src/Makefile
@@ -21,15 +21,27 @@ WARNS=      -Wall -Wmissing-prototypes -Wwrite-strings -Wstrict-prototypes \
        -Wcast-qual -Wpointer-arith
 WERROR=-Werror
 
        -Wcast-qual -Wpointer-arith
 WERROR=-Werror
 

+HCPPFLAGS= \
+ -Dsocket=Hsocket -Dfcntl=Hfcntl -Dgettimeofday=Hgettimeofday \
+ -Dsendto=Hsendto -Drecvfrom=Hrecvfrom -Dselect=Hselect -Dconnect=Hconnect \
+ -Dread=Hread -Dwrite=Hwrite -Dclose=Hclose
+

 LIBOBJS=       types.o event.o query.o reply.o general.o setup.o transmit.o parse.o
 LIBOBJS=       types.o event.o query.o reply.o general.o setup.o transmit.o parse.o

-ALLOBJS=       $(LIBOBJS) dtest.o
+HARNLOBJS=     $(addsuffix _d.o, $(basename $(LIBOBJS)))
+ALLOBJS=       $(LIBOBJS) $(HARNLOBJS) dtest.o harness.o

 
 all:           dtest
 
 
 all:           dtest
 

-dtest:         $(ALLOBJS)
+harness:       harness.o $(HARNLOBJS)
+
+dtest:         dtest.o $(LIBOBJS)
+
+%_d.o:         %.c
+               $(CC) $(HCPPFLAGS) -c -g -o $@ $<

 
 clean:
                rm -f dtest *.o
 
 
 clean:
                rm -f dtest *.o
 

+$(HARNLOBJS):  adns.h internal.h

 $(LIBOBJS):    adns.h internal.h
 dtest.o:       adns.h
 $(LIBOBJS):    adns.h internal.h
 dtest.o:       adns.h

diff --git a/src/Makefile.in b/src/Makefile.in
index 317af60dbed2376bd59bbdff49433eed828172d9..e4964aff07ab51f64c64adec678f0598137ce01a 100644 (file)
--- a/src/Makefile.in
+++ b/src/Makefile.in
@@ -21,15 +21,27 @@ WARNS=      -Wall -Wmissing-prototypes -Wwrite-strings -Wstrict-prototypes \
        -Wcast-qual -Wpointer-arith
 WERROR=-Werror
 
        -Wcast-qual -Wpointer-arith
 WERROR=-Werror
 

+HCPPFLAGS= \
+ -Dsocket=Hsocket -Dfcntl=Hfcntl -Dgettimeofday=Hgettimeofday \
+ -Dsendto=Hsendto -Drecvfrom=Hrecvfrom -Dselect=Hselect -Dconnect=Hconnect \
+ -Dread=Hread -Dwrite=Hwrite -Dclose=Hclose
+

 LIBOBJS=       types.o event.o query.o reply.o general.o setup.o transmit.o parse.o
 LIBOBJS=       types.o event.o query.o reply.o general.o setup.o transmit.o parse.o

-ALLOBJS=       $(LIBOBJS) dtest.o
+HARNLOBJS=     $(addsuffix _d.o, $(basename $(LIBOBJS)))
+ALLOBJS=       $(LIBOBJS) $(HARNLOBJS) dtest.o harness.o

 
 all:           dtest
 
 
 all:           dtest
 

-dtest:         $(ALLOBJS)
+harness:       harness.o $(HARNLOBJS)
+
+dtest:         dtest.o $(LIBOBJS)
+
+%_d.o:         %.c
+               $(CC) $(HCPPFLAGS) -c -g -o $@ $<

 
 clean:
                rm -f dtest *.o
 
 
 clean:
                rm -f dtest *.o
 

+$(HARNLOBJS):  adns.h internal.h

 $(LIBOBJS):    adns.h internal.h
 dtest.o:       adns.h
 $(LIBOBJS):    adns.h internal.h
 dtest.o:       adns.h

diff --git a/src/harness.c b/src/harness.c
new file mode 100644 (file)
index 0000000..e69de29