Support for bundling Chromium unittests into a tarball.

blimp/tools/bundle.py

 #!/usr/bin/env python
 # Copyright 2015 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.
 
-'''Bundles the Blimp Engine and its runtime dependencies into a tarball.
+'''Bundles the Blimp target and its runtime dependencies into a tarball.
 
    The created bundle can be passed as input to docker build.  E.g.
    docker build - < ../../out-linux/Debug/blimp_engine_deps.tar.gz
 '''
 
 
 import argparse
 import os
 import subprocess
 import sys
@@ skipping 16 matching lines @@
   parser = argparse.ArgumentParser(description=__doc__)
   parser.add_argument('--build-dir',
                       help=('build output directory (e.g. out/Debug)'),
                       required=True,
                       metavar='DIR')
   parser.add_argument('--dockerfile',
                       help=('Dockerfile to add to the bundle'),
                       required=True,
                       metavar='FILE')
   parser.add_argument('--startup-script',
-                      help=('Engine startup script to add to the bundle'),
-                      required=True,
+                      help=('startup script to add to the bundle'),

[maniscalco, 2016/06/02 19:15:55]

Consider mentioning that this script is optional in the help text.

[Jess, 2016/06/02 23:02:15]

Done.

+                      required=False,
                       metavar='FILE')
   parser.add_argument('--manifest',
-                      help=('engine manifest'),
+                      help=('manifest for bundle'),
                       required=True)
   parser.add_argument('--output',
                       help=('name and path of bundle to create'),
                       required=True,
                       metavar='FILE')
   args = parser.parse_args()
 
   deps = ReadDependencies(args.manifest)
 
   dockerfile_dirname, dockerfile_basename = os.path.split(args.dockerfile)
-  startup_script_dirname, startup_script_basename = os.path.split(
-      args.startup_script)
+  if args.startup_script:
+    startup_script_dirname, startup_script_basename = os.path.split(
+        args.startup_script)
 
   try:
     env = os.environ.copy()
     # Use fastest possible mode when gzipping.
     env["GZIP"] = "-1"
+    subprocess_args = [
+        "tar",
+        "-zcf", args.output,
+        # Ensure tarball content group permissions are appropriately set for
+        # use as part of a "docker build". That is group readable with
+        # executable files also being group executable.
+        "--mode=g+rX",
+        "-C", dockerfile_dirname, dockerfile_basename,
+        "-C", args.build_dir] + deps
+    if args.startup_script:
+      startup_script_dirname, startup_script_basename = os.path.split(
+          args.startup_script)
+      subprocess_args.extend(
+          ["-C", startup_script_dirname, startup_script_basename])
     subprocess.check_output(
-        ["tar",
-         "-zcf", args.output,
-         # Ensure tarball content group permissions are appropriately set for
-         # use as part of a "docker build". That is group readable with
-         # executable files also being group executable.
-         "--mode=g+rX",
-         "-C", dockerfile_dirname, dockerfile_basename,
-         "-C", startup_script_dirname, startup_script_basename,
-         "-C", args.build_dir] + deps,
+        subprocess_args,
         # Redirect stderr to stdout, so that its output is captured.
         stderr=subprocess.STDOUT,
         env=env)
   except subprocess.CalledProcessError as e:
     print >> sys.stderr, "Failed to create tarball:"
     print >> sys.stderr, e.output
     sys.exit(1)
 
 if __name__ == "__main__":
   main()