Skip to content
This repository was archived by the owner on Oct 28, 2021. It is now read-only.

Commit 678fe6c

Browse files
author
Dimitry
committed
fix testeth --help output
1 parent 505aead commit 678fe6c

File tree

2 files changed

+30
-29
lines changed

2 files changed

+30
-29
lines changed

CHANGELOG.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,7 @@
2222
- Fixed: [#5581](https://github.com/ethereum/aleth/pull/5581) Fixed finding neighbour nodes in Discovery.
2323
- Fixed: [#5599](https://github.com/ethereum/aleth/pull/5600) Prevent aleth from attempting concurrent connection to node which results in disconnect of original connection.
2424
- Fixed: [#5609](https://github.com/ethereum/aleth/pull/5609) Log valid local enode-address when external IP is not known.
25+
- Fixed: [#5627](https://github.com/ethereum/aleth/pull/5627) Correct testeth --help log output indentation
2526

2627
## [1.6.0] - 2019-04-16
2728

test/tools/libtesteth/Options.cpp

Lines changed: 29 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -39,42 +39,42 @@ void printHelp()
3939
cout << "Usage: \n";
4040
cout << std::left;
4141
cout << "\nSetting test suite\n";
42-
cout << setw(30) << "-t <TestSuite>" << setw(25) << "Execute test operations\n";
43-
cout << setw(30) << "-t <TestSuite>/<TestCase>\n";
44-
cout << setw(30) << "--testpath <PathToTheTestRepo>\n";
42+
cout << setw(35) << "-t <TestSuite>" << setw(0) << "Execute test operations\n";
43+
cout << setw(0) << "-t <TestSuite>/<TestCase>\n";
44+
cout << setw(35) << "--testpath <PathToTheTestRepo>" << setw(0) << "Set path to the test folder\n";
4545

4646
cout << "\nDebugging\n";
47-
cout << setw(30) << "-d <index>" << setw(25) << "Set the transaction data array index when running GeneralStateTests\n";
48-
cout << setw(30) << "-g <index>" << setw(25) << "Set the transaction gas array index when running GeneralStateTests\n";
49-
cout << setw(30) << "-v <index>" << setw(25) << "Set the transaction value array index when running GeneralStateTests\n";
50-
cout << setw(30) << "--singletest <TestName>" << setw(25) << "Run on a single test\n";
51-
cout << setw(30) << "--singletest <TestFile> <TestName>\n";
52-
cout << setw(30) << "--singlenet <networkId>" << setw(25) << "Run tests for a specific network (Frontier|Homestead|EIP150|EIP158|Byzantium|Constantinople|ConstantinopleFix)\n";
53-
cout << setw(30) << "--verbosity <level>" << setw(25) << "Set logs verbosity. 0 - silent, 1 - only errors, 2 - informative, >2 - detailed\n";
54-
cout << setw(30) << "--vm <name|path> (=legacy)" << setw(25) << "Set VM type for VMTests suite. Available options are: interpreter, legacy.\n";
55-
cout << setw(30) << "--evmc <option>=<value>" << setw(25) << "EVMC option\n";
56-
cout << setw(30) << "--vmtrace" << setw(25) << "Enable VM trace for the test. (Require build with VMTRACE=1)\n";
57-
cout << setw(30) << "--jsontrace <Options>" << setw(25) << "Enable VM trace to stdout in json format. Argument is a json config: '{ \"disableStorage\" : false, \"disableMemory\" : false, \"disableStack\" : false, \"fullStorage\" : true }'\n";
58-
cout << setw(30) << "--stats <OutFile>" << setw(25) << "Output debug stats to the file\n";
59-
cout << setw(30) << "--exectimelog" << setw(25) << "Output execution time for each test suite\n";
60-
cout << setw(30) << "--statediff" << setw(25) << "Trace state difference for state tests\n";
47+
cout << setw(35) << "-d <index>" << setw(25) << "Set the transaction data array index when running GeneralStateTests\n";
48+
cout << setw(35) << "-g <index>" << setw(25) << "Set the transaction gas array index when running GeneralStateTests\n";
49+
cout << setw(35) << "-v <index>" << setw(25) << "Set the transaction value array index when running GeneralStateTests\n";
50+
cout << setw(35) << "--singletest <TestName>" << setw(0) << "Run on a single test\n";
51+
cout << setw(35) << "--singletest <TestFile> <TestName>\n";
52+
cout << setw(35) << "--singlenet <networkId>" << setw(25) << "Run tests for a specific network (Frontier|Homestead|EIP150|EIP158|Byzantium|Constantinople|ConstantinopleFix)\n";
53+
cout << setw(35) << "--verbosity <level>" << setw(25) << "Set logs verbosity. 0 - silent, 1 - only errors, 2 - informative, >2 - detailed\n";
54+
cout << setw(35) << "--vm <name|path> (=legacy)" << setw(25) << "Set VM type for VMTests suite. Available options are: interpreter, legacy.\n";
55+
cout << setw(35) << "--evmc <option>=<value>" << setw(0) << "EVMC option\n";
56+
cout << setw(35) << "--vmtrace" << setw(25) << "Enable VM trace for the test. (Require build with VMTRACE=1)\n";
57+
cout << setw(35) << "--jsontrace <Options>" << setw(25) << "Enable VM trace to stdout in json format. Argument is a json config: '{ \"disableStorage\" : false, \"disableMemory\" : false, \"disableStack\" : false, \"fullStorage\" : true }'\n";
58+
cout << setw(35) << "--stats <OutFile>" << setw(25) << "Output debug stats to the file\n";
59+
cout << setw(35) << "--exectimelog" << setw(25) << "Output execution time for each test suite\n";
60+
cout << setw(35) << "--statediff" << setw(25) << "Trace state difference for state tests\n";
6161

6262
cout << "\nAdditional Tests\n";
63-
cout << setw(30) << "--all" << setw(25) << "Enable all tests\n";
63+
cout << setw(35) << "--all" << setw(25) << "Enable all tests\n";
6464

6565
cout << "\nTest Generation\n";
66-
cout << setw(30) << "--filltests" << setw(25) << "Run test fillers\n";
67-
cout << setw(30) << "--fillchain" << setw(25) << "When filling the state tests, fill tests as blockchain instead\n";
68-
cout << setw(30) << "--showhash" << setw(25) << "Show filler hash debug information\n";
69-
cout << setw(30) << "--randomcode <MaxOpcodeNum>" << setw(25) << "Generate smart random EVM code\n";
70-
cout << setw(30) << "--createRandomTest" << setw(25) << "Create random test and output it to the console\n";
71-
cout << setw(30) << "--createRandomTest <PathToOptions.json>" << setw(25) << "Use following options file for random code generation\n";
72-
cout << setw(30) << "--seed <uint>" << setw(25) << "Define a seed for random test\n";
73-
cout << setw(30) << "--options <PathTo.json>" << setw(25) << "Use following options file for random code generation\n";
66+
cout << setw(35) << "--filltests" << setw(0) << "Run test fillers\n";
67+
cout << setw(35) << "--fillchain" << setw(25) << "When filling the state tests, fill tests as blockchain instead\n";
68+
cout << setw(35) << "--showhash" << setw(25) << "Show filler hash debug information\n";
69+
cout << setw(35) << "--randomcode <MaxOpcodeNum>" << setw(25) << "Generate smart random EVM code\n";
70+
cout << setw(35) << "--createRandomTest" << setw(25) << "Create random test and output it to the console\n";
71+
cout << setw(35) << "--createRandomTest <PathToOptions.json>" << setw(25) << "Use following options file for random code generation\n";
72+
cout << setw(35) << "--seed <uint>" << setw(25) << "Define a seed for random test\n";
73+
cout << setw(35) << "--options <PathTo.json>" << setw(25) << "Use following options file for random code generation\n";
7474
//cout << setw(30) << "--fulloutput" << setw(25) << "Disable address compression in the output field\n";
75-
cout << setw(30) << "--db <name> (=memorydb)" << setw(25) << "Use the supplied database for the block and state databases. Valid options: leveldb, rocksdb, memorydb\n";
76-
cout << setw(30) << "--help" << setw(25) << "Display list of command arguments\n";
77-
cout << setw(30) << "--version" << setw(25) << "Display build information\n";
75+
cout << setw(35) << "--db <name> (=memorydb)" << setw(25) << "Use the supplied database for the block and state databases. Valid options: leveldb, rocksdb, memorydb\n";
76+
cout << setw(35) << "--help" << setw(25) << "Display list of command arguments\n";
77+
cout << setw(35) << "--version" << setw(25) << "Display build information\n";
7878
}
7979

8080
void printVersion()

0 commit comments

Comments
 (0)