Test runner: Send SVN revision instead of git commit hash in work packet

tools/testrunner/network/network_execution.py

 # 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
@@ skipping 49 matching lines @@
       for t in s.tests:
         t.duration = self.perfdata.FetchPerfData(t) or 1.0
       num_tests += len(s.tests)
     self._CommonInit(num_tests, progress_indicator, context)
     self.tests = []  # Only used if we need to fall back to local execution.
     self.tests_lock = threading.Lock()
     self.peers = peers
     self.pubkey_fingerprint = None  # Fetched later.
     self.base_rev = subprocess.check_output(
         "cd %s; git log -1 --format=%%H --grep=git-svn-id" % workspace,
-        shell=True)
+        shell=True).strip()
+    self.base_svn_rev = subprocess.check_output(
+        "cd %s; git log -1 %s"          # Get commit description.
+        " | grep -e '^\s*git-svn-id:'"  # Extract "git-svn-id" line.
+        " | awk '{print $2}'"           # Extract "repository@revision" part.
+        " | sed -e 's/.*@//'" % # Strip away "repository@".

[Michael Starzinger, 2012/10/01 08:59:22]

You could indent the more to match it up with the others.

[Jakob Kummerow, 2012/10/01 09:05:08]

Done.

+        (workspace, self.base_rev), shell=True).strip()
     self.patch = subprocess.check_output(
         "cd %s; git diff %s" % (workspace, self.base_rev), shell=True)
     self.binaries = {}
     self.initialization_lock = threading.Lock()
     self.initialization_lock.acquire()  # Released when init is done.
     self._OpenLocalConnection()
     self.local_receiver_thread = threading.Thread(
         target=self._ListenLocalConnection)
     self.local_receiver_thread.daemon = True
     self.local_receiver_thread.start()
@@ skipping 80 matching lines @@
 
   def _TalkToPeer(self, peer):
     sock = socket.socket(socket.AF_INET, socket.SOCK_STREAM)
     sock.settimeout(self.context.timeout + 10)
     code = sock.connect_ex((peer.address, constants.PEER_PORT))
     if code == 0:
       try:
         peer.runtime = None
         start_time = time.time()
         packet = workpacket.WorkPacket(peer=peer, context=self.context,
-                                       base_revision=self.base_rev,
+                                       base_revision=self.base_svn_rev,
                                        patch=self.patch,
                                        pubkey=self.pubkey_fingerprint)
         data, test_map = packet.Pack(self.binaries)
         compression.Send(data, sock)
         compression.Send(constants.END_OF_STREAM, sock)
         rec = compression.Receiver(sock)
         while not rec.IsDone() and not self.terminate:
           data_list = rec.Current()
           for data in data_list:
             test_id = data[0]
@@ skipping 52 matching lines @@
       total_work += p.assigned_work
     for p in self.peers:
       p.assigned_work /= total_work
       p.runtime /= total_runtime
       perf_correction = p.assigned_work / p.runtime
       old_perf = p.relative_performance
       p.relative_performance = (old_perf + perf_correction) / 2.0
       compression.Send([constants.UPDATE_PERF, p.address,
                         p.relative_performance],
                        self.local_socket)