[Libreoffice-commits] core.git: solenv/gbuild solenv/Module_solenv.mk solenv/PythonTest_solenv_python.mk solenv/qa

[Michael Stahl]

 solenv/Module_solenv.mk                      |    2 --
 solenv/PythonTest_solenv_python.mk           |    5 +++++
 solenv/gbuild/extensions/post_GbuildToIde.mk |    3 ++-
 solenv/qa/python/gbuildtoide.py              |    7 ++++++-
 4 files changed, 13 insertions(+), 4 deletions(-)

New commits:
commit 6677759c29620796540a0265c4f6d0671f6a42c6
Author: Michael Stahl <mstahl at redhat.com>
Date:   Mon Oct 24 14:12:40 2016 +0200

    solenv: force gbuildtoide test to use the same "make" as the caller
    
    Possibly mis-matching make binaries could be the reason behind failures
    that have been observed on Jenkins:
    
    make[3]: Entering directory '/home/tdf/lode/jenkins/workspace/lo_gerrit/Config/windows_msc_dbgutil_32/solenv/qa/python/selftest'
    make[3]: *** internal error: invalid --jobserver-fds string 'gmake_semaphore_5488'.  Stop.
    
    Also, to enable this: Revert "Revert "prep WinResTarget for WNT in testdir""
    
    This reverts commit 6e261cb19e5751eb0553ad0c5b357b1a5747518c.
    
    Change-Id: Idb858b5eeced91f19c9dd5600c4fdc5370b73cc5
    Reviewed-on: https://gerrit.libreoffice.org/30226
    Tested-by: Jenkins <ci at libreoffice.org>
    Reviewed-by: Michael Stahl <mstahl at redhat.com>

diff --git a/solenv/Module_solenv.mk b/solenv/Module_solenv.mk
index f471374..d179771 100644
--- a/solenv/Module_solenv.mk
+++ b/solenv/Module_solenv.mk
@@ -22,11 +22,9 @@ $(eval $(call gb_Module_add_targets,solenv,\
 endif
 
 ifneq ($(DISABLE_PYTHON),TRUE)
-ifneq ($(OS),WNT) # disable on Windows for now, causes gerrit/jenkins failures
 $(eval $(call gb_Module_add_subsequentcheck_targets,solenv,\
 	PythonTest_solenv_python \
 ))
 endif
-endif
 
 # vim: set shiftwidth=4 tabstop=4 noexpandtab:
diff --git a/solenv/PythonTest_solenv_python.mk b/solenv/PythonTest_solenv_python.mk
index 8985ce2..8ed1c20 100644
--- a/solenv/PythonTest_solenv_python.mk
+++ b/solenv/PythonTest_solenv_python.mk
@@ -13,4 +13,9 @@ $(eval $(call gb_PythonTest_add_modules,solenv_python,$(SRCDIR)/solenv/qa/python
 	gbuildtoide \
 ))
 
+# force gbuildtoide.py to use the same make binary as is used here
+$(eval $(call gb_PythonTest_set_defs,solenv_python,\
+    MAKE="$(MAKE)" \
+))
+
 # vim: set noet sw=4 ts=4:
diff --git a/solenv/gbuild/extensions/post_GbuildToIde.mk b/solenv/gbuild/extensions/post_GbuildToIde.mk
index c8087ba..74a867c 100644
--- a/solenv/gbuild/extensions/post_GbuildToIde.mk
+++ b/solenv/gbuild/extensions/post_GbuildToIde.mk
@@ -18,7 +18,8 @@ foo:
 	true
 
 define gb_LinkTarget__command
-mkdir -p $(WORKDIR)/GbuildToIde/$(dir $(2))
+mkdir -p $(WORKDIR)/GbuildToIde/$(dir $(2)) $(WORKDIR)/Headers/$(dir $(2))
+$(if $(filter WNT,$(OS)),mkdir -p $(dir $(call gb_WinResTarget_get_target,dummy)))
 printf '{"LINKTARGET": "%s"' '$(2)' > $(WORKDIR)/GbuildToIde/$(2)
 printf ', "ILIBTARGET": "%s"' '$(ILIBTARGET)' >> $(WORKDIR)/GbuildToIde/$(2)
 printf ', "COBJECTS": "%s"' '$(COBJECTS)' >> $(WORKDIR)/GbuildToIde/$(2)
diff --git a/solenv/qa/python/gbuildtoide.py b/solenv/qa/python/gbuildtoide.py
index 11e66a8..af2014d 100644
--- a/solenv/qa/python/gbuildtoide.py
+++ b/solenv/qa/python/gbuildtoide.py
@@ -18,13 +18,18 @@ import tempfile
 class CheckGbuildToIde(unittest.TestCase):
     def setUp(self):
         self.tempwork = tempfile.mkdtemp()
+        if os.environ['OS'] == 'WNT':
+            self.tempworkmixed = self.tempwork.replace('\\','/')
+        else:
+            self.tempworkmixed = self.tempwork
 
     def tearDown(self):
         subprocess.check_call(['rm', '-rf', self.tempwork])
 
     def test_gbuildtoide(self):
         os.chdir(os.path.join(os.environ['SRCDIR'], 'solenv', 'qa', 'python', 'selftest'))
-        subprocess.check_call(['make', 'gbuildtoide', 'WORKDIR=%s' % self.tempwork])
+        make = os.environ['MAKE']
+        subprocess.check_call([make, 'gbuildtoide', 'WORKDIR=%s' % self.tempworkmixed])
         jsonfiles = os.listdir(os.path.join(self.tempwork, 'GbuildToIde', 'Library'))
         gbuildlibs = []
         for jsonfilename in jsonfiles: