improve the output of runCmd

Signed-off-by: Jun Kimura <[email protected]>
datachainlab · May 22, 2024 · c93911e · c93911e
1 parent 440d231
commit c93911e
Showing 1 changed file with 6 additions and 8 deletions.
diff --git a/test/CertificateTest.t.sol b/test/CertificateTest.t.sol
@@ -166,13 +166,11 @@ contract CertificateTest is BasicTest {
     }
 
     function runCmd(string[] memory cmd) internal {
-        // NOTE: vm.tryFfi will be supported after forge-std v1.6.1
-        // Vm.FfiResult memory f = vm.tryFfi(cmd);
-        // string memory cmdStr;
-        // for (uint256 i = 0; i < cmd.length; i++) {
-        //     cmdStr = string(abi.encodePacked(cmdStr, cmd[i], " "));
-        // }
-        // require(f.exit_code == 0, cmdStr);
-        vm.ffi(cmd);
+        Vm.FfiResult memory f = vm.tryFfi(cmd);
+        string memory cmdStr;
+        for (uint256 i = 0; i < cmd.length; i++) {
+            cmdStr = string(abi.encodePacked(cmdStr, cmd[i], " "));
+        }
+        require(f.exitCode == 0, string(abi.encodePacked("Failed to run command: ", cmdStr)));
     }
 }