fix some logging uses

emcc

@@ -1359,7 +1359,7 @@ try:
   if len(input_files) + len(extra_files_to_link) > 1 or \
      (not LEAVE_INPUTS_RAW and not (suffix(temp_files[0]) in BITCODE_SUFFIXES or suffix(temp_files[0]) in DYNAMICLIB_SUFFIXES) and shared.Building.is_ar(temp_files[0])):
     linker_inputs = temp_files + extra_files_to_link
-    logging.debug('linking: ', linker_inputs)
+    logging.debug('linking: ' + str(linker_inputs))
     t0 = time.time()
     shared.Building.link(linker_inputs, in_temp(target_basename + '.bc'))
     t1 = time.time()
@@ -1490,7 +1490,7 @@ try:
       if DEBUG != '2':
         if shared.Settings.ASM_JS:
           js_optimizer_queue = ['asm'] + js_optimizer_queue
-        logging.debug('applying js optimization passes:', js_optimizer_queue)
+        logging.debug('applying js optimization passes: %s', js_optimizer_queue)
         final = shared.Building.js_optimizer(final, js_optimizer_queue, jcache)
         if DEBUG: save_intermediate('js_opts')
       else:
@@ -1498,7 +1498,7 @@ try:
           passes = [name]
           if shared.Settings.ASM_JS:
             passes = ['asm'] + passes
-          logging.info('applying js optimization pass:', passes)
+          logging.info('applying js optimization pass: %s', passes)
           final = shared.Building.js_optimizer(final, passes, jcache)
           save_intermediate(name)
       js_optimizer_queue = []

tests/runner.py

@@ -13000,7 +13000,7 @@ elif 'sanity' in str(sys.argv):
           if 'LLVM_ROOT' not in settings:
             self.assertContained('Error in evaluating %s' % EM_CONFIG, output)
           elif 'runner.py' not in ' '.join(command):
-            self.assertContained('FATAL', output) # sanity check should fail
+            self.assertContained('CRITICAL', output) # sanity check should fail
 
     def test_closure_compiler(self):
       CLOSURE_FATAL = 'fatal: Closure compiler'

tools/shared.py

@@ -285,7 +285,7 @@ def check_node_version():
     logging.warning('node version appears too old (seeing "%s", expected "%s")' % (actual, 'v' + ('.'.join(map(str, EXPECTED_NODE_VERSION)))))
     return False
   except Exception, e:
-    logging.warning('cannot check node version:' + e)
+    logging.warning('cannot check node version: %s',  e)
     return False
 
 # Check that basic stuff we need (a JS engine to compile, Node.js, and Clang and LLVM)
@@ -925,7 +925,7 @@ set(CMAKE_FIND_ROOT_PATH_MODE_PACKAGE ONLY)''' % { 'winfix': '' if not WINDOWS e
 
     # Finish link
     actual_files = unique_ordered(actual_files) # tolerate people trying to link a.so a.so etc.
-    logging.debug('emcc: llvm-linking:', actual_files)
+    logging.debug('emcc: llvm-linking: %s', actual_files)
 
     # check for too-long command line
     link_cmd = [LLVM_LINK] + actual_files + ['-o', target]
@@ -979,7 +979,7 @@ set(CMAKE_FIND_ROOT_PATH_MODE_PACKAGE ONLY)''' % { 'winfix': '' if not WINDOWS e
     if type(opts) is int:
       opts = Building.pick_llvm_opts(opts)
     #opts += ['-debug-pass=Arguments']
-    logging.debug('emcc: LLVM opts:', opts)
+    logging.debug('emcc: LLVM opts: ' + str(opts))
     output = Popen([LLVM_OPT, filename] + opts + ['-o=' + filename + '.opt.bc'], stdout=PIPE).communicate()[0]
     assert os.path.exists(filename + '.opt.bc'), 'Failed to run llvm optimizations: ' + output
     shutil.move(filename + '.opt.bc', filename)