Fixed extraction of emulated devices name

build/android/adb_logcat_printer.py

 #!/usr/bin/env python
 #
 # Copyright (c) 2012 The Chromium Authors. All rights reserved.
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
 """Shutdown adb_logcat_monitor and print accumulated logs.
 
 To test, call './adb_logcat_printer.py <base_dir>' where
 <base_dir> contains 'adb logcat -v threadtime' files named as
@@ skipping 60 matching lines @@
 
 def FindLogFiles(base_dir):
   """Search a directory for logcat files.
 
   Args:
     base_dir: directory to search
 
   Returns:
     Mapping of device_id to a sorted list of file paths for a given device
   """
-  logcat_filter = re.compile(r'^logcat_(\w+)_(\d+)$')
+  logcat_filter = re.compile(r'^logcat_(\S+)_(\d+)$')
   # list of tuples (<device_id>, <seq num>, <full file path>)
   filtered_list = []
   for cur_file in os.listdir(base_dir):
     matcher = logcat_filter.match(cur_file)
     if matcher:
       filtered_list += [(matcher.group(1), int(matcher.group(2)),
                          os.path.join(base_dir, cur_file))]
   filtered_list.sort()
   file_map = {}
   for device_id, _, cur_file in filtered_list:
@@ skipping 112 matching lines @@
   except:
     logger.exception('Unexpected exception')
 
   logger.info('Done.')
   sh.flush()
   output_file.write('\nLogcat Printer Event Log\n')
   output_file.write(log_stringio.getvalue())
 
 if __name__ == '__main__':
   sys.exit(main(sys.argv[1:]))