Regres: Restructure directories for main packages

A directory should only contain either library code, or contain a single `main`. Attempting to have two main packages upsets the go tools. Add a `run.sh` bash script in the root regres folder to `go run` the `cmd/regres/main.go` file, to keep usage simple for non-go people. Change-Id: Ia37ce9a64e1e1a7e23ee3336e6e312cef9e63a9f Reviewed-on: https://swiftshader-review.googlesource.com/c/SwiftShader/+/40528 Kokoro-Presubmit: kokoro <noreply+kokoro@google.com> Reviewed-by: Nicolas Capens <nicolascapens@google.com> Tested-by: Ben Clayton <bclayton@google.com>

Regres: Restructure directories for main packages
ccc99214 · Ben Clayton · 5ef91b82 · ccc99214 · ccc99214 · ccc99214
Commit ccc99214 authored Jan 24, 2020 by Ben Clayton
Hide whitespace changes
Inline Side-by-side

Showing with 17 additions and 12 deletions

main.go tests/regres/cmd/export_to_sheets/main.go +4 -4

main.go tests/regres/cmd/regres/main.go +8 -8

run.sh tests/regres/run.sh +5 -0

No files found.
--- a/tests/regres/export_to_sheets.go
+++ b/tests/regres/export_to_sheets.go
@@ -30,10 +30,10 @@ import (
 	"path/filepath"
 	"strings"

-	"./cause"
-	"./consts"
-	"./git"
-	"./testlist"
+	"../../cause"
+	"../../consts"
+	"../../git"
+	"../../testlist"

 	"golang.org/x/oauth2"
 	"golang.org/x/oauth2/google"

--- a/tests/regres/main.go
+++ b/tests/regres/main.go
@@ -12,7 +12,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.

-// Regres is a tool that detects test regressions with SwiftShader changes.
+// regres is a tool that detects test regressions with SwiftShader changes.
 //
 // Regres monitors changes that have been put up for review with Gerrit.
 // Once a new patchset has been found, regres will checkout, build and test the
@@ -44,13 +44,13 @@ import (
 	"strings"
 	"time"

-	"./cause"
-	"./consts"
-	"./deqp"
-	"./git"
-	"./shell"
-	"./testlist"
-	"./util"
+	"../../cause"
+	"../../consts"
+	"../../deqp"
+	"../../git"
+	"../../shell"
+	"../../testlist"
+	"../../util"
 	gerrit "github.com/andygrunwald/go-gerrit"
 )


--- a/tests/regres/run.sh
+++ b/tests/regres/run.sh
+#!/bin/bash
+
+ROOT_DIR="$( cd "$( dirname "${BASH_SOURCE[0]}")" >/dev/null 2>&1 && pwd )"
+
+go run $ROOT_DIR/cmd/regres/main.go $@