summaryrefslogtreecommitdiff
path: root/solenv/qa
diff options
context:
space:
mode:
authorMichael Stahl <mstahl@redhat.com>2016-10-24 14:12:40 +0200
committerMichael Stahl <mstahl@redhat.com>2016-10-24 19:05:11 +0000
commit6677759c29620796540a0265c4f6d0671f6a42c6 (patch)
treebab9dbbb21a4d0b7b936631ba255d5e745657d4b /solenv/qa
parente28b8b779b1465d72bc089138fde925e34e11893 (diff)
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@libreoffice.org> Reviewed-by: Michael Stahl <mstahl@redhat.com>
Diffstat (limited to 'solenv/qa')
-rw-r--r--solenv/qa/python/gbuildtoide.py7
1 files changed, 6 insertions, 1 deletions
diff --git a/solenv/qa/python/gbuildtoide.py b/solenv/qa/python/gbuildtoide.py
index 11e66a82f286..af2014d11342 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: