diff options
| author | Pyry Haulos <phaulos@google.com> | 2016-12-02 15:51:18 -0800 |
|---|---|---|
| committer | Pyry Haulos <phaulos@google.com> | 2016-12-02 15:51:18 -0800 |
| commit | da92baa85193d4c4ca4f5227bbc2e5b881ec9d65 (patch) | |
| tree | c238a2adcb9ff6587925cdbc0fb18d9cdb8191f9 /android | |
| parent | 1ae36a6b377fb327f54b25d2cd9bad92e01396bc (diff) | |
| parent | abc4587f284acdb9baeb92e697855fd729918f79 (diff) | |
| download | VK-GL-CTS-da92baa85193d4c4ca4f5227bbc2e5b881ec9d65.tar.gz VK-GL-CTS-da92baa85193d4c4ca4f5227bbc2e5b881ec9d65.tar.bz2 VK-GL-CTS-da92baa85193d4c4ca4f5227bbc2e5b881ec9d65.zip | |
Merge gerrit/vulkan-cts-1.0-dev into gerrit/vulkan-cts-next-dev
Change-Id: I85d04d8e037a3e9826d312d4df40df176d7735cf
Diffstat (limited to 'android')
| -rw-r--r-- | android/cts/runner/src/com/drawelements/deqp/runner/DeqpTestRunner.java | 4 | ||||
| -rw-r--r-- | android/scripts/common.py | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/android/cts/runner/src/com/drawelements/deqp/runner/DeqpTestRunner.java b/android/cts/runner/src/com/drawelements/deqp/runner/DeqpTestRunner.java index ca8de1cd1..cbcec167c 100644 --- a/android/cts/runner/src/com/drawelements/deqp/runner/DeqpTestRunner.java +++ b/android/cts/runner/src/com/drawelements/deqp/runner/DeqpTestRunner.java @@ -2031,7 +2031,7 @@ public class DeqpTestRunner implements IBuildReceiver, IDeviceTest, } mRemainingTests = new LinkedList<>(mTestInstances.keySet()); - + long startTime = System.currentTimeMillis(); listener.testRunStarted(getId(), mRemainingTests.size()); try { @@ -2062,7 +2062,7 @@ public class DeqpTestRunner implements IBuildReceiver, IDeviceTest, uninstallTestApk(); } - listener.testRunEnded(0, emptyMap); + listener.testRunEnded(System.currentTimeMillis() - startTime, emptyMap); } /** diff --git a/android/scripts/common.py b/android/scripts/common.py index 7940f4a95..16b527684 100644 --- a/android/scripts/common.py +++ b/android/scripts/common.py @@ -173,7 +173,7 @@ def getDevices (adb): if proc.returncode != 0: raise Exception("adb devices -l failed, got %d" % proc.returncode) - ptrn = re.compile(r'^([a-zA-Z0-9]+)\s+.*product:([^\s]+)\s+model:([^\s]+)\s+device:([^\s]+)') + ptrn = re.compile(r'^([a-zA-Z0-9:]+)\s+.*product:([^\s]+)\s+model:([^\s]+)\s+device:([^\s]+)') devices = [] for line in stdout.splitlines()[1:]: if len(line.strip()) == 0: |