From f5c54089b50718abf7c35aa81b150c509809d5c4 Mon Sep 17 00:00:00 2001 From: Bjoern Michaelsen Date: Fri, 14 Oct 2016 15:17:24 +0200 Subject: prep WinResTarget for WNT in testdir MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Change-Id: I04c050dca1212d247c9b11a996ba8f37c0a6492f Reviewed-on: https://gerrit.libreoffice.org/29825 Tested-by: Jenkins Reviewed-by: Björn Michaelsen Tested-by: Björn Michaelsen --- solenv/Module_solenv.mk | 2 -- solenv/gbuild/extensions/post_GbuildToIde.mk | 3 ++- solenv/qa/python/gbuildtoide.py | 6 +++++- 3 files changed, 7 insertions(+), 4 deletions(-) diff --git a/solenv/Module_solenv.mk b/solenv/Module_solenv.mk index f471374ed55e..d179771827c9 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/gbuild/extensions/post_GbuildToIde.mk b/solenv/gbuild/extensions/post_GbuildToIde.mk index c8087baaf3ba..74a867c042ff 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 11e66a82f286..591a5fca8216 100644 --- a/solenv/qa/python/gbuildtoide.py +++ b/solenv/qa/python/gbuildtoide.py @@ -18,13 +18,17 @@ 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]) + subprocess.check_call(['make', 'gbuildtoide', 'WORKDIR=%s' % self.tempworkmixed]) jsonfiles = os.listdir(os.path.join(self.tempwork, 'GbuildToIde', 'Library')) gbuildlibs = [] for jsonfilename in jsonfiles: -- cgit v1.2.3