aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAlon Zakai <alonzakai@gmail.com>2013-12-20 20:59:10 -0800
committerAlon Zakai <alonzakai@gmail.com>2013-12-20 20:59:10 -0800
commitc8263b3d8970d25a046d434811c4a44e9b3f28f0 (patch)
treed7915a4f82709a04783c70cfd763763e29d88afd
parent058910ca694fde4cf8c104819e8afc966b11507c (diff)
update browser.test_preload_file
-rw-r--r--tests/test_browser.py3
1 files changed, 2 insertions, 1 deletions
diff --git a/tests/test_browser.py b/tests/test_browser.py
index 46645608..920c6f8c 100644
--- a/tests/test_browser.py
+++ b/tests/test_browser.py
@@ -409,6 +409,7 @@ If manually bisecting:
self.run_browser('page.html', 'You should see |load me right before|.', '/report_result?1')
# Test subdirectory handling with asset packaging.
+ try_delete(self.in_dir('assets'))
os.makedirs(os.path.join(self.get_dir(), 'assets/sub/asset1/').replace('\\', '/'))
os.makedirs(os.path.join(self.get_dir(), 'assets/sub/asset1/.git').replace('\\', '/')) # Test adding directory that shouldn't exist.
os.makedirs(os.path.join(self.get_dir(), 'assets/sub/asset2/').replace('\\', '/'))
@@ -459,7 +460,7 @@ If manually bisecting:
(srcpath, dstpath1, dstpath2, nonexistingpath) = test
make_main_two_files(dstpath1, dstpath2, nonexistingpath)
print srcpath
- Popen([PYTHON, EMCC, os.path.join(self.get_dir(), 'main.cpp'), '--preload-file', srcpath, '-o', 'page.html']).communicate()
+ Popen([PYTHON, EMCC, os.path.join(self.get_dir(), 'main.cpp'), '--preload-file', srcpath, '--exclude-file', '*/.*', '-o', 'page.html']).communicate()
self.run_browser('page.html', 'You should see |load me right before|.', '/report_result?1')
# Should still work with -o subdir/..