Return specific files, not just those in $(ISOLATED_OUTDIR)

appengine/swarming/swarming_bot/bot_code/task_runner.py

 # Copyright 2013 The LUCI Authors. All rights reserved.
 # Use of this source code is governed under the Apache License, Version 2.0
 # that can be found in the LICENSE file.
 
 """Runs a Swarming task.
 
 Downloads all the necessary files to run the task, executes the command and
 streams results back to the Swarming server.
 
 The process exit code is 0 when the task was executed, even if the task itself
@@ skipping 98 matching lines @@
           ])
 
   # Named caches options.
   # Specify --named-cache-root unconditionally so run_isolated.py never creates
   # "named_caches" dir and always operats in "c" dir.
   cmd.extend(['--named-cache-root', os.path.join(bot_dir, 'c')])
   if task_details.caches:
     for c in task_details.caches:
       cmd.extend(['--named-cache', c['name'], c['path']])
 
+  # Expected output files:
+  for output in task_details.outputs:
+    cmd.extend(['--output', output])
+
   # CIPD options.
   if task_details.cipd_input and task_details.cipd_input.get('packages'):
     for pkg in task_details.cipd_input.get('packages'):
       cmd.extend([
         '--cipd-package',
         '%s:%s:%s' % (pkg['path'], pkg['package_name'], pkg['version'])])
     cmd.extend(
         [
           '--cipd-cache', os.path.join(bot_dir, 'cipd_cache'),
           '--cipd-client-package',
@@ skipping 53 matching lines @@
 
     self.caches = data.get('caches')
 
     self.env = {
       k.encode('utf-8'): v.encode('utf-8') for k, v in data['env'].iteritems()
     }
     self.grace_period = data['grace_period']
     self.hard_timeout = data['hard_timeout']
     self.io_timeout = data['io_timeout']
     self.task_id = data['task_id']
+    self.outputs = data.get('outputs', [])
 
   @staticmethod
   def load(path):
     """Loads the TaskDetails from a file on disk (specified via --in-file).
 
     Raises InternalError if the file can't be read or parsed.
     """
     try:
       with open(path, 'rb') as f:
         return TaskDetails(json.load(f))
@@ skipping 456 matching lines @@
     options.start = now
 
   try:
     load_and_run(
         options.in_file, options.swarming_server, options.cost_usd_hour,
         options.start, options.out_file, options.min_free_space,
         options.bot_file, options.auth_params_file)
     return 0
   finally:
     logging.info('quitting')