Make adapters and internals complient with new directory structure

3 files changed, 50 insertions, 50 deletions

diff --git a/adapters/gtest/adapter.go b/adapters/gtest/adapter.go
index f4fde27..9331cf7 100644
--- a/adapters/gtest/adapter.go
+++ b/adapters/gtest/adapter.go
@@ -11,55 +11,38 @@ import (
 	"path"
 	"sync"
 	"time"
-
 	"golang.flu0r1ne.net/planr"
 )
 
 const GTEST_CMAKE = "CMakeLists.txt"
 
-func mkUnit(tc *planr.TestCase) cmakeUnit {
+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())
+
   return cmakeUnit {
     tc.Cname,
-    cfg.joinTests(*cfg.Testfile),
-    cfg.srcList(),
+    testpath,
+    srclist,
   };
 }
 
+func safeWd() string{
+  wd, err := os.Getwd()
 
-type GtestAdapter struct {}
-
-func (a *GtestAdapter) Config() planr.AdapterConfig {
-  return planr.AdapterConfig {
-    Name: "gtest",
-    ParseConfig: ParseConfig,
-    ParseDefaultConfig: ParseDefaultConfig,
- }
-}
-
-func (adapter *GtestAdapter) Build(tcs []*planr.TestCase) {
-  buildDir :=  adapter.Config().Dir()
-  cmakeFile := path.Join(buildDir, GTEST_CMAKE)
-
-  units := make([]cmakeUnit, 0)
-  for _, tc := range tcs {
-    
-    cfg := tc.AdapterConfig().(*GtestConfig)
-    cfg.ensureSatisfied(tc.Path)
-
-    units = append(units, mkUnit(tc))
+  if err != nil {
+    log.Fatalf("Could not get GtestBuildDir %s %v\n", wd, err)
   }
 
-  genCmake(cmakeFile, units)
-
-  planr.RunCmd("cmake", "-S", ".", "-B", ".")
+  return wd
 }
 
 type ResultFromId map[string] Result
 
 func (adapter *GtestAdapter) execTests(cnames []string) ResultFromId {
-  buildDir := adapter.Config().Dir()
+  buildDir := safeWd()
 
   lut := make(ResultFromId, 0)
   for _, exe := range cnames {
@@ -154,6 +137,40 @@ func compile(wg * sync.WaitGroup, tc *planr.TestCase) {
   tc.Result.DebugOutput = string(out)
 }
 
+type GtestAdapter struct {
+  dirs planr.DirConfig
+}
+
+func (a *GtestAdapter) Config() planr.AdapterConfig {
+  return planr.AdapterConfig {
+    Name: "gtest",
+    ParseConfig: ParseConfig,
+    ParseDefaultConfig: ParseDefaultConfig,
+  }
+}
+
+func (a *GtestAdapter) Init(dirs planr.DirConfig) {
+  a.dirs = dirs
+}
+
+func (adapter *GtestAdapter) Build(tcs []*planr.TestCase) {
+  buildDir := safeWd()
+  cmakeFile := path.Join(buildDir, GTEST_CMAKE)
+
+  units := make([]cmakeUnit, 0)
+  for _, tc := range tcs {
+    
+    cfg := tc.AdapterConfig().(*GtestConfig)
+    cfg.ensureSatisfied(tc.Path)
+
+    units = append(units, makeUnit(tc, adapter.dirs))
+  }
+
+  genCmake(cmakeFile, units)
+
+  planr.RunCmd("cmake", "-S", ".", "-B", ".")
+}
+
 // ./planr eval  0.93s user 0.16s system 100% cpu 1.089 total
 func (adapter *GtestAdapter) Evaluate(tcs []*planr.TestCase) {
   var wg sync.WaitGroup
@@ -169,7 +186,7 @@ func (adapter *GtestAdapter) Evaluate(tcs []*planr.TestCase) {
   for _, tc := range tcs {
     result, ok := resultById[id(tc)]
 
-    // compilation failure
+    // compilation failure 
     if !ok {
       fmt.Printf("CAN'T FIND %s: status %d\n", tc.Cname, tc.Result.Status)
       
diff --git a/adapters/gtest/config.go b/adapters/gtest/config.go
index cff45fa..4f8735f 100644
--- a/adapters/gtest/config.go
+++ b/adapters/gtest/config.go
@@ -5,6 +5,7 @@ import (
   "golang.flu0r1ne.net/planr"
   "strings"
   "github.com/BurntSushi/toml"
+  "path"
 )
 
 type GtestDefaults struct {
@@ -42,29 +43,13 @@ func (g GtestConfig) ensureSatisfied(path string) {
   }
 }
 
-func (cfg GtestConfig) joinTests(path_ string) string {
-  if cfg.Test_root == nil {
-    return planr.JoinConfigDir("tests", path_)
-  }
-   
-  return planr.JoinConfigDir(*cfg.Test_root, path_)
-}
-
-func (cfg GtestConfig) joinSrcs(path_ string) string {
-  if cfg.Srcs_root == nil {
-    return planr.JoinConfigDir("../src", path_)
-  }
-
-  return planr.JoinConfigDir(*cfg.Srcs_root, path_)
-}
-
-func (cfg GtestConfig) srcList() string {
+func (cfg GtestConfig) srcList(srcDir string) string {
   var srcList string
 
   if cfg.Srcs != nil {
     srcs := make([]string, len(*cfg.Srcs))
     for i, src := range *cfg.Srcs {
-      srcs[i] = "\"" + cfg.joinSrcs(src) + "\""
+      srcs[i] = "\"" + path.Join(srcDir, src) + "\""
     }
     
     srcList = strings.Join(srcs, "\n  ")
diff --git a/adapters/gtest/templating.go b/adapters/gtest/templating.go
index c49f170..a9a3b07 100644
--- a/adapters/gtest/templating.go
+++ b/adapters/gtest/templating.go
@@ -80,5 +80,3 @@ include(GoogleTest)
 FetchContent_MakeAvailable(googletest)
 `))
 }
-
-