ci: update CI scaffolding

Author: sbinet

ci/run-tests.go

@@ -1,7 +1,8 @@
-// Copyright 2018 The go-python Authors. All rights reserved.
+// Copyright ©2018 The go-python Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style
 // license that can be found in the LICENSE file.
 
+//go:build ignore
 // +build ignore
 
 package main
@@ -10,32 +11,33 @@ import (
 "bufio"
 "bytes"
 "flag"
-"io/ioutil"
+"fmt"
 "log"
 "os"
 "os/exec"
 "strings"
+"time"
 )
 
 funcmain(){
 log.SetPrefix("ci: ")
 log.SetFlags(0)
 
+start:=time.Now()
+deferfunc(){
+log.Printf("elapsed time: %v\n", time.Since(start))
+ }()
+
 var (
-race=flag.Bool("race", false, "enable race detector")
-cover=flag.Bool("cover", false, "enable code coverage")
-tags=flag.String("tags", "", "build tags")
+race=flag.Bool("race", false, "enable race detector")
+cover=flag.String("coverpkg", "", "apply coverage analysis in each test to packages matching the patterns.")
+tags=flag.String("tags", "", "build tags")
+verbose=flag.Bool("v", false, "enable verbose output")
  )
 
 flag.Parse()
 
-out:=new(bytes.Buffer)
-cmd:=exec.Command("go", "list", "./...")
-cmd.Stdout=out
-cmd.Stderr=os.Stderr
-cmd.Stdin=os.Stdin
-
-err:=cmd.Run()
+pkgs, err:=pkgList()
 iferr!=nil{
 log.Fatal(err)
  }
@@ -48,23 +50,24 @@ func main(){
 
 args:= []string{"test"}
 
-if*cover{
-args=append(args, "-coverprofile=profile.out", "-covermode=atomic")
+if*verbose{
+args=append(args, "-v")
+ }
+if*cover!=""{
+args=append(args, "-coverprofile=profile.out", "-covermode=atomic", "-coverpkg="+*cover)
  }
 if*tags!=""{
 args=append(args, "-tags="+*tags)
  }
-if*race{
-args=append(args, "-race")
+switch{
+case*race:
+args=append(args, "-race", "-timeout=20m")
+default:
+args=append(args, "-timeout=10m")
  }
 args=append(args, "")
 
-scan:=bufio.NewScanner(out)
-forscan.Scan(){
-pkg:=scan.Text()
-ifstrings.Contains(pkg, "vendor"){
-continue
- }
+for_, pkg:=rangepkgs{
 args[len(args)-1] =pkg
 cmd:=exec.Command("go", args...)
 cmd.Stdin=os.Stdin
@@ -74,8 +77,8 @@ func main(){
 iferr!=nil{
 log.Fatal(err)
  }
-if*cover{
-profile, err:=ioutil.ReadFile("profile.out")
+if*cover!=""{
+profile, err:=os.ReadFile("profile.out")
 iferr!=nil{
 log.Fatal(err)
  }
@@ -92,3 +95,28 @@ func main(){
 log.Fatal(err)
  }
 }
+
+funcpkgList() ([]string, error){
+out:=new(bytes.Buffer)
+cmd:=exec.Command("go", "list", "./...")
+cmd.Stdout=out
+cmd.Stderr=os.Stderr
+cmd.Stdin=os.Stdin
+
+err:=cmd.Run()
+iferr!=nil{
+returnnil, fmt.Errorf("could not get package list: %w", err)
+ }
+
+varpkgs []string
+scan:=bufio.NewScanner(out)
+forscan.Scan(){
+pkg:=scan.Text()
+ifstrings.Contains(pkg, "vendor"){
+continue
+ }
+pkgs=append(pkgs, pkg)
+ }
+
+returnpkgs, nil
+}