Merge pull request #66 from zimmski/megacheck

Include Megacheck as a linting tool

Makefile

@@ -47,6 +47,7 @@ install-tools:
 	# linting
 	go get -u -v golang.org/x/lint/golint/...
 	go get -u -v github.com/kisielk/errcheck/...
+	go get -u -v honnef.co/go/tools/cmd/megacheck
 
 	# code coverage
 	go get -u -v golang.org/x/tools/cmd/cover

cmd/go-mutesting/main.go

@@ -37,12 +37,6 @@ const (
 	returnError
 )
 
-const (
-	execPassed  = 0
-	execFailed  = 1
-	execSkipped = 2
-)
-
 type options struct {
 	General struct {
 		Debug                bool `long:"debug" description:"Debug log output"`
@@ -235,7 +229,7 @@ MUTATOR:
 			}
 		}
 
-		debug(opts, "Enable mutator %q", name)
+		verbose(opts, "Enable mutator %q", name)
 
 		m, _ := mutator.New(name)
 		mutators = append(mutators, mutatorItem{
@@ -248,7 +242,7 @@ MUTATOR:
 	if err != nil {
 		panic(err)
 	}
-	debug(opts, "Save mutations into %q", tmpDir)
+	verbose(opts, "Save mutations into %q", tmpDir)
 
 	var execs []string
 	if opts.Exec.Exec != "" {
@@ -258,7 +252,7 @@ MUTATOR:
 	stats := &mutationStats{}
 
 	for _, file := range files {
-		debug(opts, "Mutate %q", file)
+		verbose(opts, "Mutate %q", file)
 
 		src, fset, pkg, info, err := mutesting.ParseAndTypeCheckFile(file)
 		if err != nil {
@@ -293,7 +287,7 @@ MUTATOR:
 				}
 			}
 		} else {
-			mutationID = mutate(opts, mutators, mutationBlackList, mutationID, pkg, info, file, fset, src, src, tmpFile, execs, stats)
+			_ = mutate(opts, mutators, mutationBlackList, mutationID, pkg, info, file, fset, src, src, tmpFile, execs, stats)
 		}
 	}
 

scripts/lint.sh

@@ -19,4 +19,8 @@ echo "golint:"
 OUT=$(golint $PKG/... 2>&1 | grep --invert-match -E "(/example)")
 if [ -n "$OUT" ]; then echo "$OUT"; PROBLEM=1; fi
 
+echo "megacheck:"
+OUT=$(megacheck $PKG/... 2>&1 | grep --invert-match -E "(example/)")
+if [ -n "$OUT" ]; then echo "$OUT"; PROBLEM=1; fi
+
 if [ -n "$PROBLEM" ]; then exit 1; fi

test/mutator.go

@@ -49,7 +49,7 @@ func Mutator(t *testing.T, m mutator.Mutator, testFile string, count int) {
 		assert.Nil(t, err)
 
 		if !assert.Equal(t, string(changedFile), buf.String(), fmt.Sprintf("For change file %q", changedFilename)) {
-			err = ioutil.WriteFile(fmt.Sprintf("%s.%d.go.new", testFile, i), []byte(buf.String()), 0644)
+			err = ioutil.WriteFile(fmt.Sprintf("%s.%d.go.new", testFile, i), buf.Bytes(), 0644)
 			assert.Nil(t, err)
 		}