ooo-build r11622 - in trunk: . patches/test

[michael svn gnome org]

Author: michael
Date: Mon Feb 18 17:07:41 2008
New Revision: 11622
URL: http://svn.gnome.org/viewvc/ooo-build?rev=11622&view=rev

Log:
2008-02-18  Michael Meeks  <michael meeks novell com>

        * patches/test/built-in-unit-test.diff: switch configmgr
        unit tests to use the generated rdb (sadly including an
        evil copy)



Modified:
   trunk/ChangeLog
   trunk/patches/test/built-in-unit-test.diff

Modified: trunk/patches/test/built-in-unit-test.diff
==============================================================================
--- trunk/patches/test/built-in-unit-test.diff	(original)
+++ trunk/patches/test/built-in-unit-test.diff	Mon Feb 18 17:07:41 2008
@@ -154,3 +154,23 @@
      unlink($temp_file);
      return 0;
  }
+Index: configmgr/qa/unit/makefile.mk
+===================================================================
+RCS file: /cvs/util/configmgr/qa/unit/makefile.mk,v
+retrieving revision 1.2
+diff -u -p -u -r1.2 makefile.mk
+--- configmgr/qa/unit/makefile.mk	23 Nov 2007 13:58:12 -0000	1.2
++++ configmgr/qa/unit/makefile.mk	18 Feb 2008 17:06:43 -0000
+@@ -58,11 +58,7 @@ ALLTAR: test
+ 
+ $(MISC)$/$(TARGET).rdb .ERRREMOVE:
+     $(COPY) $(SOLARBINDIR)$/types.rdb $@
+-    regcomp -register -r $@ -c $(subst,$/,/ $(DLLDEST)$/configmgr2.uno$(DLLPOST))
+-    regcomp -register -r $@ -c $(subst,$/,/ $(SOLARLIBDIR)/typeconverter.uno$(DLLPOST))
+-    regcomp -register -r $@ -c $(subst,$/,/ $(SOLARLIBDIR)/sax.uno$(DLLPOST))
+-    regcomp -register -r $@ -c $(subst,$/,/ $(SOLARLIBDIR)/simplereg.uno$(DLLPOST))
+-    regcomp -register -r $@ -c $(subst,$/,/ $(SOLARLIBDIR)/streams.uno$(DLLPOST))
++    regmerge $@ / $(SOLARLIBDIR)$/services.rdb
+ 
+ test .PHONY: $(SHL1TARGETN) $(MISC)$/$(TARGET).rdb
+     testshl2 $(SHL1TARGETN) -forward "$(MISC)$/$(TARGET).rdb#$(PWD)$/$(MISC)$/$(TARGET).registry"