From e21f2f0f0187ebaa4a5b7c64a6e5c08d5efc6116 Mon Sep 17 00:00:00 2001
From: sb <sb@openoffice.org>
Date: Tue, 14 Sep 2010 09:15:02 +0200
Subject: sb129: #i113189# adapted tests; improved subsequenttests

---
 stoc/test/uriproc/makefile.mk | 21 +++++++++++++++------
 1 file changed, 15 insertions(+), 6 deletions(-)

(limited to 'stoc/test/uriproc')

diff --git a/stoc/test/uriproc/makefile.mk b/stoc/test/uriproc/makefile.mk
index cfdc33e7586b..84f852689f86 100644
--- a/stoc/test/uriproc/makefile.mk
+++ b/stoc/test/uriproc/makefile.mk
@@ -35,6 +35,8 @@ TARGET := test_uriproc
 
 ENABLE_EXCEPTIONS := TRUE
 
+my_components = stocservices
+
 .INCLUDE: settings.mk
 
 CFLAGSCXX += $(CPPUNIT_CFLAGS)
@@ -62,14 +64,21 @@ ALLTAR: test
 
 test .PHONY: $(SHL1TARGETN) $(MISC)/$(TARGET)/services.rdb
     $(CPPUNITTESTER) $(SHL1TARGETN) \
-        -env:UNO_SERVICES=$(my_file)$(PWD)/$(MISC)/$(TARGET)/services.rdb \
         -env:UNO_TYPES=$(my_file)$(SOLARBINDIR)/udkapi.rdb \
-        -env:OOO_TEST_PREFIX=$(my_file)$(PWD)/$(DLLDEST)/
+        -env:UNO_SERVICES=$(my_file)$(PWD)/$(MISC)/$(TARGET)/services.rdb \
+        -env:URE_INTERNAL_LIB_DIR=$(my_file)$(PWD)/$(DLLDEST)
+
+$(MISC)/$(TARGET)/services.rdb .ERRREMOVE: $(SOLARENV)/bin/packcomponents.xslt \
+        $(MISC)/$(TARGET)/services.input \
+        $(my_components:^"$(MISC)/":+".component")
+    $(XSLTPROC) --nonet --stringparam prefix $(PWD)/$(MISC)/ -o $@ \
+        $(SOLARENV)/bin/packcomponents.xslt $(MISC)/$(TARGET)/services.input
 
-$(MISC)/$(TARGET)/services.rdb:
+$(MISC)/$(TARGET)/services.input .ERRREMOVE:
     $(MKDIRHIER) $(@:d)
-    $(RM) $@
-    $(REGCOMP) -register -r $@ -wop=vnd.sun.star.expand:\$${{OOO_TEST_PREFIX}} \
-        -c $(DLLDEST)/stocservices.uno$(DLLPOST)
+    - $(RM) $@
+    echo \
+        '<list>$(my_components:^"<filename>":+".component</filename>")</list>' \
+        > $@
 
 .END
-- 
cgit