This change updates our urfave/cli dependency to the v2 branch of the library. There are some Go API changes in cli v2: - Flag values can now be accessed using the methods ctx.Bool, ctx.Int, ctx.String, ... regardless of whether the flag is 'local' or 'global'. - v2 has built-in support for flag categories. Our home-grown category system is removed and the categories of flags are assigned as part of the flag definition. For users, there is only one observable difference with cli v2: flags must now strictly appear before regular arguments. For example, the following command is now invalid: geth account import mykey.json --password file.txt Instead, the command must be invoked as follows: geth account import --password file.txt mykey.json
		
			
				
	
	
		
			70 lines
		
	
	
		
			1.9 KiB
		
	
	
	
		
			Go
		
	
	
	
	
	
			
		
		
	
	
			70 lines
		
	
	
		
			1.9 KiB
		
	
	
	
		
			Go
		
	
	
	
	
	
// Copyright 2020 The go-ethereum Authors
 | 
						|
// This file is part of go-ethereum.
 | 
						|
//
 | 
						|
// go-ethereum is free software: you can redistribute it and/or modify
 | 
						|
// it under the terms of the GNU General Public License as published by
 | 
						|
// the Free Software Foundation, either version 3 of the License, or
 | 
						|
// (at your option) any later version.
 | 
						|
//
 | 
						|
// go-ethereum is distributed in the hope that it will be useful,
 | 
						|
// but WITHOUT ANY WARRANTY; without even the implied warranty of
 | 
						|
// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
 | 
						|
// GNU General Public License for more details.
 | 
						|
//
 | 
						|
// You should have received a copy of the GNU General Public License
 | 
						|
// along with go-ethereum. If not, see <http://www.gnu.org/licenses/>.
 | 
						|
 | 
						|
package main
 | 
						|
 | 
						|
import (
 | 
						|
	"os"
 | 
						|
 | 
						|
	"github.com/ethereum/go-ethereum/cmd/devp2p/internal/v4test"
 | 
						|
	"github.com/ethereum/go-ethereum/internal/utesting"
 | 
						|
	"github.com/ethereum/go-ethereum/log"
 | 
						|
	"github.com/urfave/cli/v2"
 | 
						|
)
 | 
						|
 | 
						|
var (
 | 
						|
	testPatternFlag = &cli.StringFlag{
 | 
						|
		Name:  "run",
 | 
						|
		Usage: "Pattern of test suite(s) to run",
 | 
						|
	}
 | 
						|
	testTAPFlag = &cli.BoolFlag{
 | 
						|
		Name:  "tap",
 | 
						|
		Usage: "Output TAP",
 | 
						|
	}
 | 
						|
	// These two are specific to the discovery tests.
 | 
						|
	testListen1Flag = &cli.StringFlag{
 | 
						|
		Name:  "listen1",
 | 
						|
		Usage: "IP address of the first tester",
 | 
						|
		Value: v4test.Listen1,
 | 
						|
	}
 | 
						|
	testListen2Flag = &cli.StringFlag{
 | 
						|
		Name:  "listen2",
 | 
						|
		Usage: "IP address of the second tester",
 | 
						|
		Value: v4test.Listen2,
 | 
						|
	}
 | 
						|
)
 | 
						|
 | 
						|
func runTests(ctx *cli.Context, tests []utesting.Test) error {
 | 
						|
	// Filter test cases.
 | 
						|
	if ctx.IsSet(testPatternFlag.Name) {
 | 
						|
		tests = utesting.MatchTests(tests, ctx.String(testPatternFlag.Name))
 | 
						|
	}
 | 
						|
	// Disable logging unless explicitly enabled.
 | 
						|
	if !ctx.IsSet("verbosity") && !ctx.IsSet("vmodule") {
 | 
						|
		log.Root().SetHandler(log.DiscardHandler())
 | 
						|
	}
 | 
						|
	// Run the tests.
 | 
						|
	var run = utesting.RunTests
 | 
						|
	if ctx.Bool(testTAPFlag.Name) {
 | 
						|
		run = utesting.RunTAP
 | 
						|
	}
 | 
						|
	results := run(tests, os.Stdout)
 | 
						|
	if utesting.CountFailures(results) > 0 {
 | 
						|
		os.Exit(1)
 | 
						|
	}
 | 
						|
	return nil
 | 
						|
}
 |