Merge branch 'upstream' into ppa

Update v0.1.2

1 files changed, 20 insertions, 11 deletions

diff --git a/adapters/gtest/adapter.go b/adapters/gtest/adapter.go
index 2961f29..96b6976 100644
--- a/adapters/gtest/adapter.go
+++ b/adapters/gtest/adapter.go
@@ -4,6 +4,7 @@ import (
 	"log"
 	"os"
 	"path"
+        "os/exec"
 	"golang.flu0r1ne.net/planr"
 )
 
@@ -20,7 +21,8 @@ func safeWd() string{
 }
 
 type Adapter struct {
-  dirs planr.DirConfig
+  dirs     planr.DirConfig
+  buildDir string
 }
 
 func (a *Adapter) Config() planr.AdapterConfig {
@@ -31,28 +33,35 @@ func (a *Adapter) Config() planr.AdapterConfig {
   }
 }
 
-func (a *Adapter) Init(dirs planr.DirConfig) {
-  a.dirs = dirs
+func (a *Adapter) Init(ctx planr.PipelineContext) {
+  a.dirs = ctx.Dirs
+  a.buildDir = ctx.AdapterDir
 }
 
 func (adapter Adapter) Build(tcs []planr.TestCase) {
-  buildDir := safeWd()
-
   finalizeConfigs(tcs)
 
   exes := createExecutables(tcs)
 
-  cmakeFile := path.Join(buildDir, GTEST_CMAKE)
+  cmakeFile := path.Join(adapter.buildDir, GTEST_CMAKE)
   cmakeUnits := cmakeUnits(exes, adapter.dirs)
 
   generateCmakeScript(cmakeFile, cmakeUnits)
 
-  planr.RunCmd("cmake", "-S", ".", "-B", ".")
+  cmd := exec.Command("cmake", "-S", ".", "-B", ".")
+
+  cmd.Dir = adapter.buildDir
+
+  planr.Exec(cmd)
+
+  cmd = exec.Command("make", "gtest", "gmock")
+  
+  cmd.Dir = adapter.buildDir
+
+  planr.Exec(cmd)
 }
 
 func (adapter *Adapter) Evaluate(tcs []planr.TestCase) [] planr.TestResult {
-  buildDir := safeWd()
-
   finalizeConfigs(tcs)
   
   results := make([]planr.TestResult, 0)
@@ -62,14 +71,14 @@ func (adapter *Adapter) Evaluate(tcs []planr.TestCase) [] planr.TestResult {
   c := make(chan []planr.TestResult, len(exes))
   for i := range exes {
     go func(exe *executable) {
-      succeed, buildFailures := exe.compile(buildDir)
+      succeed, buildFailures := exe.compile(adapter.buildDir)
 
       if ! succeed {
         c <- buildFailures
         return
       }
 
-      runtimeResults := exe.execute(buildDir)
+      runtimeResults := exe.execute(adapter.buildDir)
 
       c <- runtimeResults
     }(&exes[i])