[icinga-checkins] icinga.org: icinga-core/r1.2: fix tap tests for Solaris 10 and newer versions of Test::Harness (Ton Voon )

git at icinga.org git at icinga.org
Tue Nov 9 08:24:13 CET 2010


Module: icinga-core
Branch: r1.2
Commit: 20c2518da02bffd4b5b6fa8765d4d9b70f05906c
URL:    https://git.icinga.org/?p=icinga-core.git;a=commit;h=20c2518da02bffd4b5b6fa8765d4d9b70f05906c

Author: Michael Friedrich <michael.friedrich at univie.ac.at>
Date:   Tue Nov  2 11:21:08 2010 +0100

fix tap tests for Solaris 10 and newer versions of Test::Harness (Ton Voon)

---

 t-tap/Makefile.in               |    4 +++-
 t-tap/smallconfig/objects.cache |    2 +-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/t-tap/Makefile.in b/t-tap/Makefile.in
index 88a6d0b..65087dc 100644
--- a/t-tap/Makefile.in
+++ b/t-tap/Makefile.in
@@ -81,6 +81,8 @@ SNPRINTF_O=@SNPRINTF_O@
 BROKER_O=@BROKER_O@
 BROKER_H=@BROKER_H@
 
+TAPOBJ=../tap/src/tap.o $(SNPRINTF_O)
+
 all: $(TESTS)
 
 ########## TESTS ##########
@@ -107,7 +109,7 @@ test_xsddefault: test_xsddefault.o $(XSD_OBJS) $(TAPOBJ)
 	$(CC) $(CFLAGS) -o $@ $^ $(LDFLAGS)
 
 test: $(TESTS)
-	HARNESS_PERL=./test_each.t perl -MTest::Harness -e '$$Test::Harness::switches=""; runtests(@ARGV)' $(TESTS)
+	HARNESS_PERL=./test_each.t perl -MTest::Harness -e '$$Test::Harness::switches=""; runtests(map { "./$$_" } @ARGV)' $(TESTS)
 
 clean:
 	rm -f icinga icingastats core *.o gmon.out
diff --git a/t-tap/smallconfig/objects.cache b/t-tap/smallconfig/objects.cache
index 536bd6d..72abe74 100644
--- a/t-tap/smallconfig/objects.cache
+++ b/t-tap/smallconfig/objects.cache
@@ -4,7 +4,7 @@
 # THIS FILE IS AUTOMATICALLY GENERATED
 # BY ICINGA.  DO NOT MODIFY THIS FILE!
 #
-# Created: Mon Oct 25 19:06:20 2010
+# Created: Tue Nov  2 11:20:43 2010
 ########################################
 
 define timeperiod {





More information about the icinga-checkins mailing list