diff options
| author | Giuseppe Castagno <giuseppe.castagno@acca-esse.eu> | 2016-10-20 12:26:51 +0000 |
|---|---|---|
| committer | Giuseppe Castagno <giuseppe.castagno@acca-esse.eu> | 2016-10-20 13:10:15 +0000 |
| commit | 6e261cb19e5751eb0553ad0c5b357b1a5747518c (patch) | |
| tree | 2c9ea213833abfec830f9ad38e36bdb659f288d1 | |
| parent | 8db1b13e721683d0263925c8e0300dd86a022814 (diff) | |
Revert "prep WinResTarget for WNT in testdir"
Still random failures in Gerrit Windows builds.
This reverts commit f5c54089b50718abf7c35aa81b150c509809d5c4.
Change-Id: Iec48d2388691577ccd675b9a73941cedceebd527
Reviewed-on: https://gerrit.libreoffice.org/30103
Reviewed-by: Björn Michaelsen <bjoern.michaelsen@canonical.com>
Reviewed-by: Giuseppe Castagno <giuseppe.castagno@acca-esse.eu>
Tested-by: Giuseppe Castagno <giuseppe.castagno@acca-esse.eu>
| -rw-r--r-- | solenv/Module_solenv.mk | 2 | ||||
| -rw-r--r-- | solenv/gbuild/extensions/post_GbuildToIde.mk | 3 | ||||
| -rw-r--r-- | solenv/qa/python/gbuildtoide.py | 6 |
3 files changed, 4 insertions, 7 deletions
diff --git a/solenv/Module_solenv.mk b/solenv/Module_solenv.mk index d179771827c9..f471374ed55e 100644 --- a/solenv/Module_solenv.mk +++ b/solenv/Module_solenv.mk @@ -22,9 +22,11 @@ $(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 74a867c042ff..c8087baaf3ba 100644 --- a/solenv/gbuild/extensions/post_GbuildToIde.mk +++ b/solenv/gbuild/extensions/post_GbuildToIde.mk @@ -18,8 +18,7 @@ foo: true define gb_LinkTarget__command -mkdir -p $(WORKDIR)/GbuildToIde/$(dir $(2)) $(WORKDIR)/Headers/$(dir $(2)) -$(if $(filter WNT,$(OS)),mkdir -p $(dir $(call gb_WinResTarget_get_target,dummy))) +mkdir -p $(WORKDIR)/GbuildToIde/$(dir $(2)) 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 591a5fca8216..11e66a82f286 100644 --- a/solenv/qa/python/gbuildtoide.py +++ b/solenv/qa/python/gbuildtoide.py @@ -18,17 +18,13 @@ 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.tempworkmixed]) + subprocess.check_call(['make', 'gbuildtoide', 'WORKDIR=%s' % self.tempwork]) jsonfiles = os.listdir(os.path.join(self.tempwork, 'GbuildToIde', 'Library')) gbuildlibs = [] for jsonfilename in jsonfiles: |