diff options
| author | Furkan Sahin <furkan-dev@proton.me> | 2021-09-03 00:02:31 -0500 |
|---|---|---|
| committer | Furkan Sahin <furkan-dev@proton.me> | 2021-09-03 00:02:31 -0500 |
| commit | 571abf917bb3a6aa7ac7dd40969ed59ce84d78db (patch) | |
| tree | e148102ade519928ede6552724955cf7696f8afa /adapters/gtest | |
| parent | 2af7117891cdb67758219a7075f39c05dc02f3f5 (diff) | |
Add clean option and fix issue with dir propegation
Diffstat (limited to 'adapters/gtest')
| -rw-r--r-- | adapters/gtest/adapter.go | 4 | ||||
| -rw-r--r-- | adapters/gtest/config.go | 4 |
2 files changed, 2 insertions, 6 deletions
diff --git a/adapters/gtest/adapter.go b/adapters/gtest/adapter.go index f91a524..29e2df7 100644 --- a/adapters/gtest/adapter.go +++ b/adapters/gtest/adapter.go @@ -19,8 +19,8 @@ const GTEST_CMAKE = "CMakeLists.txt" func makeUnit(tc *planr.TestCase, dirs planr.DirConfig) cmakeUnit { cfg := tc.AdapterConfig().(*GtestConfig) - testpath := path.Join(dirs.TestsDir(), *cfg.Testfile) - srclist := cfg.srcList(dirs.SrcDir()) + testpath := path.Join(dirs.Tests(), *cfg.Testfile) + srclist := cfg.srcList(dirs.Src()) return cmakeUnit { tc.Cname, diff --git a/adapters/gtest/config.go b/adapters/gtest/config.go index bf5c9f2..173809d 100644 --- a/adapters/gtest/config.go +++ b/adapters/gtest/config.go @@ -12,9 +12,7 @@ type GtestDefaults struct { Name *string Suite *string Testfile *string - Test_root *string Srcs *[]string - Srcs_root *string } func (child *GtestDefaults) Inherit(p interface{}) { @@ -23,9 +21,7 @@ func (child *GtestDefaults) Inherit(p interface{}) { if(child.Name == nil) { child.Name = parent.Name } if(child.Suite == nil) { child.Suite = parent.Suite } if(child.Testfile == nil) { child.Testfile = parent.Testfile } - if(child.Test_root == nil) { child.Test_root = parent.Test_root } if(child.Srcs == nil) { child.Srcs = parent.Srcs } - if(child.Srcs_root == nil) { child.Srcs_root = parent.Srcs_root } } |