From 62e85f40923b3485ba60766052de7150acf039c5 Mon Sep 17 00:00:00 2001
From: Flu0r1ne <flur01ne@flu0r1ne.net>
Date: Sun, 5 Sep 2021 04:30:33 -0500
Subject: Add bash adapter

---
 adapters/bash/adapter.go | 96 ++++++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 96 insertions(+)
 create mode 100644 adapters/bash/adapter.go

(limited to 'adapters/bash/adapter.go')

diff --git a/adapters/bash/adapter.go b/adapters/bash/adapter.go
new file mode 100644
index 0000000..b98523e
--- /dev/null
+++ b/adapters/bash/adapter.go
@@ -0,0 +1,96 @@
+package bash
+
+import (
+	"context"
+	"errors"
+	"log"
+	"os"
+	"os/exec"
+	"path"
+	"strings"
+	"time"
+        "fmt"
+
+	"golang.flu0r1ne.net/planr"
+)
+
+type Adapter struct {
+  dirs planr.DirConfig
+}
+
+func (a *Adapter) Config() planr.AdapterConfig {
+  return planr.AdapterConfig {
+    Name: "bash",
+    ParseConfig: ParseConfig,
+    ParseDefaultConfig: ParseDefaultConfig,
+  }
+}
+
+func safeWd() string{
+  wd, err := os.Getwd()
+
+  if err != nil {
+    log.Fatalf("Could not get GtestBuildDir %s %v\n", wd, err)
+  }
+
+  return wd
+}
+
+func (a *Adapter) Init(dirs planr.DirConfig) {
+  a.dirs = dirs
+}
+
+func (adapter Adapter) Build(tcs []planr.TestCase) { }
+
+func executeScriptedTest(testdir string, tc planr.TestCase) planr.TestResult {
+  cfg := tc.AdapterConfig().(*Config)
+
+  timeout := time.Duration(cfg.Timeout) * time.Millisecond
+
+  ctx, cancel := context.WithTimeout(context.Background(), timeout)
+
+  defer cancel()
+
+  path := path.Join(testdir, cfg.Testfile)
+
+  result := planr.TestResult {}
+  result.Tc = tc
+
+  cmd := exec.CommandContext(ctx, "bash", path)
+    
+  if out, err := cmd.CombinedOutput(); err != nil {
+    result.Status = planr.RUNTIME_FAILURE  
+    result.TestOutput = string(out)
+
+    var exiterr *exec.ExitError
+    if !errors.As(err, &exiterr) {
+      log.Fatalf("Test script %s failed with unknown error %v\n", path, err)
+    } else {
+      if strings.Contains(exiterr.String(), "killed") {
+        result.TestOutput += fmt.Sprintf("TEST TERMINATED (Timeout=%d)\n", cfg.Timeout)
+      }
+    }
+
+    return result
+  }
+
+  result.Status = planr.PASSING
+
+
+  return result
+}
+
+func (adapter Adapter) Evaluate(tcs []planr.TestCase) [] planr.TestResult {
+  finalizeConfigs(tcs)
+ 
+  trs := make([]planr.TestResult, len(tcs))
+  for i, tc := range tcs {
+    trs[i] = executeScriptedTest(adapter.dirs.Tests(), tc)
+  }
+
+  return trs
+}
+
+func NewAdapter() *Adapter {
+  return new(Adapter)
+}
-- 
cgit v1.2.3


From d186e730a73b5b3009edbaab7617617d35dc2cff Mon Sep 17 00:00:00 2001
From: Flu0r1ne <flur01ne@flu0r1ne.net>
Date: Sun, 5 Sep 2021 04:35:21 -0500
Subject: Thread bash adapter

---
 adapters/bash/adapter.go | 13 ++++++++++---
 1 file changed, 10 insertions(+), 3 deletions(-)

(limited to 'adapters/bash/adapter.go')

diff --git a/adapters/bash/adapter.go b/adapters/bash/adapter.go
index b98523e..65a6c80 100644
--- a/adapters/bash/adapter.go
+++ b/adapters/bash/adapter.go
@@ -83,9 +83,16 @@ func executeScriptedTest(testdir string, tc planr.TestCase) planr.TestResult {
 func (adapter Adapter) Evaluate(tcs []planr.TestCase) [] planr.TestResult {
   finalizeConfigs(tcs)
  
-  trs := make([]planr.TestResult, len(tcs))
-  for i, tc := range tcs {
-    trs[i] = executeScriptedTest(adapter.dirs.Tests(), tc)
+  trs := make([]planr.TestResult, 0)
+  c := make(chan planr.TestResult, 0)
+  for i := range tcs {
+    go func(i int) {
+      c <- executeScriptedTest(adapter.dirs.Tests(), tcs[i])
+    }(i)
+  }
+
+  for range tcs {
+    trs = append(trs, <-c)
   }
 
   return trs
-- 
cgit v1.2.3