summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorArmin Le Grand <Armin.Le.Grand@cib.de>2016-07-28 14:07:44 +0200
committerThorsten Behrens <Thorsten.Behrens@CIB.de>2016-08-18 02:39:15 +0200
commitb85600c9d49e555421612fdeca6c6316d192bbd6 (patch)
tree4bace6fdbef4e74f9d10b5b5acdf675ba885b6f7
parent2a5ac6f6348acdfacc3a551b184369fe7dbfa0cd (diff)
screenshots: fix Linux, exclude a few crashing dialogs
Change-Id: Ie06bb6b0bfd280e386bc418abdc496cb747f44b6
-rw-r--r--cui/qa/unit/data/cui-dialogs-test.txt2
-rw-r--r--sc/qa/unit/screenshots/data/screenshots.txt10
-rw-r--r--svx/qa/unit/data/svx-dialogs-test.txt2
-rw-r--r--sw/qa/unit/data/sw-dialogs-test.txt2
4 files changed, 9 insertions, 7 deletions
diff --git a/cui/qa/unit/data/cui-dialogs-test.txt b/cui/qa/unit/data/cui-dialogs-test.txt
index 4e1fc44fe26b..4f9bf42fe2c3 100644
--- a/cui/qa/unit/data/cui-dialogs-test.txt
+++ b/cui/qa/unit/data/cui-dialogs-test.txt
@@ -35,6 +35,7 @@
# test case since they need some document and model data to work
#
# cui/ui/bitmaptabpage.ui
+# cui/ui/thesaurus.ui <- problems under Linux
cui/ui/customizedialog.ui
cui/ui/gallerythemedialog.ui
@@ -205,7 +206,6 @@ cui/ui/hyperlinkdialog.ui
cui/ui/insertoleobject.ui
cui/ui/insertfloatingframe.ui
cui/ui/splitcellsdialog.ui
-cui/ui/thesaurus.ui
cui/ui/macroselectordialog.ui
cui/ui/spellingdialog.ui
cui/ui/aboutconfigdialog.ui
diff --git a/sc/qa/unit/screenshots/data/screenshots.txt b/sc/qa/unit/screenshots/data/screenshots.txt
index 933fd2377176..033d7884a667 100644
--- a/sc/qa/unit/screenshots/data/screenshots.txt
+++ b/sc/qa/unit/screenshots/data/screenshots.txt
@@ -50,6 +50,12 @@ modules/scalc/ui/formatcellsdialog.ui
#
# modules/scalc/ui/headerfootercontent.ui
# modules/scalc/ui/pivottablelayoutdialog.ui
+#
+# problems under Linux:
+# modules/scalc/ui/RowHeightDialog.ui
+# modules/scalc/ui/OptimalRowHeightDialog.ui
+# modules/scalc/ui/ColWidthDialog.ui
+# modules/scalc/ui/OptimalColWidthDialog.ui
modules/scalc/ui/autoformattable.ui
modules/scalc/ui/sortwarning.ui
@@ -127,10 +133,6 @@ modules/scalc/ui/ungroupdialog.ui
modules/scalc/ui/groupdialog.ui
modules/scalc/ui/showchangesdialog.ui
modules/scalc/ui/insertcells.ui
-modules/scalc/ui/RowHeightDialog.ui
-modules/scalc/ui/OptimalRowHeightDialog.ui
-modules/scalc/ui/ColWidthDialog.ui
-modules/scalc/ui/OptimalColWidthDialog.ui
modules/scalc/ui/solverprogressdialog.ui
modules/scalc/ui/nosolutiondialog.ui
modules/scalc/ui/solversuccessdialog.ui
diff --git a/svx/qa/unit/data/svx-dialogs-test.txt b/svx/qa/unit/data/svx-dialogs-test.txt
index f60d86046591..07ddb87afc2a 100644
--- a/svx/qa/unit/data/svx-dialogs-test.txt
+++ b/svx/qa/unit/data/svx-dialogs-test.txt
@@ -34,6 +34,7 @@
# This is typically a hint that these should be hard-coded in the
# test case since they need some document and model data to work
#
+# svx/ui/asianphoneticguidedialog.ui <- problems under linux
svx/ui/textcontrolchardialog.ui
svx/ui/textcontrolparadialog.ui
@@ -61,7 +62,6 @@ svx/ui/fontworkspacingdialog.ui
svx/ui/chinesedictionary.ui
svx/ui/chineseconversiondialog.ui
svx/ui/imapdialog.ui
-svx/ui/asianphoneticguidedialog.ui
svx/ui/findreplacedialog.ui
svx/ui/crashreportdlg.ui
svx/ui/docrecoverysavedialog.ui
diff --git a/sw/qa/unit/data/sw-dialogs-test.txt b/sw/qa/unit/data/sw-dialogs-test.txt
index 8dc472156efa..e219358c79e5 100644
--- a/sw/qa/unit/data/sw-dialogs-test.txt
+++ b/sw/qa/unit/data/sw-dialogs-test.txt
@@ -41,6 +41,7 @@
# modules/swriter/ui/linenumbering.ui
# modules/swriter/ui/footnotepage.ui
# modules/swriter/ui/outlinenumberingpage.ui
+# modules/swriter/ui/picturepage.ui <- problems under Linux
modules/swriter/ui/abstractdialog.ui
modules/swriter/ui/addentrydialog.ui
@@ -150,7 +151,6 @@ modules/swriter/ui/opttestpage.ui
modules/swriter/ui/outlinenumbering.ui
modules/swriter/ui/outlinepositionpage.ui
modules/swriter/ui/paradialog.ui
-modules/swriter/ui/picturepage.ui
modules/swriter/ui/previewzoomdialog.ui
modules/swriter/ui/printeroptions.ui
modules/swriter/ui/printmergedialog.ui