aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAlon Zakai <alonzakai@gmail.com>2012-04-12 14:05:21 -0700
committerAlon Zakai <alonzakai@gmail.com>2012-04-12 14:05:21 -0700
commit53015391802b686bc6b18aad0e1ccada684a5317 (patch)
tree17f8c30b352a0a4c1c11ed8ee587d9454b829aeb
parentc5dbf34c71d104a634b7dfe104d513677254e143 (diff)
fix EM_SAVE_DIR
-rwxr-xr-xtests/runner.py2
-rw-r--r--tools/shared.py3
2 files changed, 3 insertions, 2 deletions
diff --git a/tests/runner.py b/tests/runner.py
index 592f685c..6db096d9 100755
--- a/tests/runner.py
+++ b/tests/runner.py
@@ -79,7 +79,7 @@ class RunnerCore(unittest.TestCase):
if not self.save_dir:
dirname = tempfile.mkdtemp(prefix='emscripten_test_' + self.__class__.__name__ + '_', dir=TEMP_DIR)
else:
- dirname = EMSCRIPTEN_TEMP_DIR
+ dirname = CANONICAL_TEMP_DIR
if not os.path.exists(dirname):
os.makedirs(dirname)
self.working_dir = dirname
diff --git a/tools/shared.py b/tools/shared.py
index 13160713..58ca4ca5 100644
--- a/tools/shared.py
+++ b/tools/shared.py
@@ -126,11 +126,12 @@ JS_OPTIMIZER = path_from_root('tools', 'js-optimizer.js')
# Temp dir. Create a random one, unless EMCC_DEBUG is set, in which case use TEMP_DIR/emscripten_temp
+CANONICAL_TEMP_DIR = os.path.join(TEMP_DIR, 'emscripten_temp')
EMSCRIPTEN_TEMP_DIR = None
if os.environ.get('EMCC_DEBUG'):
try:
- EMSCRIPTEN_TEMP_DIR = os.path.join(TEMP_DIR, 'emscripten_temp')
+ EMSCRIPTEN_TEMP_DIR = CANONICAL_TEMP_DIR
if not os.path.exists(EMSCRIPTEN_TEMP_DIR):
os.makedirs(EMSCRIPTEN_TEMP_DIR)
except: