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 6e261cb1.

Change-Id: Idb858b5eeced91f19c9dd5600c4fdc5370b73cc5
Reviewed-on: https://gerrit.libreoffice.org/30226Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Michael Stahl <mstahl@redhat.com>

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:

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:

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)

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: