From: Ton V. <to...@us...> - 2010-05-07 11:45:28
|
Update of /cvsroot/nagios/nagios/t-tap In directory sfp-cvsdas-3.v30.ch3.sourceforge.com:/tmp/cvs-serv7773/t-tap Modified Files: Makefile.in Log Message: Fix tap tests for Solaris 10 and newer versions of Test::Harness Index: Makefile.in =================================================================== RCS file: /cvsroot/nagios/nagios/t-tap/Makefile.in,v retrieving revision 1.9 retrieving revision 1.10 diff -C2 -d -r1.9 -r1.10 *** Makefile.in 26 Jan 2010 12:58:34 -0000 1.9 --- Makefile.in 7 May 2010 11:45:20 -0000 1.10 *************** *** 11,15 **** CC=@CC@ CFLAGS=@CFLAGS@ @DEFS@ -DNSCORE -I../include -I../tap/src - TAPOBJ=../tap/src/tap.o TESTS = test_logging test_events test_timeperiods test_nagios_config test_xsddefault --- 11,14 ---- *************** *** 69,72 **** --- 68,73 ---- BROKER_H=@BROKER_H@ + TAPOBJ=../tap/src/tap.o $(SNPRINTF_O) + all: $(TESTS) *************** *** 77,81 **** test_events: test_events.c $(SRC_BASE)/events.o ! $(CC) $(CFLAGS) -o $@ test_events.c $(SRC_BASE)/events.o $(TAPOBJ) $(LDFLAGS) $(MATHLIBS) test_freshness: test_freshness.o $(SRC_BASE)/freshness.o --- 78,82 ---- test_events: test_events.c $(SRC_BASE)/events.o ! $(CC) $(CFLAGS) -o $@ test_events.c $(SRC_BASE)/events.o $(TAPOBJ) $(LDFLAGS) $(MATHLIBS) $(LIBS) test_freshness: test_freshness.o $(SRC_BASE)/freshness.o *************** *** 92,96 **** test: $(TESTS) ! HARNESS_PERL=./test_each.t perl -MTest::Harness -e '$$Test::Harness::switches=""; runtests(@ARGV)' $(TESTS) clean: --- 93,97 ---- test: $(TESTS) ! HARNESS_PERL=./test_each.t perl -MTest::Harness -e '$$Test::Harness::switches=""; runtests(map { "./$$_" } @ARGV)' $(TESTS) clean: |