Revert of Fix sbox_validation_tests & Make isolate_driver.py include the executable itself

tools/isolate_driver.py

 #!/usr/bin/env python
 # Copyright 2014 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.
 
 """Adaptor script called through build/isolate.gypi.
 
 Creates a wrapping .isolate which 'includes' the original one, that can be
 consumed by tools/swarming_client/isolate.py. Path variables are determined
 based on the current working directory. The relative_cwd in the .isolated file
@@ skipping 100 matching lines @@
 
   Ignores many rules that are assumed to not depend on a dynamic library. If
   the assumption doesn't hold true anymore for a file format, remove it from
   this list. This is simply an optimization.
   """
   # *.json is ignored below, *.isolated.gen.json is an exception, it is produced
   # by isolate_driver.py in 'test_isolation_mode==prepare'.
   if item.endswith('.isolated.gen.json'):
     return True
   IGNORED = (
-    '.a', '.cc', '.css', '.dat', '.def', '.frag', '.h', '.html', '.isolate',
-    '.js', '.json', '.manifest', '.o', '.obj', '.pak', '.png', '.pdb', '.py',
-    '.strings', '.test', '.txt', '.vert',
+    '.a', '.cc', '.css', '.def', '.frag', '.h', '.html', '.js', '.json',
+    '.manifest', '.o', '.obj', '.pak', '.png', '.pdb', '.strings', '.test',
+    '.txt', '.vert',
   )
   # ninja files use native path format.
   ext = os.path.splitext(item)[1]
   if ext in IGNORED:
     return False
   # Special case Windows, keep .dll.lib but discard .lib.
   if item.endswith('.dll.lib'):
     return True
   if ext == '.lib':
     return False
@@ skipping 39 matching lines @@
       # Remove only the suffix .TOC, not the .so!
       return i[:-4]
     if i.endswith('.dylib.TOC'):
       # Remove only the suffix .TOC, not the .dylib!
       return i[:-4]
     if i.endswith('.dll.lib'):
       # Remove only the suffix .lib, not the .dll!
       return i[:-4]
     return i
 
-  def is_exe(i):
+  def f(i):
     # This script is only for adding new binaries that are created as part of
     # the component build.
     ext = os.path.splitext(i)[1]
-    # On POSIX, executables have no extension.
-    if ext not in ('', '.dll', '.dylib', '.exe', '.nexe', '.so'):
+    if ext not in ['.dll', '.nexe', '.so', '.dylib']:
       return False
 
     # Check for execute access and strip directories. This gets rid of all the
     # phony rules.
     p = os.path.join(build_dir, i)
     return os.access(p, os.X_OK) and not os.path.isdir(p)
 
-  return filter(is_exe, map(filter_item, dependencies))
+  return filter(f, map(filter_item, dependencies))
 
 
 def create_wrapper(args, isolate_index, isolated_index):
   """Creates a wrapper .isolate that add dynamic libs.
 
   The original .isolate is not modified.
   """
   cwd = os.getcwd()
   isolate = args[isolate_index]
   # The code assumes the .isolate file is always specified path-less in cwd. Fix
@@ skipping 93 matching lines @@
 
   swarming_client = os.path.join(SRC_DIR, 'tools', 'swarming_client')
   sys.stdout.flush()
   result = subprocess.call(
       [sys.executable, os.path.join(swarming_client, 'isolate.py')] + args)
   return result
 
 
 if __name__ == '__main__':
   sys.exit(main())