[Libreoffice-commits] core.git: sc/Module_sc.mk sc/UITest_options.mk sc/UITest_sc_options.mk sw/Module_sw.mk sw/UITest_options.mk sw/UITest_sw_options.mk

[Stephan Bergmann (via logerrit)]

 sc/Module_sc.mk         |    2 +-
 sc/UITest_sc_options.mk |    6 +++---
 sw/Module_sw.mk         |    2 +-
 sw/UITest_sw_options.mk |    6 +++---
 4 files changed, 8 insertions(+), 8 deletions(-)

New commits:
commit 83aa172697c11a9550c27a28f8e62b523ec7086d
Author:     Stephan Bergmann <sbergman at redhat.com>
AuthorDate: Thu Sep 10 16:26:52 2020 +0200
Commit:     Stephan Bergmann <sbergman at redhat.com>
CommitDate: Thu Sep 10 22:35:59 2020 +0200

    Disambiguate UITest_sc_options and UITest_sw_options
    
    ...that were added with the same name UITest_options in
    107af098311beafaadb343c5a3634389f56006a0 "uitest for bug tdf#117458" and
    ec914194382654aa4b0ad9973acc0eed15a4ab43 "add uitest for bug tdf#78133",
    respectively
    
    Change-Id: I31a967d2ce14f86d91951a836b694f360802c5a7
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/102391
    Tested-by: Jenkins
    Reviewed-by: Stephan Bergmann <sbergman at redhat.com>

diff --git a/sc/Module_sc.mk b/sc/Module_sc.mk
index 8a6f8411faff..730023c476a6 100644
--- a/sc/Module_sc.mk
+++ b/sc/Module_sc.mk
@@ -242,7 +242,7 @@ $(eval $(call gb_Module_add_uicheck_targets,sc,\
 	UITest_solver \
 	UITest_goalSeek \
 	UITest_protect \
-	UITest_options \
+	UITest_sc_options \
 	UITest_validity \
 	UITest_key_f4 \
 	UITest_textCase \
diff --git a/sc/UITest_options.mk b/sc/UITest_sc_options.mk
similarity index 72%
rename from sc/UITest_options.mk
rename to sc/UITest_sc_options.mk
index 2869fb4a510e..c5a7656bf79f 100644
--- a/sc/UITest_options.mk
+++ b/sc/UITest_sc_options.mk
@@ -7,13 +7,13 @@
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 #
 
-$(eval $(call gb_UITest_UITest,options))
+$(eval $(call gb_UITest_UITest,sc_options))
 
-$(eval $(call gb_UITest_add_modules,options,$(SRCDIR)/sc/qa/uitest,\
+$(eval $(call gb_UITest_add_modules,sc_options,$(SRCDIR)/sc/qa/uitest,\
 	options/ \
 ))
 
-$(eval $(call gb_UITest_set_defs,options, \
+$(eval $(call gb_UITest_set_defs,sc_options, \
     TDOC="$(SRCDIR)/sc/qa/uitest/calc_tests/data" \
 ))
 
diff --git a/sw/Module_sw.mk b/sw/Module_sw.mk
index 7087d76806e9..ec6e73fd2779 100644
--- a/sw/Module_sw.mk
+++ b/sw/Module_sw.mk
@@ -170,7 +170,7 @@ $(eval $(call gb_Module_add_uicheck_targets,sw,\
 	UITest_sw_findSimilarity \
 	UITest_chapterNumbering \
 	UITest_librelogo \
-	UITest_options \
+	UITest_sw_options \
 	UITest_sw_ui_fmtui \
 	UITest_classification \
 	UITest_writer_macro_tests \
diff --git a/sw/UITest_options.mk b/sw/UITest_sw_options.mk
similarity index 66%
rename from sw/UITest_options.mk
rename to sw/UITest_sw_options.mk
index 1168becf1901..8567c058490f 100644
--- a/sw/UITest_options.mk
+++ b/sw/UITest_sw_options.mk
@@ -5,12 +5,12 @@
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 #
 
-$(eval $(call 	gb_UITest_UITest,options))
+$(eval $(call 	gb_UITest_UITest,sw_options))
 
-$(eval $(call gb_UITest_add_modules,options,$(SRCDIR)/sw/qa/uitest,\
+$(eval $(call gb_UITest_add_modules,sw_options,$(SRCDIR)/sw/qa/uitest,\
 	options/ \
 ))
 
-$(eval $(call gb_UITest_set_defs,options, \
+$(eval $(call gb_UITest_set_defs,sw_options, \
     TDOC="$(SRCDIR)/sw/qa/uitest/writer_tests/data" \
 ))