[Libreoffice-commits] core.git: sd/Module_sd.mk sd/UITest_findReplace.mk sd/UITest_sd_findReplace.mk sw/Module_sw.mk sw/UITest_findReplace.mk sw/UITest_sw_findReplace.mk

Miklos Vajna (via logerrit) logerrit at kemper.freedesktop.org
Thu Apr 4 07:53:37 UTC 2019


 sd/Module_sd.mk             |    2 +-
 sd/UITest_sd_findReplace.mk |    6 +++---
 sw/Module_sw.mk             |    2 +-
 sw/UITest_sw_findReplace.mk |    6 +++---
 4 files changed, 8 insertions(+), 8 deletions(-)

New commits:
commit a3fdb6c5c2899a3d5ed9c60f35cc3ef53ce85acd
Author:     Miklos Vajna <vmiklos at collabora.com>
AuthorDate: Thu Apr 4 08:52:23 2019 +0200
Commit:     Miklos Vajna <vmiklos at collabora.com>
CommitDate: Thu Apr 4 09:53:12 2019 +0200

    uitest: disambiguate UITest_findReplace
    
    There was an sw and an sd one as well.
    
    Change-Id: I3d031674f6866a779d44ce642339ec59bf2c82cb
    Reviewed-on: https://gerrit.libreoffice.org/70236
    Reviewed-by: Miklos Vajna <vmiklos at collabora.com>
    Tested-by: Jenkins

diff --git a/sd/Module_sd.mk b/sd/Module_sd.mk
index 7bfb9f8a2c08..bd2796ae818e 100644
--- a/sd/Module_sd.mk
+++ b/sd/Module_sd.mk
@@ -61,6 +61,6 @@ $(eval $(call gb_Module_add_subsequentcheck_targets,sd,\
 
 $(eval $(call gb_Module_add_uicheck_targets,sd,\
 	UITest_impress_tests \
-	UITest_findReplace \
+	UITest_sd_findReplace \
 ))
 # vim: set noet sw=4 ts=4:
diff --git a/sd/UITest_findReplace.mk b/sd/UITest_sd_findReplace.mk
similarity index 65%
rename from sd/UITest_findReplace.mk
rename to sd/UITest_sd_findReplace.mk
index 245468975771..87e5aca342fe 100644
--- a/sd/UITest_findReplace.mk
+++ b/sd/UITest_sd_findReplace.mk
@@ -5,12 +5,12 @@
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 #
 
-$(eval $(call 	gb_UITest_UITest,findReplace))
+$(eval $(call 	gb_UITest_UITest,sd_findReplace))
 
-$(eval $(call gb_UITest_add_modules,findReplace,$(SRCDIR)/sd/qa/uitest,\
+$(eval $(call gb_UITest_add_modules,sd_findReplace,$(SRCDIR)/sd/qa/uitest,\
 	findReplace/ \
 ))
 
-$(eval $(call gb_UITest_set_defs,findReplace, \
+$(eval $(call gb_UITest_set_defs,sd_findReplace, \
     TDOC="$(SRCDIR)/sd/qa/uitest/impress_tests/data" \
 ))
diff --git a/sw/Module_sw.mk b/sw/Module_sw.mk
index 4385e05a1a65..eee1b09e97e6 100644
--- a/sw/Module_sw.mk
+++ b/sw/Module_sw.mk
@@ -146,7 +146,7 @@ $(eval $(call gb_Module_add_uicheck_targets,sw,\
 	UITest_writer_tests4 \
 	UITest_writer_tests5 \
 	UITest_table \
-	UITest_findReplace \
+	UITest_sw_findReplace \
 	UITest_chapterNumbering \
 	UITest_librelogo \
 	UITest_options \
diff --git a/sw/UITest_findReplace.mk b/sw/UITest_sw_findReplace.mk
similarity index 65%
rename from sw/UITest_findReplace.mk
rename to sw/UITest_sw_findReplace.mk
index 82716c953a25..6218c2e423c8 100644
--- a/sw/UITest_findReplace.mk
+++ b/sw/UITest_sw_findReplace.mk
@@ -5,12 +5,12 @@
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 #
 
-$(eval $(call 	gb_UITest_UITest,findReplace))
+$(eval $(call 	gb_UITest_UITest,sw_findReplace))
 
-$(eval $(call gb_UITest_add_modules,findReplace,$(SRCDIR)/sw/qa/uitest,\
+$(eval $(call gb_UITest_add_modules,sw_findReplace,$(SRCDIR)/sw/qa/uitest,\
 	findReplace/ \
 ))
 
-$(eval $(call gb_UITest_set_defs,findReplace, \
+$(eval $(call gb_UITest_set_defs,sw_findReplace, \
     TDOC="$(SRCDIR)/sw/qa/uitest/writer_tests/data" \
 ))


More information about the Libreoffice-commits mailing list