summaryrefslogtreecommitdiff
path: root/ui
diff options
context:
space:
mode:
author Colin Cross <ccross@android.com> 2021-03-03 01:45:02 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> 2021-03-03 01:45:02 +0000
commitfdf28ca403a7f2c37edf1becb7c2e6e679a1235b (patch)
tree6e0d495374f5710b5b37045c88ac09cbfa6f3ee4 /ui
parent7d27bc5fcf83f32369f5170e9c80d00fcd00186f (diff)
parent6cb1128b541240a2320608e7bdf96a81621d1944 (diff)
Merge changes I3e6bc9b5,If9f8fb10
* changes: Disable TestSendLog on the buildbots Remove global state from VNDK apexes
Diffstat (limited to 'ui')
-rw-r--r--ui/build/paths/logs_test.go3
1 files changed, 3 insertions, 0 deletions
diff --git a/ui/build/paths/logs_test.go b/ui/build/paths/logs_test.go
index 3b1005fb5..067f3f3fe 100644
--- a/ui/build/paths/logs_test.go
+++ b/ui/build/paths/logs_test.go
@@ -26,6 +26,9 @@ import (
)
func TestSendLog(t *testing.T) {
+ if testing.Short() {
+ t.Skip("skipping in short mode, sometimes hangs")
+ }
t.Run("Short name", func(t *testing.T) {
d, err := ioutil.TempDir("", "s")
if err != nil {