diff options
author | Jukka Jylänki <jujjyl@gmail.com> | 2013-11-18 00:36:53 +0200 |
---|---|---|
committer | Jukka Jylänki <jujjyl@gmail.com> | 2013-11-18 00:36:53 +0200 |
commit | ee1537cfadab1312522120cb726a5d38ee0ed66c (patch) | |
tree | 1c268b6d22bbe1206f1e67a3548409df770b72da | |
parent | c655638e4a1529f498cb8ff735b936b18a6083c8 (diff) |
Clean up Windows-specific code in previous commits in the pull request.
-rwxr-xr-x | emcc | 4 | ||||
-rw-r--r-- | tests/test_browser.py | 3 |
2 files changed, 3 insertions, 4 deletions
@@ -50,7 +50,7 @@ emcc can be influenced by a few environment variables: import os, sys, shutil, tempfile, subprocess, shlex, time, re, logging from subprocess import PIPE, STDOUT from tools import shared, jsrun -from tools.shared import Compression, execute, suffix, unsuffixed, unsuffixed_basename +from tools.shared import Compression, execute, suffix, unsuffixed, unsuffixed_basename, WINDOWS from tools.response_file import read_response_file CXX_SUFFIXES = ('.cpp', '.cxx', '.cc') @@ -62,8 +62,6 @@ ASSEMBLY_SUFFIXES = ('.ll',) LIB_PREFIXES = ('', 'lib') JS_CONTAINING_SUFFIXES = ('js', 'html') -WINDOWS = sys.platform.startswith('win') - # Mapping of emcc opt levels to llvm opt levels. We use llvm opt level 3 in emcc opt # levels 2 and 3 (emcc 3 is unsafe opts, so unsuitable for the only level to get # llvm opt level 3, and speed-wise emcc level 2 is already the slowest/most optimizing diff --git a/tests/test_browser.py b/tests/test_browser.py index daf82a76..f2bcaa93 100644 --- a/tests/test_browser.py +++ b/tests/test_browser.py @@ -1312,7 +1312,8 @@ keydown(100);keyup(100); // trigger the end server.terminate() # Avoid race condition on cleanup, wait a bit so that processes have released file locks so that test tearDown won't # attempt to rmdir() files in use. - time.sleep(2) + if WINDOWS: + time.sleep(2) def test_glgears(self): self.btest('hello_world_gles.c', reference='gears.png', reference_slack=1, |