Merge branch 'master' into issue-9840

Author: grandizzy

crates/forge/src/result.rs

@@ -192,6 +192,15 @@ impl TestOutcome {
             successes.to_string().green()
         )?;
 
+        // Show helpful hint for rerunning failed tests
+        let test_word = if failures == 1 { "test" } else { "tests" };
+        sh_println!(
+            "\nTip: Run {} to retry only the {} failed {}",
+            "`forge test --rerun`".cyan(),
+            failures,
+            test_word
+        )?;
+
         // TODO: Avoid process::exit
         std::process::exit(1);
     }

crates/forge/tests/cli/cmd.rs

@@ -2850,7 +2850,7 @@ contract NestedDeploy is Test {
 +============================================================================================+
 | Deployment Cost                           | Deployment Size |     |        |     |         |
 |-------------------------------------------+-----------------+-----+--------+-----+---------|
-| 328949                                    | 1163            |     |        |     |         |
+| 328961                                    | 1163            |     |        |     |         |
 |-------------------------------------------+-----------------+-----+--------+-----+---------|
 |                                           |                 |     |        |     |         |
 |-------------------------------------------+-----------------+-----+--------+-----+---------|
@@ -2905,7 +2905,7 @@ Ran 1 test suite [ELAPSED]: 1 tests passed, 0 failed, 0 skipped (1 total tests)
   {
     "contract": "test/NestedDeployTest.sol:Parent",
     "deployment": {
-      "gas": 328949,
+      "gas": 328961,
       "size": 1163
     },
     "functions": {

crates/forge/tests/cli/eip712.rs

@@ -175,6 +175,8 @@ Encountered 1 failing test in test/Structs.sol:DummyTest
 
 Encountered a total of 1 failing tests, 0 tests succeeded
 
+Tip: Run `forge test --rerun` to retry only the 1 failed test
+
 "#]]);
 });
 
@@ -394,6 +396,8 @@ Encountered 1 failing test in src/Eip712Cheat.sol:Eip712Test
 
 Encountered a total of 1 failing tests, 0 tests succeeded
 
+Tip: Run `forge test --rerun` to retry only the 1 failed test
+
 "#]]);
 
     cmd.forge_fuse().args(["bind-json"]).assert_success();
@@ -438,6 +442,8 @@ Encountered 1 failing test in src/Eip712Cheat.sol:Eip712Test
 
 Encountered a total of 1 failing tests, 0 tests succeeded
 
+Tip: Run `forge test --rerun` to retry only the 1 failed test
+
 "#]]);
 
     cmd.forge_fuse().args(["bind-json", "utils/CustomJsonBindings.sol"]).assert_success();

crates/forge/tests/cli/failure_assertions.rs

@@ -33,6 +33,8 @@ Encountered 2 failing tests in src/DeprecationTestFail.t.sol:DeprecationTestFail
 
 Encountered a total of 2 failing tests, 0 tests succeeded
 
+Tip: Run `forge test --rerun` to retry only the 2 failed tests
+
 "#]]);
 });
 

crates/forge/tests/cli/inline_config.rs

@@ -161,6 +161,8 @@ Encountered 1 failing test in test/inline.sol:Inline
 
 Encountered a total of 1 failing tests, 0 tests succeeded
 
+Tip: Run `forge test --rerun` to retry only the 1 failed test
+
 "#]]);
 });
 
@@ -192,6 +194,8 @@ Encountered 1 failing test in test/inline.sol:Inline
 
 Encountered a total of 1 failing tests, 0 tests succeeded
 
+Tip: Run `forge test --rerun` to retry only the 1 failed test
+
 "#]]);
 });
 

crates/forge/tests/cli/test_cmd.rs

@@ -602,6 +602,8 @@ Encountered 1 failing test in test/Contract.t.sol:CustomTypesTest
 
 Encountered a total of 1 failing tests, 1 tests succeeded
 
+Tip: Run `forge test --rerun` to retry only the 1 failed test
+
 "#]]);
 });
 
@@ -763,6 +765,8 @@ Encountered 1 failing test in test/CounterFuzz.t.sol:CounterTest
 
 Encountered a total of 1 failing tests, 0 tests succeeded
 
+Tip: Run `forge test --rerun` to retry only the 1 failed test
+
 "#]]);
 });
 
@@ -813,6 +817,8 @@ Encountered 1 failing test in test/CounterInvariant.t.sol:CounterTest
 
 Encountered a total of 1 failing tests, 0 tests succeeded
 
+Tip: Run `forge test --rerun` to retry only the 1 failed test
+
 "#]]);
 });
 
@@ -864,6 +870,8 @@ Encountered 2 failing tests in test/ReplayFailures.t.sol:ReplayFailuresTest
 
 Encountered a total of 2 failing tests, 2 tests succeeded
 
