summaryrefslogtreecommitdiff
path: root/java/robolectric.go
diff options
context:
space:
mode:
author Colin Cross <ccross@android.com> 2019-05-31 03:11:22 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> 2019-05-31 03:11:22 +0000
commit76acdadaf747a7c9a54a38e9739f7d573d48c294 (patch)
treebab2f5411e3e4c2a7a14333cf9e450a4707f27a5 /java/robolectric.go
parenta81760510df18c4dd01b0a1061b51e4003fec94e (diff)
parent2f9a7c8ab0c2495d8c84c48e1838b2abbcbb2cbb (diff)
Merge "Make test_options.timeout an int64"
Diffstat (limited to 'java/robolectric.go')
-rw-r--r--java/robolectric.go2
1 files changed, 1 insertions, 1 deletions
diff --git a/java/robolectric.go b/java/robolectric.go
index 26f1e9d1d..b87ee0d6d 100644
--- a/java/robolectric.go
+++ b/java/robolectric.go
@@ -39,7 +39,7 @@ type robolectricProperties struct {
Test_options struct {
// Timeout in seconds when running the tests.
- Timeout *string
+ Timeout *int64
}
}