Merge branch 'sm-worker-package-fetch' of github.com:seanmorris/emscripten into sm-worker-package-fetch

Author: seanmorris

src/library_ccall.js

@@ -32,7 +32,6 @@ addToLibrary({
       'string': (str) => {
         var ret = 0;
         if (str !== null && str !== undefined && str !== 0) { // null string
-          // at most 4 bytes per UTF-8 code point, +1 for the trailing '\0'
           ret = stringToUTF8OnStack(str);
         }
         return {{{ to64('ret') }}};

test/other/codesize/test_codesize_cxx_lto.size

@@ -1 +1 @@
-122623
+122625

test/other/codesize/test_codesize_cxx_mangle.size

@@ -1 +1 @@
-232930
+232924

test/other/codesize/test_codesize_minimal_pthreads.size

@@ -1 +1 @@
-19421
+19416

test/freetype_test.c renamed to test/test_freetype.c

@@ -94,7 +94,7 @@ main( int     argc,
   int           target_height;
   int           n, num_chars;
 
-  filename      = "LiberationSansBold.ttf";                          
+  filename      = "LiberationSansBold.ttf";
   text          = "w";
   num_chars     = strlen( text );
   WIDTH         = 16;
@@ -143,6 +143,5 @@ main( int     argc,
   FT_Done_Face    ( face );
   FT_Done_FreeType( library );
 
-  
   return 0;
 }

test/test_freetype.out

@@ -0,0 +1,16 @@
+                
+                
+                
+                
+***    +***+    
+***+   *****   +
++**+   *****   +
++***  +**+**+  *
+ ***+ ***+**+ +*
+ +**+ *** *** +*
+ +**++**+ +**+**
+  ***+**+ +**+**
+  ******   *****
+  +****+   +****
+  +****+   +****
+   ****     ****

test/test_other.py

@@ -2487,34 +2487,17 @@ def test_freetype(self):
     # copy the Liberation Sans Bold truetype file located in the
     # <emscripten_root>/test/freetype to the compilation folder
     shutil.copy2(test_file('freetype/LiberationSansBold.ttf'), os.getcwd())
+    self.emcc_args += ['--embed-file', 'LiberationSansBold.ttf']
     # the test program will print an ascii representation of a bitmap where the
-    # 'w' character has been rendered using the Liberation Sans Bold font
-    expectedOutput = '                \n' + \
-                     '                \n' + \
-                     '                \n' + \
-                     '                \n' + \
-                     '***    +***+    \n' + \
-                     '***+   *****   +\n' + \
-                     '+**+   *****   +\n' + \
-                     '+***  +**+**+  *\n' + \
-                     ' ***+ ***+**+ +*\n' + \
-                     ' +**+ *** *** +*\n' + \
-                     ' +**++**+ +**+**\n' + \
-                     '  ***+**+ +**+**\n' + \
-                     '  ******   *****\n' + \
-                     '  +****+   +****\n' + \
-                     '  +****+   +****\n' + \
-                     '   ****     ****'
-    # build test program with the font file embed in it
-    self.do_runf('freetype_test.c', expectedOutput,
-                 emcc_args=['-sUSE_FREETYPE', '--embed-file', 'LiberationSansBold.ttf'])
-    self.do_runf('freetype_test.c', expectedOutput,
-                 emcc_args=['--use-port=freetype', '--embed-file', 'LiberationSansBold.ttf'])
+    # 'w' character has been rendered using the Liberation Sans Bold font.
+    # See test_freetype.out
+    self.do_run_in_out_file_test('test_freetype.c', emcc_args=['-sUSE_FREETYPE'])
+    self.do_run_in_out_file_test('test_freetype.c', emcc_args=['--use-port=freetype'])
 
   @requires_network
   def test_freetype_with_pthreads(self):
     # Verify that freetype supports compilation requiring pthreads
-    self.emcc(test_file('freetype_test.c'), ['-pthread', '-sUSE_FREETYPE'], output_filename='a.out.js')
+    self.emcc(test_file('test_freetype.c'), ['-pthread', '-sUSE_FREETYPE'], output_filename='a.out.js')
 
   @requires_network
   def test_icu(self):