merge the formfield patch from ooo-build
[ooovba.git] / applied_patches / 0433-unittesting-cppuhelper.diff
blobe1550415b78a33d863ae6355415ca03dd36aa5ad
1 --- cppuhelper/prj/tests.lst 1970-01-01 01:00:00.000000000 +0100
2 +++ cppuhelper/prj/tests.lst 2007-09-07 15:44:28.000000000 +0200
3 @@ -0,0 +1,11 @@
4 +ch cppuhelper\qa\ifcontainer nmake - all ch_qa_ifcontainer ch_source NULL
5 +#test fails: ch cppuhelper\qa\propertysetmixin nmake - all ch_qa_propertysetmixin ch_source NULL
6 +ch cppuhelper\qa\unourl nmake - all ch_qa_unourl ch_source NULL
7 +#segfaults: ch cppuhelper\qa\weak nmake - all ch_qa_weak ch_source NULL
9 +# older tests:
10 +ch cppuhelper\test\bootstrap nmake - all ch_test_bootstrap ch_source NULL
11 +#does not compile: ch cppuhelper\test nmake - all ch_test NULL
12 +ch cppuhelper\test\loader nmake - all ch_test_loader ch_test_testcmp ch_source NULL
13 +ch cppuhelper\test\testcmp nmake - all ch_test_testcmp ch_source NULL
14 +#does not link: ch cppuhelper\test\testlib nmake - all ch_test_testlib NULL
15 --- cppuhelper/qa/propertysetmixin/makefile.mk 2007-01-25 13:07:39.000000000 +0100
16 +++ cppuhelper/qa/propertysetmixin/makefile.mk 2007-09-07 15:42:45.000000000 +0200
17 @@ -135,7 +135,11 @@ $(MISC)$/$(TARGET)$/$(TARGET).uno.jar: $
18 jar cfm $@ manifest -C $(CLASSDIR) test/cppuhelper/propertysetmixin
20 test .PHONY: $(SHL1TARGETN) $(MISC)$/$(TARGET)$/uno.rdb
21 -.IF "$(GUI)" == "WNT"
22 +.IF "$(USE_SHELL)" == "bash"
23 + CLASSPATH=$(CLASSPATH) \
24 + URE_INTERNAL_JAVA_DIR=$(MY_URE_INTERNAL_JAVA_DIR) \
25 + testshl2 $(SHL1TARGETN) -forward "$(MISC)$/$(TARGET)$/uno.rdb#$(SOLARLIBDIR)"
26 +.ELIF "$(GUI)" == "WNT"
27 set CLASSPATH=$(CLASSPATH) && \
28 set URE_INTERNAL_JAVA_DIR=$(MY_URE_INTERNAL_JAVA_DIR) && \
29 testshl2 $(SHL1TARGETN) -forward "$(MISC)$/$(TARGET)$/uno.rdb#$(SOLARBINDIR)"