Merge pull request #411 from Mashimiao/runtimetest-auto-get-os

automatically get os when validating runtime

Author: hqhq

Makefile

@@ -6,7 +6,6 @@ BINDIR ?= $(DESTDIR)/usr/bin
 
 BUILDTAGS=
 RUNTIME ?= runc
-PLATFORM ?= linux
 
 all: tool runtimetest
 
@@ -40,7 +39,7 @@ clean:
 	rm -f oci-runtime-tool runtimetest *.1
 
 localvalidation: runtimetest
-	RUNTIME=$(RUNTIME) PLATFORM=$(PLATFORM) go test -tags "$(BUILDTAGS)" ${TESTFLAGS} -v github.com/opencontainers/runtime-tools/validation
+	RUNTIME=$(RUNTIME) go test -tags "$(BUILDTAGS)" ${TESTFLAGS} -v github.com/opencontainers/runtime-tools/validation
 
 .PHONY: test .gofmt .govet .golint
 

cmd/runtimetest/main.go

@@ -9,6 +9,7 @@ import (
 	"io/ioutil"
 	"os"
 	"path/filepath"
+	"runtime"
 	"strconv"
 	"strings"
 	"syscall"
@@ -588,7 +589,7 @@ func validate(context *cli.Context) error {
 		return err
 	}
 
-	platform := context.String("platform")
+	platform := runtime.GOOS
 
 	defaultValidations := []validation{
 		{
@@ -699,11 +700,6 @@ func main() {
 			Value: ".",
 			Usage: "Path to the configuration",
 		},
-		cli.StringFlag{
-			Name:  "platform",
-			Value: "linux",
-			Usage: "Platform the runtime runs on",
-		},
 	}
 
 	app.Action = validate

validation/validation_test.go

@@ -14,13 +14,11 @@ import (
 )
 
 var (
-	runtime  = "runc"
-	platform = "linux"
+	runtime = "runc"
 )
 
 func init() {
 	runtime = os.Getenv("RUNTIME")
-	platform = os.Getenv("PLATFORM")
 }
 
 func runtimeValidate(runtime string, g *generate.Generator) error {
@@ -81,7 +79,7 @@ func runtimeValidate(runtime string, g *generate.Generator) error {
 func getDefaultGenerator() *generate.Generator {
 	g := generate.New()
 	g.SetRootPath(".")
-	g.SetProcessArgs([]string{"/runtimetest", "--platform", platform})
+	g.SetProcessArgs([]string{"/runtimetest"})
 	return &g
 }