Prepare for using GYP build on buildbots

tools/test-wrapper-gypbuild.py

 #!/usr/bin/env python
 #
-# Copyright 2011 the V8 project authors. All rights reserved.
+# Copyright 2012 the V8 project authors. All rights reserved.
 # Redistribution and use in source and binary forms, with or without
 # modification, are permitted provided that the following conditions are
 # met:
 #
 #     * Redistributions of source code must retain the above copyright
 #       notice, this list of conditions and the following disclaimer.
 #     * Redistributions in binary form must reproduce the above
 #       copyright notice, this list of conditions and the following
 #       disclaimer in the documentation and/or other materials provided
 #       with the distribution.
@@ skipping 35 matching lines @@
   # Flags specific to this wrapper script:
   result.add_option("--arch-and-mode",
                     help='Architecture and mode in the format "arch.mode"',
                     default=None)
   result.add_option("--outdir",
                     help='Base output directory',
                     default='out')
   result.add_option("--no-presubmit",
                     help='Skip presubmit checks',
                     default=False, action="store_true")
+  result.add_option("--buildbot",
+                    help='Adapt to path structure used on buildbots',
+                    default=False, action="store_true")
 
   # Flags this wrapper script handles itself:
   result.add_option("-m", "--mode",
                     help="The test modes in which to run (comma-separated)",
                     default='release,debug')
   result.add_option("--arch",
                     help='The architectures to run tests for (comma-separated)',
                     default='ia32,x64,arm')
 
   # Flags that are passed on to the wrapped test.py script:
@@ skipping 68 matching lines @@
     options.arch = []
     options.mode = []
   else:
     if options.arch_and_mode != None and options.arch_and_mode != "":
       tokens = options.arch_and_mode.split(".")
       options.arch = tokens[0]
       options.mode = tokens[1]
     options.mode = options.mode.split(',')
     options.arch = options.arch.split(',')
   for mode in options.mode:
-    if not mode in ['debug', 'release']:
+    if not mode.lower() in ['debug', 'release']:
       print "Unknown mode %s" % mode
       return False
   for arch in options.arch:
     if not arch in ['ia32', 'x64', 'arm', 'mips']:
       print "Unknown architecture %s" % arch
       return False
-
+  if options.buildbot:
+    # Buildbots run presubmit tests as a separate step.
+    options.no_presubmit = True
   return True
 
 
 def PassOnOptions(options):
   result = []
   if options.verbose:
     result += ['--verbose']
   if options.progress != 'mono':
     result += ['--progress=' + options.progress]
   if options.report:
@@ skipping 41 matching lines @@
 
 
 def Main():
   parser = BuildOptions()
   (options, args) = parser.parse_args()
   if not ProcessOptions(options):
     parser.print_help()
     return 1
 
   workspace = abspath(join(dirname(sys.argv[0]), '..'))
+  returncodes = 0
 
   if not options.no_presubmit:
     print ">>> running presubmit tests"
-    subprocess.call([workspace + '/tools/presubmit.py'])
+    returncodes += subprocess.call([workspace + '/tools/presubmit.py'])
 
   args_for_children = [workspace + '/tools/test.py'] + PassOnOptions(options)
   args_for_children += ['--no-build', '--build-system=gyp']
   for arg in args:
     args_for_children += [arg]
-  returncodes = 0
   env = os.environ
 
   for mode in options.mode:
     for arch in options.arch:
       print ">>> running tests for %s.%s" % (arch, mode)
-      shellpath = workspace + '/' + options.outdir + '/' + arch + '.' + mode
+      if options.buildbot:
+        shellpath = workspace + '/' + options.outdir + '/' + mode
+        mode = mode.lower()
+      else:
+        shellpath = workspace + '/' + options.outdir + '/' + arch + '.' + mode
       env['LD_LIBRARY_PATH'] = shellpath + '/lib.target'
       shell = shellpath + "/d8"
       child = subprocess.Popen(' '.join(args_for_children +
                                         ['--arch=' + arch] +
                                         ['--mode=' + mode] +
                                         ['--shell=' + shell]),
                                shell=True,
                                cwd=workspace,
                                env=env)
       returncodes += child.wait()
 
   if len(options.mode) == 0 and len(options.arch) == 0:
     print ">>> running tests"
     shellpath = workspace + '/' + options.outdir
     env['LD_LIBRARY_PATH'] = shellpath + '/lib.target'
     shell = shellpath + '/d8'
     child = subprocess.Popen(' '.join(args_for_children +
                                       ['--shell=' + shell]),
                              shell=True,
                              cwd=workspace,
                              env=env)
     returncodes = child.wait()
 
   return returncodes
 
 
 if __name__ == '__main__':
   sys.exit(Main())