diff options
author | Flu0r1ne <flur01ne@flu0r1ne.net> | 2021-09-03 00:51:47 -0500 |
---|---|---|
committer | Flu0r1ne <flur01ne@flu0r1ne.net> | 2021-09-03 00:51:47 -0500 |
commit | 0e6b7378a564bb51b3a4289059e80fe9e3c6545b (patch) | |
tree | 9cde120cfc7a7acea9c685f15601dd41d42bd9f1 /adapters | |
parent | 287d029975b7718109f81b480079f375f7d8700a (diff) | |
download | planr-0e6b7378a564bb51b3a4289059e80fe9e3c6545b.tar.xz planr-0e6b7378a564bb51b3a4289059e80fe9e3c6545b.zip |
BUG: Fix decoding when no defaults is present
Diffstat (limited to 'adapters')
-rw-r--r-- | adapters/gtest/config.go | 11 |
1 files changed, 11 insertions, 0 deletions
diff --git a/adapters/gtest/config.go b/adapters/gtest/config.go index 4105932..457eb64 100644 --- a/adapters/gtest/config.go +++ b/adapters/gtest/config.go @@ -8,11 +8,16 @@ import ( "path" ) +const ( + DEFAULT_TIMEOUT = 1000 +) + type GtestDefaults struct { Name *string Suite *string Testfile *string Srcs *[]string + Timeout *uint } func (child *GtestDefaults) Inherit(p interface{}) { @@ -22,6 +27,7 @@ func (child *GtestDefaults) Inherit(p interface{}) { if(child.Suite == nil) { child.Suite = parent.Suite } if(child.Testfile == nil) { child.Testfile = parent.Testfile } if(child.Srcs == nil) { child.Srcs = parent.Srcs } + if(child.Timeout == nil) { child.Timeout = parent.Timeout } } @@ -37,6 +43,11 @@ func (g GtestConfig) ensureSatisfied(path string) { } else if g.Testfile == nil { log.Fatalf("\"testfile\" is not defined for unit: %s\n", path) } + + if g.Timeout == nil { + g.Timeout = new(uint) + *g.Timeout = DEFAULT_TIMEOUT; + } } func (cfg GtestConfig) srcList(srcDir string) string { |