+Tip: Run `forge test --rerun` to retry only the 2 failed tests
+
 "#]]);
 
     // Test failure filter should be persisted.
@@ -887,6 +895,8 @@ Encountered 2 failing tests in test/ReplayFailures.t.sol:ReplayFailuresTest
 
 Encountered a total of 2 failing tests, 0 tests succeeded
 
+Tip: Run `forge test --rerun` to retry only the 2 failed tests
+
 "#]]);
 });
 
@@ -2871,6 +2881,8 @@ Encountered 1 failing test in test/Foo.t.sol:ContractTest
 
 Encountered a total of 1 failing tests, 0 tests succeeded
 
+Tip: Run `forge test --rerun` to retry only the 1 failed test
+
 "#]]);
 });
 
@@ -3001,6 +3013,8 @@ Encountered 1 failing test in test/SuppressTracesTest.t.sol:SuppressTracesTest
 
 Encountered a total of 1 failing tests, 1 tests succeeded
 
+Tip: Run `forge test --rerun` to retry only the 1 failed test
+
 "#]],
     );
 
@@ -3063,6 +3077,8 @@ Encountered 1 failing test in test/SuppressTracesTest.t.sol:SuppressTracesTest
 
 Encountered a total of 1 failing tests, 1 tests succeeded
 
+Tip: Run `forge test --rerun` to retry only the 1 failed test
+
 "#]]);
 });
 
@@ -3747,6 +3763,8 @@ Encountered 1 failing test in test/Counter.t.sol:CounterTest
 
 Encountered a total of 1 failing tests, 0 tests succeeded
 
+Tip: Run `forge test --rerun` to retry only the 1 failed test
+
 "#]]);
 });
 
@@ -3855,6 +3873,8 @@ Encountered 3 failing tests in test/NonContractCallRevertTest.t.sol:NonContractC
 
 Encountered a total of 3 failing tests, 0 tests succeeded
 
+Tip: Run `forge test --rerun` to retry only the 3 failed tests
+
 "#]]);
 });
 
@@ -3937,6 +3957,8 @@ Encountered 1 failing test in test/NonContractDelegateCallRevertTest.t.sol:NonCo
 
 Encountered a total of 1 failing tests, 0 tests succeeded
 
+Tip: Run `forge test --rerun` to retry only the 1 failed test
+
 "#]]);
 });
 
@@ -4128,5 +4150,7 @@ Encountered 2 failing tests in test/Counter.t.sol:CounterTest
 
 Encountered a total of 2 failing tests, 0 tests succeeded
 
+Tip: Run `forge test --rerun` to retry only the 2 failed tests
+
 "#]]);
 });

crates/forge/tests/it/invariant.rs

@@ -806,7 +806,7 @@ contract BalanceAssumeTest is Test {
 
     cmd.args(["test", "--mt", "invariant_balance"]).assert_failure().stdout_eq(str![[r#"
 ...
-[FAIL: `vm.assume` rejected too many inputs (10 allowed)] invariant_balance() (runs: 5, calls: 2500, reverts: 0)
+[FAIL: `vm.assume` rejected too many inputs (10 allowed)] invariant_balance() (runs: 2, calls: 1000, reverts: 0)
 ...
 "#]]);
 });
@@ -1112,6 +1112,8 @@ Encountered 1 failing test in test/InvariantSequenceLenTest.t.sol:InvariantSeque
 
 Encountered a total of 1 failing tests, 0 tests succeeded
 
+Tip: Run `forge test --rerun` to retry only the 1 failed test
+
 "#]],
     );
 
@@ -1137,6 +1139,8 @@ Encountered 1 failing test in test/InvariantSequenceLenTest.t.sol:InvariantSeque
 
 Encountered a total of 1 failing tests, 0 tests succeeded
 
+Tip: Run `forge test --rerun` to retry only the 1 failed test
+
 "#]],
     );
 
@@ -1158,6 +1162,8 @@ Encountered 1 failing test in test/InvariantSequenceLenTest.t.sol:InvariantSeque
 
 Encountered a total of 1 failing tests, 0 tests succeeded
 
+Tip: Run `forge test --rerun` to retry only the 1 failed test
+
 "#]],
     );
 });

crates/forge/tests/it/table.rs

@@ -117,6 +117,8 @@ Encountered 6 failing tests in test/CounterTable.t.sol:CounterTableTest
 
 Encountered a total of 6 failing tests, 2 tests succeeded
 
+Tip: Run `forge test --rerun` to retry only the 6 failed tests
+
 "#]]);
 });
 

testdata/forge-std-rev

@@ -1 +1 @@
-8bbcf6e3f8f62f419e5429a0bd89331c85c37824
+8e40513d678f392f398620b3ef2b418648b33e89