Test runner: More fixes.

tools/test-server.py

 #!/usr/bin/env python
 #
 # 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
@@ skipping 106 matching lines @@
     path = ("http://v8.googlecode.com/svn/branches/bleeding_edge/"
             "tools/testrunner")
     _Cmd("svn checkout --force %s %s" % (path, testrunner_dir))
 
   # Update this very script.
   path = ("http://v8.googlecode.com/svn/branches/bleeding_edge/"
           "tools/test-server.py")
   scriptname = os.path.abspath(sys.argv[0])
   _Cmd("svn cat %s > %s" % (path, scriptname))
 
+  # The testcfg.py files currently need to be able to import the old test.py
+  # script, so we temporarily need to make that available.
+  # TODO(jkummerow): Remove this when removing test.py.
+  for filename in ("test.py", "utils.py"):
+    url = ("http://v8.googlecode.com/svn/branches/bleeding_edge/"
+           "tools/%s" % filename)
+    filepath = os.path.join(os.path.dirname(scriptname), filename)
+    _Cmd("svn cat %s > %s" % (url, filepath))
+
   # Check out or update V8.
   v8_dir = os.path.join(ROOT, "v8")
   if os.path.exists(v8_dir):
     _Cmd("cd %s; git fetch" % v8_dir)
   else:
     _Cmd("git clone git://github.com/v8/v8.git %s" % v8_dir)
 
   print("Finished.")
 
 
@@ skipping 69 matching lines @@
       print("Added certificate %s to trusted certificates." % response)
     else:
       print("Unknown command")
       _PrintUsage()
       sys.exit(2)
   else:
     print("Unknown command")
     _PrintUsage()
     sys.exit(2)
   sys.exit(0)