summaryrefslogtreecommitdiff
path: root/adapters
diff options
context:
space:
mode:
authorFlu0r1ne <flur01ne@flu0r1ne.net>2021-09-03 00:02:31 -0500
committerFlu0r1ne <flur01ne@flu0r1ne.net>2021-09-03 00:02:31 -0500
commit287d029975b7718109f81b480079f375f7d8700a (patch)
tree2324f902ebc59ffda5afa2e7506e3fa0ac9b51b3 /adapters
parentd078f6dc10eb265a5d88cd96adf86173d6d3ba2e (diff)
downloaddeb-planr-287d029975b7718109f81b480079f375f7d8700a.tar.xz
deb-planr-287d029975b7718109f81b480079f375f7d8700a.zip
Add clean option and fix issue with dir propegation
Diffstat (limited to 'adapters')
-rw-r--r--adapters/gtest/adapter.go4
-rw-r--r--adapters/gtest/config.go4
2 files changed, 2 insertions, 6 deletions
diff --git a/adapters/gtest/adapter.go b/adapters/gtest/adapter.go
index 9331cf7..415d823 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 4f8735f..4105932 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 }
}