diff options
| -rwxr-xr-x | tests/runner.py | 10 | ||||
| -rw-r--r-- | tools/shared.py | 3 |
2 files changed, 9 insertions, 4 deletions
diff --git a/tests/runner.py b/tests/runner.py index 61d2a6aa..a76fbaca 100755 --- a/tests/runner.py +++ b/tests/runner.py @@ -261,9 +261,10 @@ process(sys.argv[1]) if cache and self.library_cache.get(cache_name): print >> sys.stderr, '<load build from cache> ', generated_libs = [] - for bc_file in self.library_cache[cache_name]: + for basename in self.library_cache[cache_name]: + bc_file = os.path.join(build_dir, basename) f = open(bc_file, 'wb') - f.write(self.library_cache[cache_name][bc_file]) + f.write(self.library_cache[cache_name][basename]) f.close() generated_libs.append(bc_file) return generated_libs @@ -4374,7 +4375,10 @@ def process(filename): del os.environ['EMCC_LEAVE_INPUTS_RAW'] def get_build_dir(self): - return os.path.join(self.get_dir(), 'building') + ret = os.path.join(self.get_dir(), 'building') + if not os.path.exists(ret): + os.makedirs(ret) + return ret def get_freetype(self): Settings.INIT_STACK = 1 # TODO: Investigate why this is necessary diff --git a/tools/shared.py b/tools/shared.py index ba953e19..9882cd7f 100644 --- a/tools/shared.py +++ b/tools/shared.py @@ -454,7 +454,8 @@ set(CMAKE_FIND_ROOT_PATH_MODE_PACKAGE ONLY)''' \ if cache is not None: cache[cache_name] = {} for f in generated_libs: - cache[cache_name][f] = open(f, 'rb').read() + basename = os.path.basename(f) + cache[cache_name][basename] = open(f, 'rb').read() if old_dir: os.chdir(old_dir) return generated_libs |