Index: tools/testrunner/network/network_execution.py |
diff --git a/tools/testrunner/network/network_execution.py b/tools/testrunner/network/network_execution.py |
index 2f33d353b1908b68014437ce24f4f1a99eac4073..a6bd47b5744d22def855b7623cafdcaea9977bb3 100644 |
--- a/tools/testrunner/network/network_execution.py |
+++ b/tools/testrunner/network/network_execution.py |
@@ -67,7 +67,13 @@ class NetworkedRunner(execution.Runner): |
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
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 = {} |
@@ -168,7 +174,7 @@ class NetworkedRunner(execution.Runner): |
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) |