Merge "Make test_options.timeout an int64" am: 76acdadaf7

am: acb00184c3 Change-Id: Id7a50b086ce755877e2656c98b5be8896b456bfd
2019-05-30 20:24:06 -07:00
parent 63db3256d3 acb00184c3
commit 7e5bf1cc8c
1 changed files with 1 additions and 1 deletions
--- a/java/robolectric.go
+++ b/java/robolectric.go
@@ -46,7 +46,7 @@ type robolectricProperties struct {

 	Test_options struct {
 		// Timeout in seconds when running the tests.
-		Timeout *string
+		Timeout *int64
 	}
 }