mir/libreoffice
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Revert "prep WinResTarget for WNT in testdir"

Browse Source 
Still random failures in Gerrit Windows builds.

This reverts commit f5c54089b5.

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>
This commit is contained in:
Giuseppe Castagno
2016-10-20 12:26:51 +00:00
parent 8db1b13e72
commit 6e261cb19e
3 changed files with 4 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
solenv/Module_solenv.mk
View File

@@ -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:

3
solenv/gbuild/extensions/post_GbuildToIde.mk
View File

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

6
solenv/qa/python/gbuildtoide.py
View File

@@ -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: