[Libreoffice-commits] core.git: bin/gbuild-to-ide sw/CppunitTest_sw_ooxmlexport2.mk sw/CppunitTest_sw_ooxmlexport3.mk sw/CppunitTest_sw_ooxmlexport4.mk sw/CppunitTest_sw_ooxmlexport5.mk sw/CppunitTest_sw_ooxmlexport6.mk sw/CppunitTest_sw_ooxmlexport7.mk sw/CppunitTest_sw_ooxmlexport9.mk sw/CppunitTest_sw_ooxmlexport.mk sw/CppunitTest_sw_ooxmlfieldexport.mk sw/CppunitTest_sw_ooxmlw14export.mk sw/Module_sw.mk
Matúš Kukan
matus.kukan at gmail.com
Fri Dec 30 07:16:28 UTC 2016
bin/gbuild-to-ide | 10 +---------
sw/CppunitTest_sw_ooxmlexport.mk | 2 --
sw/CppunitTest_sw_ooxmlexport2.mk | 2 --
sw/CppunitTest_sw_ooxmlexport3.mk | 2 --
sw/CppunitTest_sw_ooxmlexport4.mk | 2 --
sw/CppunitTest_sw_ooxmlexport5.mk | 2 --
sw/CppunitTest_sw_ooxmlexport6.mk | 2 --
sw/CppunitTest_sw_ooxmlexport7.mk | 2 --
sw/CppunitTest_sw_ooxmlexport9.mk | 2 --
sw/CppunitTest_sw_ooxmlfieldexport.mk | 2 --
sw/CppunitTest_sw_ooxmlw14export.mk | 2 --
sw/Module_sw.mk | 2 ++
12 files changed, 3 insertions(+), 29 deletions(-)
New commits:
commit d8a9d483898d94868bc502d52f0fcd166d18959f
Author: Matúš Kukan <matus.kukan at gmail.com>
Date: Thu Dec 29 23:42:23 2016 +0100
Workaround strange sw test makefiles
Include ooxmlexport_setup.mk only once in Module_sw.mk,
so that gbuildtojson can properly set last included
makefile for test jsons.
Change-Id: Ie8ed3296ae97cf4a33d652599673f389b224993e
Reviewed-on: https://gerrit.libreoffice.org/32502
Tested-by: Jenkins <ci at libreoffice.org>
Reviewed-by: Matúš Kukan <matus at libreoffice.org>
diff --git a/bin/gbuild-to-ide b/bin/gbuild-to-ide
index 3b84394..451f6b5 100755
--- a/bin/gbuild-to-ide
+++ b/bin/gbuild-to-ide
@@ -149,16 +149,8 @@ class GbuildParser:
@staticmethod
def __test_from_json(json):
(foundincludes, foundisystem) = GbuildParser.__split_includes(json['INCLUDE'])
- testname_match = GbuildParser.testpattern.match(os.path.basename(json['MAKEFILE']))
-
- # Workaround strange writer test makefile setup
- if testname_match is None:
- testname = "StrangeWriterMakefiles"
- else:
- testname = testname_match.group(1)
-
return GbuildTest(
- testname,
+ GbuildParser.testpattern.match(os.path.basename(json['MAKEFILE'])).group(1),
os.path.dirname(json['MAKEFILE']),
foundincludes,
foundisystem,
diff --git a/sw/CppunitTest_sw_ooxmlexport.mk b/sw/CppunitTest_sw_ooxmlexport.mk
index d3e7ac1..dec6978 100644
--- a/sw/CppunitTest_sw_ooxmlexport.mk
+++ b/sw/CppunitTest_sw_ooxmlexport.mk
@@ -9,8 +9,6 @@
#
#*************************************************************************
-include $(SRCDIR)/sw/ooxmlexport_setup.mk
-
# empty second argument (i.e. no 1)
$(eval $(call sw_ooxmlexport_test,))
diff --git a/sw/CppunitTest_sw_ooxmlexport2.mk b/sw/CppunitTest_sw_ooxmlexport2.mk
index 2be67c0..18a3456 100644
--- a/sw/CppunitTest_sw_ooxmlexport2.mk
+++ b/sw/CppunitTest_sw_ooxmlexport2.mk
@@ -9,8 +9,6 @@
#
#*************************************************************************
-include $(SRCDIR)/sw/ooxmlexport_setup.mk
-
$(eval $(call sw_ooxmlexport_test,2))
# vim: set noet sw=4 ts=4:
diff --git a/sw/CppunitTest_sw_ooxmlexport3.mk b/sw/CppunitTest_sw_ooxmlexport3.mk
index cdb9ab1..5969aea 100644
--- a/sw/CppunitTest_sw_ooxmlexport3.mk
+++ b/sw/CppunitTest_sw_ooxmlexport3.mk
@@ -9,8 +9,6 @@
#
#*************************************************************************
-include $(SRCDIR)/sw/ooxmlexport_setup.mk
-
$(eval $(call sw_ooxmlexport_test,3))
# vim: set noet sw=4 ts=4:
diff --git a/sw/CppunitTest_sw_ooxmlexport4.mk b/sw/CppunitTest_sw_ooxmlexport4.mk
index 1a92a48..e328593 100644
--- a/sw/CppunitTest_sw_ooxmlexport4.mk
+++ b/sw/CppunitTest_sw_ooxmlexport4.mk
@@ -9,8 +9,6 @@
#
#*************************************************************************
-include $(SRCDIR)/sw/ooxmlexport_setup.mk
-
$(eval $(call sw_ooxmlexport_test,4))
# vim: set noet sw=4 ts=4:
diff --git a/sw/CppunitTest_sw_ooxmlexport5.mk b/sw/CppunitTest_sw_ooxmlexport5.mk
index 42b873e..674fcee 100644
--- a/sw/CppunitTest_sw_ooxmlexport5.mk
+++ b/sw/CppunitTest_sw_ooxmlexport5.mk
@@ -9,8 +9,6 @@
#
#*************************************************************************
-include $(SRCDIR)/sw/ooxmlexport_setup.mk
-
$(eval $(call sw_ooxmlexport_test,5))
# vim: set noet sw=4 ts=4:
diff --git a/sw/CppunitTest_sw_ooxmlexport6.mk b/sw/CppunitTest_sw_ooxmlexport6.mk
index f619ada..9b3ebe18 100644
--- a/sw/CppunitTest_sw_ooxmlexport6.mk
+++ b/sw/CppunitTest_sw_ooxmlexport6.mk
@@ -9,8 +9,6 @@
#
#*************************************************************************
-include $(SRCDIR)/sw/ooxmlexport_setup.mk
-
$(eval $(call sw_ooxmlexport_test,6))
# vim: set noet sw=4 ts=4:
diff --git a/sw/CppunitTest_sw_ooxmlexport7.mk b/sw/CppunitTest_sw_ooxmlexport7.mk
index 8a8f53e..2145a94 100644
--- a/sw/CppunitTest_sw_ooxmlexport7.mk
+++ b/sw/CppunitTest_sw_ooxmlexport7.mk
@@ -9,8 +9,6 @@
#
#*************************************************************************
-include $(SRCDIR)/sw/ooxmlexport_setup.mk
-
$(eval $(call sw_ooxmlexport_test,7))
# vim: set noet sw=4 ts=4:
diff --git a/sw/CppunitTest_sw_ooxmlexport9.mk b/sw/CppunitTest_sw_ooxmlexport9.mk
index 9b7c409..e0143e5 100644
--- a/sw/CppunitTest_sw_ooxmlexport9.mk
+++ b/sw/CppunitTest_sw_ooxmlexport9.mk
@@ -9,8 +9,6 @@
#
#*************************************************************************
-include $(SRCDIR)/sw/ooxmlexport_setup.mk
-
$(eval $(call sw_ooxmlexport_test,9))
# vim: set noet sw=4 ts=4:
diff --git a/sw/CppunitTest_sw_ooxmlfieldexport.mk b/sw/CppunitTest_sw_ooxmlfieldexport.mk
index abd0653..8c75395 100644
--- a/sw/CppunitTest_sw_ooxmlfieldexport.mk
+++ b/sw/CppunitTest_sw_ooxmlfieldexport.mk
@@ -9,8 +9,6 @@
#
#*************************************************************************
-include $(SRCDIR)/sw/ooxmlexport_setup.mk
-
$(eval $(call gb_CppunitTest_CppunitTest,sw_ooxmlfieldexport))
$(eval $(call gb_CppunitTest_add_exception_objects,sw_ooxmlfieldexport, \
diff --git a/sw/CppunitTest_sw_ooxmlw14export.mk b/sw/CppunitTest_sw_ooxmlw14export.mk
index d54d3c1..a12d9fe 100644
--- a/sw/CppunitTest_sw_ooxmlw14export.mk
+++ b/sw/CppunitTest_sw_ooxmlw14export.mk
@@ -9,8 +9,6 @@
#
#*************************************************************************
-include $(SRCDIR)/sw/ooxmlexport_setup.mk
-
$(eval $(call gb_CppunitTest_CppunitTest,sw_ooxmlw14export))
$(eval $(call gb_CppunitTest_add_exception_objects,sw_ooxmlw14export, \
diff --git a/sw/Module_sw.mk b/sw/Module_sw.mk
index 3b5d06f..04d33ee 100644
--- a/sw/Module_sw.mk
+++ b/sw/Module_sw.mk
@@ -17,6 +17,8 @@
# the License at http://www.apache.org/licenses/LICENSE-2.0 .
#
+include $(SRCDIR)/sw/ooxmlexport_setup.mk
+
$(eval $(call gb_Module_Module,sw))
$(eval $(call gb_Module_add_targets,sw,\
More information about the Libreoffice-commits
mailing list