summaryrefslogtreecommitdiff
path: root/solenv/qa
diff options
context:
space:
mode:
authorGiuseppe Castagno <giuseppe.castagno@acca-esse.eu>2016-10-20 12:26:51 +0000
committerGiuseppe Castagno <giuseppe.castagno@acca-esse.eu>2016-10-20 13:10:15 +0000
commit6e261cb19e5751eb0553ad0c5b357b1a5747518c (patch)
tree2c9ea213833abfec830f9ad38e36bdb659f288d1 /solenv/qa
parent8db1b13e721683d0263925c8e0300dd86a022814 (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>
Diffstat (limited to 'solenv/qa')
-rw-r--r--solenv/qa/python/gbuildtoide.py6
1 files changed, 1 insertions, 5 deletions
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: