fix file preloading with -o subdir/..

2 files changed, 11 insertions, 1 deletions

diff --git a/tests/runner.py b/tests/runner.py
index 39091474..d859bfe1 100755
--- a/tests/runner.py
+++ b/tests/runner.py
@@ -7655,6 +7655,16 @@ elif 'browser' in str(sys.argv):
       Popen(['python', EMCC, os.path.join(self.get_dir(), 'main.cpp'), '--preload-file', os.path.join(self.get_dir(), 'somefile.txt'), '-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/..
+
+      make_main(os.path.join(self.get_dir(), 'somefile.txt'))
+      try:
+        os.mkdir(os.path.join(self.get_dir(), 'dirrey'))
+      except:
+        pass
+      Popen(['python', EMCC, os.path.join(self.get_dir(), 'main.cpp'), '--preload-file', os.path.join(self.get_dir(), 'somefile.txt'), '-o', 'dirrey/page.html']).communicate()
+      self.run_browser('dirrey/page.html', 'You should see |load me right before|.', '/report_result?1')
+
       # With FS.preloadFile
 
       open(os.path.join(self.get_dir(), 'pre.js'), 'w').write('''
diff --git a/tools/file_packager.py b/tools/file_packager.py
index a8448256..e3260d3b 100644
--- a/tools/file_packager.py
+++ b/tools/file_packager.py
@@ -320,7 +320,7 @@ if has_preloaded:
     Module['addRunDependency']('datafile');
     dataFile.send(null);
     if (Module['setStatus']) Module['setStatus']('Downloading...');
-  ''' % (Compression.compressed_name(data_target) if Compression.on else data_target, use_data)
+  ''' % (os.path.basename(Compression.compressed_name(data_target) if Compression.on else data_target), use_data) # use basename because from the browser's point of view, we need to find the datafile in the same dir as the html file
 
 if pre_run:
   print '''