fix snapshot test harness

Author: xunilrj

test/src/e2e_vm_tests/test_programs/should_pass/language/array/array_repeat/stdout.snap

@@ -1167,27 +1167,27 @@ script {
 !234 = span !184 71080 71101
 !235 = fn_call_path_span !184 71080 71093
 !236 = (!234 !235)
-!237 = span !184 89587 89627
+!237 = span !184 89781 89821
 !238 = (!234 !235 !237)
-!239 = span !184 89607 89627
+!239 = span !184 89801 89821
 !240 = (!234 !235 !237)
-!241 = span !184 89653 89666
+!241 = span !184 89847 89860
 !242 = (!234 !235 !241)
-!243 = span !184 89637 89667
+!243 = span !184 89831 89861
 !244 = (!234 !235 !243)
-!245 = span !184 89752 89757
+!245 = span !184 89946 89951
 !246 = (!234 !235 !245)
-!247 = span !184 89676 89759
+!247 = span !184 89870 89953
 !248 = (!234 !235 !247)
 !249 = (!234 !235 !247)
-!250 = span !184 89769 89783
+!250 = span !184 89963 89977
 !251 = (!234 !235 !250)
-!252 = span !184 89781 89782
+!252 = span !184 89975 89976
 !253 = (!234 !235 !250)
-!254 = span !184 89799 89800
+!254 = span !184 89993 89994
 !255 = (!234 !235 !254)
-!256 = span !184 89799 89804
-!257 = fn_call_path_span !184 89801 89802
+!256 = span !184 89993 89998
+!257 = fn_call_path_span !184 89995 89996
 !258 = (!234 !235 !256 !257)
 !259 = (!234 !235 !256 !257)
 !260 = (!234 !235 !256 !257)
@@ -1198,17 +1198,17 @@ script {
 !265 = (!234 !235 !256 !257 !264)
 !266 = (!234 !235 !256 !257)
 !267 = (!234 !235 !256 !257)
-!268 = span !184 89848 89853
+!268 = span !184 90042 90047
 !269 = (!234 !235 !268)
-!270 = span !184 89855 89856
+!270 = span !184 90049 90050
 !271 = (!234 !235 !270)
-!272 = span !184 89819 89858
+!272 = span !184 90013 90052
 !273 = (!234 !235 !272)
 !274 = (!234 !235 !272)
-!275 = span !184 89879 89885
+!275 = span !184 90073 90079
 !276 = (!234 !235 !275)
-!277 = span !184 89879 89899
-!278 = fn_call_path_span !184 89886 89892
+!277 = span !184 90073 90093
+!278 = fn_call_path_span !184 90080 90086
 !279 = (!234 !235 !277 !278)
 !280 = span !184 3973 3977
 !281 = (!234 !235 !277 !278 !280)
@@ -1333,17 +1333,17 @@ script {
 !400 = (!234 !235 !277 !278 !282 !283 !287 !288 !371 !372)
 !401 = (!234 !235 !277 !278 !282 !283 !287 !288)
 !402 = (!234 !235 !277 !278 !282 !283 !287 !288)
-!403 = span !184 89872 89876
+!403 = span !184 90066 90070
 !404 = (!234 !235 !403)
-!405 = span !184 89871 89899
+!405 = span !184 90065 90093
 !406 = (!234 !235 !405)
-!407 = span !184 89913 89914
+!407 = span !184 90107 90108
 !408 = (!234 !235 !407)
-!409 = span !184 89913 89919
-!410 = fn_call_path_span !184 89915 89917
+!409 = span !184 90107 90113
+!410 = fn_call_path_span !184 90109 90111
 !411 = (!234 !235 !409 !410)
 !412 = (!234 !235 !409 !410)
-!413 = span !184 89918 89919
+!413 = span !184 90112 90113
 !414 = (!234 !235 !409 !410)
 !415 = span !28 1322 1326
 !416 = (!234 !235 !409 !410 !415)
@@ -1354,7 +1354,7 @@ script {
 !421 = (!234 !235 !409 !410)
 !422 = (!234 !235 !409)
 !423 = (!234 !235 !409)
-!424 = span !184 89941 89946
+!424 = span !184 90135 90140
 !425 = (!234 !235 !424)
 !426 = "test/src/e2e_vm_tests/reduced_std_libs/sway-lib-std-assert/src/logging.sw"
 !427 = span !426 591 596

test/src/e2e_vm_tests/test_programs/should_pass/language/configurable_dedup_decode/stdout.snap

@@ -226,8 +226,8 @@ script {
 !18 = span !3 71305 71311
 !19 = span !3 71291 71312
 !20 = fn_call_path_span !3 71291 71304
-!21 = span !3 114976 114997
-!22 = fn_call_path_span !3 114976 114989
+!21 = span !3 115350 115371
+!22 = fn_call_path_span !3 115350 115363
 !23 = span !3 71904 71932
 !24 = fn_call_path_span !3 71911 71923
 !25 = span !3 625 637
@@ -241,7 +241,7 @@ script {
 !33 = (!19 !20 !21 !22 !23 !24)
 !34 = span !3 2857 2896
 !35 = (!19 !20 !21 !22 !23 !24 !34)
-!36 = span !3 114975 115000
+!36 = span !3 115349 115374
 !37 = (!19 !20 !36)
 !38 = (!19 !20 !36)
 !39 = (!19 !20 !36)

test/src/e2e_vm_tests/test_programs/should_pass/test_contracts/const_of_contract_call/stdout.snap

@@ -2,67 +2,81 @@
 source: test/src/snapshot/mod.rs
 ---
 > forc test --path test/src/e2e_vm_tests/test_programs/should_pass/test_contracts/const_of_contract_call --release --experimental const_generics
-exit status: 0
+exit status: 101
 output:
     Building test/src/e2e_vm_tests/test_programs/should_pass/test_contracts/const_of_contract_call
    Compiling library std (test/src/e2e_vm_tests/reduced_std_libs/sway-lib-std-core)
    Compiling contract const_of_contract_call (test/src/e2e_vm_tests/test_programs/should_pass/test_contracts/const_of_contract_call)
-    Finished release [optimized + fuel] target(s) [40.528 KB] in ???
+    Finished release [optimized + fuel] target(s) [38.76 KB] in ???
      Running 29 tests, filtered 0 tests
 
 tested -- const_of_contract_call
 
-      test cost_of_in_bool ... ok (???, 2590 gas)
-      test cost_of_in_u8 ... ok (???, 4829 gas)
-      test cost_of_in_u16 ... ok (???, 4446 gas)
-      test cost_of_in_u32 ... ok (???, 4879 gas)
-      test cost_of_in_u64 ... ok (???, 4888 gas)
-      test cost_of_in_u256 ... ok (???, 4730 gas)
-      test cost_of_in_b256 ... ok (???, 2460 gas)
-      test cost_of_in_str_0 ... ok (???, 2997 gas)
-      test cost_of_in_str_1 ... ok (???, 3299 gas)
-      test cost_of_in_str_8 ... ok (???, 3720 gas)
-      test cost_of_in_str_16 ... ok (???, 3330 gas)
-      test cost_of_in_str_32 ... ok (???, 3526 gas)
-      test cost_of_in_array_0 ... ok (???, 1976 gas)
-      test cost_of_in_array_1 ... ok (???, 3164 gas)
-      test cost_of_in_array_8 ... ok (???, 10767 gas)
-      test cost_of_in_array_16 ... ok (???, 16726 gas)
-      test cost_of_in_array_32 ... ok (???, 31337 gas)
-      test cost_of_in_array_64 ... ok (???, 60382 gas)
-      test cost_of_in_tuple_0 ... ok (???, 3777 gas)
-      test cost_of_in_tuple_1 ... ok (???, 4346 gas)
-      test cost_of_in_tuple_2 ... ok (???, 4711 gas)
-      test cost_of_in_tuple_3 ... ok (???, 5058 gas)
-      test cost_of_in_tuple_4 ... ok (???, 5422 gas)
-      test in_struct_u64 ... ok (???, 3589 gas)
-      test in_struct_u64_u64 ... ok (???, 3847 gas)
-      test in_struct_u64_u64_u64 ... ok (???, 4110 gas)
-      test in_enum_u64 ... ok (???, 3149 gas)
-      test in_enum_u64_u64 ... ok (???, 3020 gas)
-      test in_enum_u64_u64_u64 ... ok (???, 3130 gas)
-
-test result: OK. 29 passed; 0 failed; finished in ???
+      test cost_of_in_bool ... ok (???, 2627 gas)
+      test cost_of_in_u8 ... ok (???, 4874 gas)
+      test cost_of_in_u16 ... ok (???, 4493 gas)
+      test cost_of_in_u32 ... ok (???, 4926 gas)
+      test cost_of_in_u64 ... ok (???, 4934 gas)
+      test cost_of_in_u256 ... ok (???, 4777 gas)
+      test cost_of_in_b256 ... ok (???, 2491 gas)
+      test cost_of_in_str_0 ... ok (???, 3043 gas)
+      test cost_of_in_str_1 ... ok (???, 3345 gas)
+      test cost_of_in_str_8 ... ok (???, 3768 gas)
+      test cost_of_in_str_16 ... ok (???, 3374 gas)
+      test cost_of_in_str_32 ... ok (???, 3572 gas)
+      test cost_of_in_array_0 ... FAILED (???, 1632 gas)
+      test cost_of_in_array_1 ... ok (???, 2125 gas)
+      test cost_of_in_array_8 ... ok (???, 4724 gas)
+      test cost_of_in_array_16 ... ok (???, 5096 gas)
+      test cost_of_in_array_32 ... ok (???, 8421 gas)
+      test cost_of_in_array_64 ... ok (???, 14895 gas)
+      test cost_of_in_tuple_0 ... ok (???, 3822 gas)
+      test cost_of_in_tuple_1 ... ok (???, 4392 gas)
+      test cost_of_in_tuple_2 ... ok (???, 4761 gas)
+      test cost_of_in_tuple_3 ... ok (???, 5104 gas)
+      test cost_of_in_tuple_4 ... ok (???, 5468 gas)
+      test in_struct_u64 ... ok (???, 3635 gas)
+      test in_struct_u64_u64 ... ok (???, 3897 gas)
+      test in_struct_u64_u64_u64 ... ok (???, 4156 gas)
+      test in_enum_u64 ... ok (???, 3186 gas)
+      test in_enum_u64_u64 ... ok (???, 3061 gas)
+      test in_enum_u64_u64_u64 ... ok (???, 3173 gas)
+
+   failures:
+      test cost_of_in_array_0, "test/src/e2e_vm_tests/test_programs/should_pass/test_contracts/const_of_contract_call/src/main.sw":347
+           revert code: 0
+
+
+
+test result: FAILED. 28 passed; 1 failed; finished in ???
 
     Finished in ???
+error: Some tests failed.
 
 > Block: ARRAY0
 > forc test --path test/src/e2e_vm_tests/test_programs/should_pass/test_contracts/const_of_contract_call --release --experimental const_generics
-exit status: 0
+exit status: 101
 output:
     Building test/src/e2e_vm_tests/test_programs/should_pass/test_contracts/const_of_contract_call
    Compiling library std (test/src/e2e_vm_tests/reduced_std_libs/sway-lib-std-core)
    Compiling contract const_of_contract_call (test/src/e2e_vm_tests/test_programs/should_pass/test_contracts/const_of_contract_call)
-    Finished release [optimized + fuel] target(s) [2.784 KB] in ???
+    Finished release [optimized + fuel] target(s) [2.448 KB] in ???
      Running 1 test, filtered 0 tests
 
 tested -- const_of_contract_call
 
-      test cost_of_in_array_0 ... ok (???, 1664 gas)
+      test cost_of_in_array_0 ... FAILED (???, 1262 gas)
+
+   failures:
+      test cost_of_in_array_0, "test/src/e2e_vm_tests/test_programs/should_pass/test_contracts/const_of_contract_call/src/main.sw":175
+           revert code: 0
 
-test result: OK. 1 passed; 0 failed; finished in ???
+
+
+test result: FAILED. 0 passed; 1 failed; finished in ???
 
     Finished in ???
+error: Some tests failed.
 
 > Block: ARRAY1
 > forc test --path test/src/e2e_vm_tests/test_programs/should_pass/test_contracts/const_of_contract_call --release --experimental const_generics
@@ -71,12 +85,12 @@ output:
     Building test/src/e2e_vm_tests/test_programs/should_pass/test_contracts/const_of_contract_call
    Compiling library std (test/src/e2e_vm_tests/reduced_std_libs/sway-lib-std-core)
    Compiling contract const_of_contract_call (test/src/e2e_vm_tests/test_programs/should_pass/test_contracts/const_of_contract_call)
-    Finished release [optimized + fuel] target(s) [2.968 KB] in ???
+    Finished release [optimized + fuel] target(s) [2.624 KB] in ???
      Running 1 test, filtered 0 tests
 
 tested -- const_of_contract_call
 
-      test cost_of_in_array_1 ... ok (???, 2630 gas)
+      test cost_of_in_array_1 ... ok (???, 1515 gas)
 
 test result: OK. 1 passed; 0 failed; finished in ???
 
@@ -89,12 +103,12 @@ output:
     Building test/src/e2e_vm_tests/test_programs/should_pass/test_contracts/const_of_contract_call
    Compiling library std (test/src/e2e_vm_tests/reduced_std_libs/sway-lib-std-core)
    Compiling contract const_of_contract_call (test/src/e2e_vm_tests/test_programs/should_pass/test_contracts/const_of_contract_call)
-    Finished release [optimized + fuel] target(s) [2.992 KB] in ???
+    Finished release [optimized + fuel] target(s) [2.648 KB] in ???
      Running 1 test, filtered 0 tests
 
 tested -- const_of_contract_call
 
-      test cost_of_in_array_16 ... ok (???, 15867 gas)
+      test cost_of_in_array_16 ... ok (???, 3955 gas)
 
 test result: OK. 1 passed; 0 failed; finished in ???
 
@@ -107,12 +121,12 @@ output:
     Building test/src/e2e_vm_tests/test_programs/should_pass/test_contracts/const_of_contract_call
    Compiling library std (test/src/e2e_vm_tests/reduced_std_libs/sway-lib-std-core)
    Compiling contract const_of_contract_call (test/src/e2e_vm_tests/test_programs/should_pass/test_contracts/const_of_contract_call)
-    Finished release [optimized + fuel] target(s) [2.992 KB] in ???
+    Finished release [optimized + fuel] target(s) [2.648 KB] in ???
      Running 1 test, filtered 0 tests
 
 tested -- const_of_contract_call
 
-      test cost_of_in_array_32 ... ok (???, 29967 gas)
+      test cost_of_in_array_32 ... ok (???, 6544 gas)
 
 test result: OK. 1 passed; 0 failed; finished in ???
 
@@ -125,12 +139,12 @@ output:
     Building test/src/e2e_vm_tests/test_programs/should_pass/test_contracts/const_of_contract_call
    Compiling library std (test/src/e2e_vm_tests/reduced_std_libs/sway-lib-std-core)
    Compiling contract const_of_contract_call (test/src/e2e_vm_tests/test_programs/should_pass/test_contracts/const_of_contract_call)
-    Finished release [optimized + fuel] target(s) [3.192 KB] in ???
+    Finished release [optimized + fuel] target(s) [2.848 KB] in ???
      Running 1 test, filtered 0 tests
 
 tested -- const_of_contract_call
 
-      test cost_of_in_array_64 ... ok (???, 58218 gas)
+      test cost_of_in_array_64 ... ok (???, 11787 gas)
 
 test result: OK. 1 passed; 0 failed; finished in ???
 
@@ -143,12 +157,12 @@ output:
     Building test/src/e2e_vm_tests/test_programs/should_pass/test_contracts/const_of_contract_call
    Compiling library std (test/src/e2e_vm_tests/reduced_std_libs/sway-lib-std-core)
    Compiling contract const_of_contract_call (test/src/e2e_vm_tests/test_programs/should_pass/test_contracts/const_of_contract_call)
-    Finished release [optimized + fuel] target(s) [3.12 KB] in ???
+    Finished release [optimized + fuel] target(s) [2.784 KB] in ???
      Running 1 test, filtered 0 tests
 
 tested -- const_of_contract_call
 
-      test cost_of_in_array_8 ... ok (???, 9566 gas)
+      test cost_of_in_array_8 ... ok (???, 3225 gas)
 
 test result: OK. 1 passed; 0 failed; finished in ???
 

test/src/snapshot/mod.rs

@@ -74,8 +74,8 @@ pub(super) async fn run(filter_regex: Option<&regex::Regex>) -> Result<()> {
             Trial::test(name.clone(), move || {
                 let snapshot_toml =
                     std::fs::read_to_string(format!("{}/snapshot.toml", dir.display()))?;
-                let snapshot_toml = if snapshot_toml.is_empty() {
-                    "cmds = [ \"forc build --path {root}\"]".to_string()
+                let snapshot_toml = if snapshot_toml.trim().is_empty() {
+                    "cmds = [ \"forc build --path {root}\" ]".to_string()
                 } else {
                     snapshot_toml
                 };