ethereum · clonker · Apr 10, 2025 · Apr 10, 2025
diff --git a/test/cmdlineTests.sh b/test/cmdlineTests.sh
@@ -82,17 +82,33 @@ do
     test_name_filter+=(-and -not -name "$pattern")
 done
 
+# shellcheck disable=SC2207 # We do not support test names containing spaces.
+all_tests=($(find . -mindepth 1 -maxdepth 2 -type d | \
+    while read -r dir; do
+        if ! find "$dir" -mindepth 1 -maxdepth 1 -type d | grep -q .; then
+            echo "${dir#./}"
+        fi
+    done
+))
+
+selected_tests=()
+for test_path in "${all_tests[@]}"; do
+    num_matches=$(find "$test_path" -type d "${test_name_filter[@]}" | wc -l)
+    if [ "$num_matches" -ge 1 ]; then
+        selected_tests+=("$test_path")
+    fi
+done
 # NOTE: We want leading symbols in names to affect the sort order but without
 # LC_COLLATE=C sort seems to ignore them.
 # shellcheck disable=SC2207 # We do not support test names containing spaces.
-selected_tests=($(find . -mindepth 1 -maxdepth 1 -type d "${test_name_filter[@]}" | cut -c 3- | LC_COLLATE=C sort))
+selected_tests=($(printf '%s\n' "${selected_tests[@]}" | LC_COLLATE=C sort))
 
 if (( ${#selected_tests[@]} == 0 ))
 then
     printWarning "The pattern '${test_name_filter[*]}' did not match any tests."
     exit 0;
 else
-    test_count=$(find . -mindepth 1 -maxdepth 1 -type d | wc -l)
+    test_count=$(printf '%s\n' "${all_tests[@]}" | wc -l)
     printLog "Selected ${#selected_tests[@]} out of ${test_count} tests."
 fi
 
@@ -367,7 +383,7 @@ printTask "Running general commandline tests..."
         fi
 
         # Strip trailing slash from $tdir.
-        tdir=$(basename "${tdir}")
+        tdir=${tdir%/}
         if [[ $no_smt == true ]]
         then
             if [[ $tdir =~ .*model_checker_.* ]]

diff --git a/...neTests/ethdebug_eof_container_osaka/args → ...thdebug/ethdebug_eof_container_osaka/args b/...neTests/ethdebug_eof_container_osaka/args → ...thdebug/ethdebug_eof_container_osaka/args
diff --git a/...ineTests/ethdebug_eof_container_osaka/err → ...ethdebug/ethdebug_eof_container_osaka/err b/...ineTests/ethdebug_eof_container_osaka/err → ...ethdebug/ethdebug_eof_container_osaka/err
diff --git a/...neTests/ethdebug_eof_container_osaka/exit → ...thdebug/ethdebug_eof_container_osaka/exit b/...neTests/ethdebug_eof_container_osaka/exit → ...thdebug/ethdebug_eof_container_osaka/exit
diff --git a/...ts/ethdebug_eof_container_osaka/input.sol → ...ug/ethdebug_eof_container_osaka/input.sol b/...ts/ethdebug_eof_container_osaka/input.sol → ...ug/ethdebug_eof_container_osaka/input.sol
diff --git a/test/cmdlineTests/ethdebug/ethdebug_eof_container_osaka/output b/test/cmdlineTests/ethdebug/ethdebug_eof_container_osaka/output
@@ -0,0 +1,4 @@
+======= Debug Data (ethdebug/format/info/resources) =======
+{"compilation":{"compiler":{"name":"solc","version": "<VERSION REMOVED>"},"sources":[{"id":0,"path":"ethdebug/ethdebug_eof_container_osaka/input.sol"}]}}
+
+======= ethdebug/ethdebug_eof_container_osaka/input.sol:C =======
diff --git a/..._debuginfo_ethdebug_compatible/input.json → ..._debuginfo_ethdebug_compatible/input.json b/..._debuginfo_ethdebug_compatible/input.json → ..._debuginfo_ethdebug_compatible/input.json
diff --git a/...debuginfo_ethdebug_compatible/output.json → ...debuginfo_ethdebug_compatible/output.json b/...debuginfo_ethdebug_compatible/output.json → ...debuginfo_ethdebug_compatible/output.json
diff --git a/...uginfo_ethdebug_compatible/strip-ethdebug → ...uginfo_ethdebug_compatible/strip-ethdebug b/...uginfo_ethdebug_compatible/strip-ethdebug → ...uginfo_ethdebug_compatible/strip-ethdebug
diff --git a/...ebuginfo_ethdebug_incompatible/input.json → ...ebuginfo_ethdebug_incompatible/input.json b/...ebuginfo_ethdebug_incompatible/input.json → ...ebuginfo_ethdebug_incompatible/input.json
diff --git a/...buginfo_ethdebug_incompatible/output.json → ...buginfo_ethdebug_incompatible/output.json b/...buginfo_ethdebug_incompatible/output.json → ...buginfo_ethdebug_incompatible/output.json
diff --git a/...tecode_and_deployedbytecode_ir/input.json → ...tecode_and_deployedbytecode_ir/input.json b/...tecode_and_deployedbytecode_ir/input.json → ...tecode_and_deployedbytecode_ir/input.json
diff --git a/...ecode_and_deployedbytecode_ir/output.json → ...ecode_and_deployedbytecode_ir/output.json b/...ecode_and_deployedbytecode_ir/output.json → ...ecode_and_deployedbytecode_ir/output.json
diff --git a/...de_and_deployedbytecode_ir/strip-ethdebug → ...de_and_deployedbytecode_ir/strip-ethdebug b/...de_and_deployedbytecode_ir/strip-ethdebug → ...de_and_deployedbytecode_ir/strip-ethdebug
diff --git a/...d_deployedbytecode_iroptimized/input.json → ...d_deployedbytecode_iroptimized/input.json b/...d_deployedbytecode_iroptimized/input.json → ...d_deployedbytecode_iroptimized/input.json
diff --git a/..._deployedbytecode_iroptimized/output.json → ..._deployedbytecode_iroptimized/output.json b/..._deployedbytecode_iroptimized/output.json → ..._deployedbytecode_iroptimized/output.json
diff --git a/...ployedbytecode_iroptimized/strip-ethdebug → ...ployedbytecode_iroptimized/strip-ethdebug b/...ployedbytecode_iroptimized/strip-ethdebug → ...ployedbytecode_iroptimized/strip-ethdebug
diff --git a/..._deployedbytecode_optimizer_ir/input.json → ..._deployedbytecode_optimizer_ir/input.json b/..._deployedbytecode_optimizer_ir/input.json → ..._deployedbytecode_optimizer_ir/input.json
diff --git a/...deployedbytecode_optimizer_ir/output.json → ...deployedbytecode_optimizer_ir/output.json b/...deployedbytecode_optimizer_ir/output.json → ...deployedbytecode_optimizer_ir/output.json
diff --git a/...bytecode_optimizer_iroptimized/input.json → ...bytecode_optimizer_iroptimized/input.json b/...bytecode_optimizer_iroptimized/input.json → ...bytecode_optimizer_iroptimized/input.json
diff --git a/...ytecode_optimizer_iroptimized/output.json → ...ytecode_optimizer_iroptimized/output.json b/...ytecode_optimizer_iroptimized/output.json → ...ytecode_optimizer_iroptimized/output.json
diff --git a/...selection_ethdebug_bytecode_ir/input.json → ...selection_ethdebug_bytecode_ir/input.json b/...selection_ethdebug_bytecode_ir/input.json → ...selection_ethdebug_bytecode_ir/input.json
diff --git a/...election_ethdebug_bytecode_ir/output.json → ...election_ethdebug_bytecode_ir/output.json b/...election_ethdebug_bytecode_ir/output.json → ...election_ethdebug_bytecode_ir/output.json
diff --git a/...ction_ethdebug_bytecode_ir/strip-ethdebug → ...ction_ethdebug_bytecode_ir/strip-ethdebug b/...ction_ethdebug_bytecode_ir/strip-ethdebug → ...ction_ethdebug_bytecode_ir/strip-ethdebug
diff --git a/..._ethdebug_bytecode_iroptimized/input.json → ..._ethdebug_bytecode_iroptimized/input.json b/..._ethdebug_bytecode_iroptimized/input.json → ..._ethdebug_bytecode_iroptimized/input.json
diff --git a/...ethdebug_bytecode_iroptimized/output.json → ...ethdebug_bytecode_iroptimized/output.json b/...ethdebug_bytecode_iroptimized/output.json → ...ethdebug_bytecode_iroptimized/output.json
diff --git a/...debug_bytecode_iroptimized/strip-ethdebug → ...debug_bytecode_iroptimized/strip-ethdebug b/...debug_bytecode_iroptimized/strip-ethdebug → ...debug_bytecode_iroptimized/strip-ethdebug
diff --git a/...n_ethdebug_deployedbytecode_ir/input.json → ...n_ethdebug_deployedbytecode_ir/input.json b/...n_ethdebug_deployedbytecode_ir/input.json → ...n_ethdebug_deployedbytecode_ir/input.json
diff --git a/..._ethdebug_deployedbytecode_ir/output.json → ..._ethdebug_deployedbytecode_ir/output.json b/..._ethdebug_deployedbytecode_ir/output.json → ..._ethdebug_deployedbytecode_ir/output.json
diff --git a/...hdebug_deployedbytecode_ir/strip-ethdebug → ...hdebug_deployedbytecode_ir/strip-ethdebug b/...hdebug_deployedbytecode_ir/strip-ethdebug → ...hdebug_deployedbytecode_ir/strip-ethdebug
diff --git a/...g_deployedbytecode_iroptimized/input.json → ...g_deployedbytecode_iroptimized/input.json b/...g_deployedbytecode_iroptimized/input.json → ...g_deployedbytecode_iroptimized/input.json
diff --git a/..._deployedbytecode_iroptimized/output.json → ..._deployedbytecode_iroptimized/output.json b/..._deployedbytecode_iroptimized/output.json → ..._deployedbytecode_iroptimized/output.json
diff --git a/...ployedbytecode_iroptimized/strip-ethdebug → ...ployedbytecode_iroptimized/strip-ethdebug b/...ployedbytecode_iroptimized/strip-ethdebug → ...ployedbytecode_iroptimized/strip-ethdebug
diff --git a/...d_output_selection_ethdebug_ir/input.json → ...d_output_selection_ethdebug_ir/input.json b/...d_output_selection_ethdebug_ir/input.json → ...d_output_selection_ethdebug_ir/input.json
diff --git a/..._output_selection_ethdebug_ir/output.json → ..._output_selection_ethdebug_ir/output.json b/..._output_selection_ethdebug_ir/output.json → ..._output_selection_ethdebug_ir/output.json
diff --git a/...tput_selection_ethdebug_ir/strip-ethdebug → ...tput_selection_ethdebug_ir/strip-ethdebug b/...tput_selection_ethdebug_ir/strip-ethdebug → ...tput_selection_ethdebug_ir/strip-ethdebug
diff --git a/...selection_ethdebug_iroptimized/input.json → ...selection_ethdebug_iroptimized/input.json b/...selection_ethdebug_iroptimized/input.json → ...selection_ethdebug_iroptimized/input.json
diff --git a/...election_ethdebug_iroptimized/output.json → ...election_ethdebug_iroptimized/output.json b/...election_ethdebug_iroptimized/output.json → ...election_ethdebug_iroptimized/output.json
diff --git a/...ction_ethdebug_iroptimized/strip-ethdebug → ...ction_ethdebug_iroptimized/strip-ethdebug b/...ction_ethdebug_iroptimized/strip-ethdebug → ...ction_ethdebug_iroptimized/strip-ethdebug
diff --git a/...ut_selection_ethdebug_no_viair/input.json → ...ut_selection_ethdebug_no_viair/input.json b/...ut_selection_ethdebug_no_viair/input.json → ...ut_selection_ethdebug_no_viair/input.json
diff --git a/...t_selection_ethdebug_no_viair/output.json → ...t_selection_ethdebug_no_viair/output.json b/...t_selection_ethdebug_no_viair/output.json → ...t_selection_ethdebug_no_viair/output.json
diff --git a/...selection_ethdebug_optimize_ir/input.json → ...selection_ethdebug_optimize_ir/input.json b/...selection_ethdebug_optimize_ir/input.json → ...selection_ethdebug_optimize_ir/input.json
diff --git a/...election_ethdebug_optimize_ir/output.json → ...election_ethdebug_optimize_ir/output.json b/...election_ethdebug_optimize_ir/output.json → ...election_ethdebug_optimize_ir/output.json
diff --git a/..._ethdebug_optimize_iroptimized/input.json → ..._ethdebug_optimize_iroptimized/input.json b/..._ethdebug_optimize_iroptimized/input.json → ..._ethdebug_optimize_iroptimized/input.json
diff --git a/...ethdebug_optimize_iroptimized/output.json → ...ethdebug_optimize_iroptimized/output.json b/...ethdebug_optimize_iroptimized/output.json → ...ethdebug_optimize_iroptimized/output.json
diff --git a/...ebug_info_ethdebug_compatible_output/args → ...ebug_info_ethdebug_compatible_output/args b/...ebug_info_ethdebug_compatible_output/args → ...ebug_info_ethdebug_compatible_output/args
diff --git a/...ug_info_ethdebug_compatible_output/in.yul → ...ug_info_ethdebug_compatible_output/in.yul b/...ug_info_ethdebug_compatible_output/in.yul → ...ug_info_ethdebug_compatible_output/in.yul
diff --git a/...nfo_ethdebug_compatible_output/input.json → ...nfo_ethdebug_compatible_output/input.json b/...nfo_ethdebug_compatible_output/input.json → ...nfo_ethdebug_compatible_output/input.json
@@ -3,7 +3,7 @@
 	"sources": {
 		"C": {
 			"urls": [
-				"standard_yul_debug_info_ethdebug_compatible_output/in.yul"
+				"ethdebug/standard_yul_debug_info_ethdebug_compatible_output/in.yul"
 			]
 		}
 	},

diff --git a/...fo_ethdebug_compatible_output/output.json → ...fo_ethdebug_compatible_output/output.json b/...fo_ethdebug_compatible_output/output.json → ...fo_ethdebug_compatible_output/output.json
diff --git a/...ethdebug_compatible_output/strip-ethdebug → ...ethdebug_compatible_output/strip-ethdebug b/...ethdebug_compatible_output/strip-ethdebug → ...ethdebug_compatible_output/strip-ethdebug
diff --git a/...ug_info_ethdebug_incompatible_output/args → ...ug_info_ethdebug_incompatible_output/args b/...ug_info_ethdebug_incompatible_output/args → ...ug_info_ethdebug_incompatible_output/args
diff --git a/..._info_ethdebug_incompatible_output/in.yul → ..._info_ethdebug_incompatible_output/in.yul b/..._info_ethdebug_incompatible_output/in.yul → ..._info_ethdebug_incompatible_output/in.yul
diff --git a/...o_ethdebug_incompatible_output/input.json → ...o_ethdebug_incompatible_output/input.json b/...o_ethdebug_incompatible_output/input.json → ...o_ethdebug_incompatible_output/input.json
@@ -3,7 +3,7 @@
 	"sources": {
 		"C": {
 			"urls": [
-				"standard_yul_debug_info_ethdebug_incompatible_output/in.yul"
+				"ethdebug/standard_yul_debug_info_ethdebug_incompatible_output/in.yul"
 			]
 		}
 	},

diff --git a/..._ethdebug_incompatible_output/output.json → ..._ethdebug_incompatible_output/output.json b/..._ethdebug_incompatible_output/output.json → ..._ethdebug_incompatible_output/output.json
diff --git a/...info_ethdebug_verbatim_unimplemented/args → ...info_ethdebug_verbatim_unimplemented/args b/...info_ethdebug_verbatim_unimplemented/args → ...info_ethdebug_verbatim_unimplemented/args
diff --git a/...fo_ethdebug_verbatim_unimplemented/in.yul → ...fo_ethdebug_verbatim_unimplemented/in.yul b/...fo_ethdebug_verbatim_unimplemented/in.yul → ...fo_ethdebug_verbatim_unimplemented/in.yul
diff --git a/...thdebug_verbatim_unimplemented/input.json → ...thdebug_verbatim_unimplemented/input.json b/...thdebug_verbatim_unimplemented/input.json → ...thdebug_verbatim_unimplemented/input.json
@@ -3,7 +3,7 @@
 	"sources": {
 		"C": {
 			"urls": [
-				"standard_yul_debug_info_ethdebug_verbatim_unimplemented/in.yul"
+				"ethdebug/standard_yul_debug_info_ethdebug_verbatim_unimplemented/in.yul"
 			]
 		}
 	},

diff --git a/...hdebug_verbatim_unimplemented/output.json → ...hdebug_verbatim_unimplemented/output.json b/...hdebug_verbatim_unimplemented/output.json → ...hdebug_verbatim_unimplemented/output.json
diff --git a/...andard_yul_ethdebug_assign_immutable/args → ...andard_yul_ethdebug_assign_immutable/args b/...andard_yul_ethdebug_assign_immutable/args → ...andard_yul_ethdebug_assign_immutable/args
diff --git a/...dard_yul_ethdebug_assign_immutable/in.yul → ...dard_yul_ethdebug_assign_immutable/in.yul b/...dard_yul_ethdebug_assign_immutable/in.yul → ...dard_yul_ethdebug_assign_immutable/in.yul
diff --git a/..._yul_ethdebug_assign_immutable/input.json → ..._yul_ethdebug_assign_immutable/input.json b/..._yul_ethdebug_assign_immutable/input.json → ..._yul_ethdebug_assign_immutable/input.json
@@ -1,7 +1,7 @@
 {
 	"language": "Yul",
 	"sources": {
-		"C": {"urls": ["standard_yul_ethdebug_assign_immutable/in.yul"]}
+		"C": {"urls": ["ethdebug/standard_yul_ethdebug_assign_immutable/in.yul"]}
 	},
 	"settings": {
 		"outputSelection": {

diff --git a/...yul_ethdebug_assign_immutable/output.json → ...yul_ethdebug_assign_immutable/output.json b/...yul_ethdebug_assign_immutable/output.json → ...yul_ethdebug_assign_immutable/output.json
diff --git a/...ts/standard_yul_ethdebug_bytecode_ir/args → ...ug/standard_yul_ethdebug_bytecode_ir/args b/...ts/standard_yul_ethdebug_bytecode_ir/args → ...ug/standard_yul_ethdebug_bytecode_ir/args
diff --git a/.../standard_yul_ethdebug_bytecode_ir/in.yul → .../standard_yul_ethdebug_bytecode_ir/in.yul b/.../standard_yul_ethdebug_bytecode_ir/in.yul → .../standard_yul_ethdebug_bytecode_ir/in.yul
diff --git a/...Tests/standard_yul_ethdebug_ir/input.json → ...ndard_yul_ethdebug_bytecode_ir/input.json b/...Tests/standard_yul_ethdebug_ir/input.json → ...ndard_yul_ethdebug_bytecode_ir/input.json
@@ -1,7 +1,7 @@
 {
 	"language": "Yul",
 	"sources": {
-		"C": {"urls": ["standard_yul_ethdebug_ir/in.yul"]}
+		"C": {"urls": ["ethdebug/standard_yul_ethdebug_bytecode_ir/in.yul"]}
 	},
 	"settings": {
 		"outputSelection": {

diff --git a/...dard_yul_ethdebug_bytecode_ir/output.json → ...dard_yul_ethdebug_bytecode_ir/output.json b/...dard_yul_ethdebug_bytecode_ir/output.json → ...dard_yul_ethdebug_bytecode_ir/output.json
diff --git a/...d_yul_ethdebug_bytecode_ir/strip-ethdebug → ...d_yul_ethdebug_bytecode_ir/strip-ethdebug b/...d_yul_ethdebug_bytecode_ir/strip-ethdebug → ...d_yul_ethdebug_bytecode_ir/strip-ethdebug
diff --git a/...rd_yul_ethdebug_bytecode_iroptimized/args → ...rd_yul_ethdebug_bytecode_iroptimized/args b/...rd_yul_ethdebug_bytecode_iroptimized/args → ...rd_yul_ethdebug_bytecode_iroptimized/args
diff --git a/..._yul_ethdebug_bytecode_iroptimized/in.yul → ..._yul_ethdebug_bytecode_iroptimized/in.yul b/..._yul_ethdebug_bytecode_iroptimized/in.yul → ..._yul_ethdebug_bytecode_iroptimized/in.yul
diff --git a/..._ethdebug_bytecode_iroptimized/input.json → ..._ethdebug_bytecode_iroptimized/input.json b/..._ethdebug_bytecode_iroptimized/input.json → ..._ethdebug_bytecode_iroptimized/input.json
@@ -1,7 +1,7 @@
 {
 	"language": "Yul",
 	"sources": {
-		"C": {"urls": ["standard_yul_ethdebug_bytecode_iroptimized/in.yul"]}
+		"C": {"urls": ["ethdebug/standard_yul_ethdebug_bytecode_iroptimized/in.yul"]}
 	},
 	"settings": {
 		"outputSelection": {

diff --git a/...ethdebug_bytecode_iroptimized/output.json → ...ethdebug_bytecode_iroptimized/output.json b/...ethdebug_bytecode_iroptimized/output.json → ...ethdebug_bytecode_iroptimized/output.json
diff --git a/...debug_bytecode_iroptimized/strip-ethdebug → ...debug_bytecode_iroptimized/strip-ethdebug b/...debug_bytecode_iroptimized/strip-ethdebug → ...debug_bytecode_iroptimized/strip-ethdebug
diff --git a/...ndard_yul_ethdebug_deployed_bytecode/args → ...ndard_yul_ethdebug_deployed_bytecode/args b/...ndard_yul_ethdebug_deployed_bytecode/args → ...ndard_yul_ethdebug_deployed_bytecode/args
diff --git a/...ard_yul_ethdebug_deployed_bytecode/in.yul → ...ard_yul_ethdebug_deployed_bytecode/in.yul b/...ard_yul_ethdebug_deployed_bytecode/in.yul → ...ard_yul_ethdebug_deployed_bytecode/in.yul
diff --git a/...yul_ethdebug_deployed_bytecode/input.json → ...yul_ethdebug_deployed_bytecode/input.json b/...yul_ethdebug_deployed_bytecode/input.json → ...yul_ethdebug_deployed_bytecode/input.json
@@ -1,7 +1,7 @@
 {
 	"language": "Yul",
 	"sources": {
-		"C": {"urls": ["standard_yul_ethdebug_deployed_bytecode/in.yul"]}
+		"C": {"urls": ["ethdebug/standard_yul_ethdebug_deployed_bytecode/in.yul"]}
 	},
 	"settings": {
 		"outputSelection": {

diff --git a/...ul_ethdebug_deployed_bytecode/output.json → ...ul_ethdebug_deployed_bytecode/output.json b/...ul_ethdebug_deployed_bytecode/output.json → ...ul_ethdebug_deployed_bytecode/output.json
diff --git a/...ethdebug_deployed_bytecode/strip-ethdebug → ...ethdebug_deployed_bytecode/strip-ethdebug b/...ethdebug_deployed_bytecode/strip-ethdebug → ...ethdebug_deployed_bytecode/strip-ethdebug
diff --git a/...debug_deployed_bytecode_and_bytecode/args → ...debug_deployed_bytecode_and_bytecode/args b/...debug_deployed_bytecode_and_bytecode/args → ...debug_deployed_bytecode_and_bytecode/args
diff --git a/...bug_deployed_bytecode_and_bytecode/in.yul → ...bug_deployed_bytecode_and_bytecode/in.yul b/...bug_deployed_bytecode_and_bytecode/in.yul → ...bug_deployed_bytecode_and_bytecode/in.yul
diff --git a/...deployed_bytecode_and_bytecode/input.json → ...deployed_bytecode_and_bytecode/input.json b/...deployed_bytecode_and_bytecode/input.json → ...deployed_bytecode_and_bytecode/input.json
@@ -1,7 +1,7 @@
 {
 	"language": "Yul",
 	"sources": {
-		"C": {"urls": ["standard_yul_ethdebug_deployed_bytecode/in.yul"]}
+		"C": {"urls": ["ethdebug/standard_yul_ethdebug_deployed_bytecode/in.yul"]}
 	},
 	"settings": {
 		"outputSelection": {

diff --git a/...eployed_bytecode_and_bytecode/output.json → ...eployed_bytecode_and_bytecode/output.json b/...eployed_bytecode_and_bytecode/output.json → ...eployed_bytecode_and_bytecode/output.json
diff --git a/...oyed_bytecode_and_bytecode/strip-ethdebug → ...oyed_bytecode_and_bytecode/strip-ethdebug b/...oyed_bytecode_and_bytecode/strip-ethdebug → ...oyed_bytecode_and_bytecode/strip-ethdebug
diff --git a/...mdlineTests/standard_yul_ethdebug_ir/args → ...ts/ethdebug/standard_yul_ethdebug_ir/args b/...mdlineTests/standard_yul_ethdebug_ir/args → ...ts/ethdebug/standard_yul_ethdebug_ir/args
diff --git a/...lineTests/standard_yul_ethdebug_ir/in.yul → .../ethdebug/standard_yul_ethdebug_ir/in.yul b/...lineTests/standard_yul_ethdebug_ir/in.yul → .../ethdebug/standard_yul_ethdebug_ir/in.yul
diff --git a/...ndard_yul_ethdebug_bytecode_ir/input.json → ...debug/standard_yul_ethdebug_ir/input.json b/...ndard_yul_ethdebug_bytecode_ir/input.json → ...debug/standard_yul_ethdebug_ir/input.json
@@ -1,7 +1,7 @@
 {
 	"language": "Yul",
 	"sources": {
-		"C": {"urls": ["standard_yul_ethdebug_bytecode_ir/in.yul"]}
+		"C": {"urls": ["ethdebug/standard_yul_ethdebug_ir/in.yul"]}
 	},
 	"settings": {
 		"outputSelection": {

diff --git a/...ests/standard_yul_ethdebug_ir/output.json → ...ebug/standard_yul_ethdebug_ir/output.json b/...ests/standard_yul_ethdebug_ir/output.json → ...ebug/standard_yul_ethdebug_ir/output.json
diff --git a/...s/standard_yul_ethdebug_ir/strip-ethdebug → ...g/standard_yul_ethdebug_ir/strip-ethdebug b/...s/standard_yul_ethdebug_ir/strip-ethdebug → ...g/standard_yul_ethdebug_ir/strip-ethdebug
diff --git a/...sts/standard_yul_ethdebug_iroptimize/args → ...bug/standard_yul_ethdebug_iroptimize/args b/...sts/standard_yul_ethdebug_iroptimize/args → ...bug/standard_yul_ethdebug_iroptimize/args
diff --git a/...s/standard_yul_ethdebug_iroptimize/in.yul → ...g/standard_yul_ethdebug_iroptimize/in.yul b/...s/standard_yul_ethdebug_iroptimize/in.yul → ...g/standard_yul_ethdebug_iroptimize/in.yul
diff --git a/...andard_yul_ethdebug_iroptimize/input.json → ...andard_yul_ethdebug_iroptimize/input.json b/...andard_yul_ethdebug_iroptimize/input.json → ...andard_yul_ethdebug_iroptimize/input.json
@@ -1,7 +1,7 @@
 {
 	"language": "Yul",
 	"sources": {
-		"C": {"urls": ["standard_yul_ethdebug_iroptimize/in.yul"]}
+		"C": {"urls": ["ethdebug/standard_yul_ethdebug_iroptimize/in.yul"]}
 	},
 	"settings": {
 		"outputSelection": {

diff --git a/...ndard_yul_ethdebug_iroptimize/output.json → ...ndard_yul_ethdebug_iroptimize/output.json b/...ndard_yul_ethdebug_iroptimize/output.json → ...ndard_yul_ethdebug_iroptimize/output.json
diff --git a/...rd_yul_ethdebug_iroptimize/strip-ethdebug → ...rd_yul_ethdebug_iroptimize/strip-ethdebug b/...rd_yul_ethdebug_iroptimize/strip-ethdebug → ...rd_yul_ethdebug_iroptimize/strip-ethdebug
diff --git a/...ts/standard_yul_ethdebug_optimize_ir/args → ...ug/standard_yul_ethdebug_optimize_ir/args b/...ts/standard_yul_ethdebug_optimize_ir/args → ...ug/standard_yul_ethdebug_optimize_ir/args
diff --git a/.../standard_yul_ethdebug_optimize_ir/in.yul → .../standard_yul_ethdebug_optimize_ir/in.yul b/.../standard_yul_ethdebug_optimize_ir/in.yul → .../standard_yul_ethdebug_optimize_ir/in.yul
diff --git a/...ndard_yul_ethdebug_optimize_ir/input.json → ...ndard_yul_ethdebug_optimize_ir/input.json b/...ndard_yul_ethdebug_optimize_ir/input.json → ...ndard_yul_ethdebug_optimize_ir/input.json
@@ -1,7 +1,7 @@
 {
 	"language": "Yul",
 	"sources": {
-		"C": {"urls": ["standard_yul_ethdebug_optimize_ir/in.yul"]}
+		"C": {"urls": ["ethdebug/standard_yul_ethdebug_optimize_ir/in.yul"]}
 	},
 	"settings": {
 		"optimizer": {

diff --git a/...dard_yul_ethdebug_optimize_ir/output.json → ...dard_yul_ethdebug_optimize_ir/output.json b/...dard_yul_ethdebug_optimize_ir/output.json → ...dard_yul_ethdebug_optimize_ir/output.json
diff --git a/...rd_yul_ethdebug_optimize_iroptimized/args → ...rd_yul_ethdebug_optimize_iroptimized/args b/...rd_yul_ethdebug_optimize_iroptimized/args → ...rd_yul_ethdebug_optimize_iroptimized/args
diff --git a/..._yul_ethdebug_optimize_iroptimized/in.yul → ..._yul_ethdebug_optimize_iroptimized/in.yul b/..._yul_ethdebug_optimize_iroptimized/in.yul → ..._yul_ethdebug_optimize_iroptimized/in.yul
diff --git a/..._ethdebug_optimize_iroptimized/input.json → ..._ethdebug_optimize_iroptimized/input.json b/..._ethdebug_optimize_iroptimized/input.json → ..._ethdebug_optimize_iroptimized/input.json
@@ -1,7 +1,7 @@
 {
 	"language": "Yul",
 	"sources": {
-		"C": {"urls": ["standard_yul_ethdebug_optimize_iroptimized/in.yul"]}
+		"C": {"urls": ["ethdebug/standard_yul_ethdebug_optimize_iroptimized/in.yul"]}
 	},
 	"settings": {
 		"optimizer": {

diff --git a/...ethdebug_optimize_iroptimized/output.json → ...ethdebug_optimize_iroptimized/output.json b/...ethdebug_optimize_iroptimized/output.json → ...ethdebug_optimize_iroptimized/output.json
diff --git a/test/cmdlineTests/ethdebug_eof_container_osaka/output b/test/cmdlineTests/ethdebug_eof_container_osaka/output