diff options
| author | Bjoern Michaelsen <bjoern.michaelsen@canonical.com> | 2011-06-20 09:48:41 +0200 |
|---|---|---|
| committer | Bjoern Michaelsen <bjoern.michaelsen@canonical.com> | 2011-06-20 09:48:41 +0200 |
| commit | 2850da4f8cab294b2f897d170b35ec532e3c4d49 (patch) | |
| tree | 549908e5c5b1d28ba2a6a37369201079c1209a5b /sw/JunitTest_sw_complex.mk | |
| parent | 457fe4e7e83a0fed70a07ddeb2158e02ff1bca7e (diff) | |
| parent | 5f03f0c86933b1372a96d05018610205bbd43db9 (diff) | |
Merge branch 'master' into feature/gnumake4
Conflicts:
starmath/JunitTest_sm_unoapi.mk
starmath/Library_sm.mk
starmath/Library_smd.mk
starmath/Makefile
starmath/prj/build.lst
starmath/prj/makefile.mk
starmath/qa/unoapi/Test.java
starmath/source/detreg.cxx
starmath/source/register.cxx
starmath/source/smdetect.cxx
sw/Library_sw.mk
sw/Library_swd.mk
sw/Library_swui.mk
sw/Library_vbaswobj.mk
sw/inc/iodetect.hxx
sw/inc/swddllapi.h
sw/source/filter/basflt/iodetect.cxx
Diffstat (limited to 'sw/JunitTest_sw_complex.mk')
| -rwxr-xr-x | sw/JunitTest_sw_complex.mk | 13 |
1 files changed, 7 insertions, 6 deletions
diff --git a/sw/JunitTest_sw_complex.mk b/sw/JunitTest_sw_complex.mk index 1a8efd6d6a16..f740014ef6cb 100755 --- a/sw/JunitTest_sw_complex.mk +++ b/sw/JunitTest_sw_complex.mk @@ -33,17 +33,17 @@ $(eval $(call gb_JunitTest_set_defs,sw_complex,\ )) $(eval $(call gb_JunitTest_add_sourcefiles,sw_complex,\ + sw/qa/complex/accessibility/AccessibleRelationSet \ sw/qa/complex/checkColor/CheckChangeColor \ sw/qa/complex/indeterminateState/CheckIndeterminateState \ + sw/qa/complex/writer/CheckBookmarks \ sw/qa/complex/writer/CheckCrossReferences \ - sw/qa/complex/writer/LoadSaveTest \ - sw/qa/complex/writer/CheckNamedPropertyValues \ + sw/qa/complex/writer/CheckFlies \ sw/qa/complex/writer/CheckIndexedPropertyValues \ + sw/qa/complex/writer/CheckNamedPropertyValues \ + sw/qa/complex/writer/LoadSaveTest \ sw/qa/complex/writer/TestDocument \ - sw/qa/complex/writer/CheckBookmarks \ - sw/qa/complex/writer/CheckFlies \ sw/qa/complex/writer/TextPortionEnumerationTest \ - sw/qa/complex/accessibility/AccessibleRelationSet \ )) $(eval $(call gb_JunitTest_add_jars,sw_complex,\ @@ -61,8 +61,9 @@ $(eval $(call gb_JunitTest_add_classes,sw_complex,\ complex.writer.CheckFlies \ complex.writer.CheckIndexedPropertyValues \ complex.writer.CheckNamedPropertyValues \ - complex.writer.TextPortionEnumerationTest \ )) +# fd#35657 test disabled - reenable if fixed +# complex.writer.TextPortionEnumerationTest \ # CheckBookmarks currently fails on windows because the hashes are different ifneq ($(OS),WNT) |