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/32502Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Matúš Kukan <matus@libreoffice.org>

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,

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,))
 

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:

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:

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:

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:

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:

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:

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:

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, \

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, \

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,\