From 11ba774eda37df642400e568740c33121ddc9ed0 Mon Sep 17 00:00:00 2001
From: clonker <1685266+clonker@users.noreply.github.com>
Date: Thu, 10 Apr 2025 12:42:03 +0200
Subject: [PATCH 1/2] allow cmdline tests to be in a directory hierarchy

---
 test/cmdlineTests.sh | 22 +++++++++++++++++++---
 1 file changed, 19 insertions(+), 3 deletions(-)

diff --git a/test/cmdlineTests.sh b/test/cmdlineTests.sh
index f68ed53dc066..6004e3538cd8 100755
--- 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_.* ]]

From b5e4577962cb0e7b3154e7281fe8b63fedc32217 Mon Sep 17 00:00:00 2001
From: clonker <1685266+clonker@users.noreply.github.com>
Date: Thu, 10 Apr 2025 12:42:29 +0200
Subject: [PATCH 2/2] move ethdebug cmdline tests into their own directory

---
 .../{ => ethdebug}/ethdebug_eof_container_osaka/args          | 0
 .../{ => ethdebug}/ethdebug_eof_container_osaka/err           | 0
 .../{ => ethdebug}/ethdebug_eof_container_osaka/exit          | 0
 .../{ => ethdebug}/ethdebug_eof_container_osaka/input.sol     | 0
 .../cmdlineTests/ethdebug/ethdebug_eof_container_osaka/output | 4 ++++
 .../standard_output_debuginfo_ethdebug_compatible/input.json  | 0
 .../standard_output_debuginfo_ethdebug_compatible/output.json | 0
 .../strip-ethdebug                                            | 0
 .../input.json                                                | 0
 .../output.json                                               | 0
 .../input.json                                                | 0
 .../output.json                                               | 0
 .../strip-ethdebug                                            | 0
 .../input.json                                                | 0
 .../output.json                                               | 0
 .../strip-ethdebug                                            | 0
 .../input.json                                                | 0
 .../output.json                                               | 0
 .../input.json                                                | 0
 .../output.json                                               | 0
 .../standard_output_selection_ethdebug_bytecode_ir/input.json | 0
 .../output.json                                               | 0
 .../strip-ethdebug                                            | 0
 .../input.json                                                | 0
 .../output.json                                               | 0
 .../strip-ethdebug                                            | 0
 .../input.json                                                | 0
 .../output.json                                               | 0
 .../strip-ethdebug                                            | 0
 .../input.json                                                | 0
 .../output.json                                               | 0
 .../strip-ethdebug                                            | 0
 .../standard_output_selection_ethdebug_ir/input.json          | 0
 .../standard_output_selection_ethdebug_ir/output.json         | 0
 .../standard_output_selection_ethdebug_ir/strip-ethdebug      | 0
 .../standard_output_selection_ethdebug_iroptimized/input.json | 0
 .../output.json                                               | 0
 .../strip-ethdebug                                            | 0
 .../standard_output_selection_ethdebug_no_viair/input.json    | 0
 .../standard_output_selection_ethdebug_no_viair/output.json   | 0
 .../standard_output_selection_ethdebug_optimize_ir/input.json | 0
 .../output.json                                               | 0
 .../input.json                                                | 0
 .../output.json                                               | 0
 .../standard_yul_debug_info_ethdebug_compatible_output/args   | 0
 .../standard_yul_debug_info_ethdebug_compatible_output/in.yul | 0
 .../input.json                                                | 2 +-
 .../output.json                                               | 0
 .../strip-ethdebug                                            | 0
 .../standard_yul_debug_info_ethdebug_incompatible_output/args | 0
 .../in.yul                                                    | 0
 .../input.json                                                | 2 +-
 .../output.json                                               | 0
 .../args                                                      | 0
 .../in.yul                                                    | 0
 .../input.json                                                | 2 +-
 .../output.json                                               | 0
 .../standard_yul_ethdebug_assign_immutable/args               | 0
 .../standard_yul_ethdebug_assign_immutable/in.yul             | 0
 .../standard_yul_ethdebug_assign_immutable/input.json         | 2 +-
 .../standard_yul_ethdebug_assign_immutable/output.json        | 0
 .../{ => ethdebug}/standard_yul_ethdebug_bytecode_ir/args     | 0
 .../{ => ethdebug}/standard_yul_ethdebug_bytecode_ir/in.yul   | 0
 .../standard_yul_ethdebug_bytecode_ir}/input.json             | 2 +-
 .../standard_yul_ethdebug_bytecode_ir/output.json             | 0
 .../standard_yul_ethdebug_bytecode_ir/strip-ethdebug          | 0
 .../standard_yul_ethdebug_bytecode_iroptimized/args           | 0
 .../standard_yul_ethdebug_bytecode_iroptimized/in.yul         | 0
 .../standard_yul_ethdebug_bytecode_iroptimized/input.json     | 2 +-
 .../standard_yul_ethdebug_bytecode_iroptimized/output.json    | 0
 .../standard_yul_ethdebug_bytecode_iroptimized/strip-ethdebug | 0
 .../standard_yul_ethdebug_deployed_bytecode/args              | 0
 .../standard_yul_ethdebug_deployed_bytecode/in.yul            | 0
 .../standard_yul_ethdebug_deployed_bytecode/input.json        | 2 +-
 .../standard_yul_ethdebug_deployed_bytecode/output.json       | 0
 .../standard_yul_ethdebug_deployed_bytecode/strip-ethdebug    | 0
 .../standard_yul_ethdebug_deployed_bytecode_and_bytecode/args | 0
 .../in.yul                                                    | 0
 .../input.json                                                | 2 +-
 .../output.json                                               | 0
 .../strip-ethdebug                                            | 0
 .../cmdlineTests/{ => ethdebug}/standard_yul_ethdebug_ir/args | 0
 .../{ => ethdebug}/standard_yul_ethdebug_ir/in.yul            | 0
 .../standard_yul_ethdebug_ir}/input.json                      | 2 +-
 .../{ => ethdebug}/standard_yul_ethdebug_ir/output.json       | 0
 .../{ => ethdebug}/standard_yul_ethdebug_ir/strip-ethdebug    | 0
 .../{ => ethdebug}/standard_yul_ethdebug_iroptimize/args      | 0
 .../{ => ethdebug}/standard_yul_ethdebug_iroptimize/in.yul    | 0
 .../standard_yul_ethdebug_iroptimize/input.json               | 2 +-
 .../standard_yul_ethdebug_iroptimize/output.json              | 0
 .../standard_yul_ethdebug_iroptimize/strip-ethdebug           | 0
 .../{ => ethdebug}/standard_yul_ethdebug_optimize_ir/args     | 0
 .../{ => ethdebug}/standard_yul_ethdebug_optimize_ir/in.yul   | 0
 .../standard_yul_ethdebug_optimize_ir/input.json              | 2 +-
 .../standard_yul_ethdebug_optimize_ir/output.json             | 0
 .../standard_yul_ethdebug_optimize_iroptimized/args           | 0
 .../standard_yul_ethdebug_optimize_iroptimized/in.yul         | 0
 .../standard_yul_ethdebug_optimize_iroptimized/input.json     | 2 +-
 .../standard_yul_ethdebug_optimize_iroptimized/output.json    | 0
 test/cmdlineTests/ethdebug_eof_container_osaka/output         | 4 ----
 100 files changed, 16 insertions(+), 16 deletions(-)
 rename test/cmdlineTests/{ => ethdebug}/ethdebug_eof_container_osaka/args (100%)
 rename test/cmdlineTests/{ => ethdebug}/ethdebug_eof_container_osaka/err (100%)
 rename test/cmdlineTests/{ => ethdebug}/ethdebug_eof_container_osaka/exit (100%)
 rename test/cmdlineTests/{ => ethdebug}/ethdebug_eof_container_osaka/input.sol (100%)
 create mode 100644 test/cmdlineTests/ethdebug/ethdebug_eof_container_osaka/output
 rename test/cmdlineTests/{ => ethdebug}/standard_output_debuginfo_ethdebug_compatible/input.json (100%)
 rename test/cmdlineTests/{ => ethdebug}/standard_output_debuginfo_ethdebug_compatible/output.json (100%)
 rename test/cmdlineTests/{ => ethdebug}/standard_output_debuginfo_ethdebug_compatible/strip-ethdebug (100%)
 rename test/cmdlineTests/{ => ethdebug}/standard_output_debuginfo_ethdebug_incompatible/input.json (100%)
 rename test/cmdlineTests/{ => ethdebug}/standard_output_debuginfo_ethdebug_incompatible/output.json (100%)
 rename test/cmdlineTests/{ => ethdebug}/standard_output_selection_ethdebug_bytecode_and_deployedbytecode_ir/input.json (100%)
 rename test/cmdlineTests/{ => ethdebug}/standard_output_selection_ethdebug_bytecode_and_deployedbytecode_ir/output.json (100%)
 rename test/cmdlineTests/{ => ethdebug}/standard_output_selection_ethdebug_bytecode_and_deployedbytecode_ir/strip-ethdebug (100%)
 rename test/cmdlineTests/{ => ethdebug}/standard_output_selection_ethdebug_bytecode_and_deployedbytecode_iroptimized/input.json (100%)
 rename test/cmdlineTests/{ => ethdebug}/standard_output_selection_ethdebug_bytecode_and_deployedbytecode_iroptimized/output.json (100%)
 rename test/cmdlineTests/{ => ethdebug}/standard_output_selection_ethdebug_bytecode_and_deployedbytecode_iroptimized/strip-ethdebug (100%)
 rename test/cmdlineTests/{ => ethdebug}/standard_output_selection_ethdebug_bytecode_and_deployedbytecode_optimizer_ir/input.json (100%)
 rename test/cmdlineTests/{ => ethdebug}/standard_output_selection_ethdebug_bytecode_and_deployedbytecode_optimizer_ir/output.json (100%)
 rename test/cmdlineTests/{ => ethdebug}/standard_output_selection_ethdebug_bytecode_and_deployedbytecode_optimizer_iroptimized/input.json (100%)
 rename test/cmdlineTests/{ => ethdebug}/standard_output_selection_ethdebug_bytecode_and_deployedbytecode_optimizer_iroptimized/output.json (100%)
 rename test/cmdlineTests/{ => ethdebug}/standard_output_selection_ethdebug_bytecode_ir/input.json (100%)
 rename test/cmdlineTests/{ => ethdebug}/standard_output_selection_ethdebug_bytecode_ir/output.json (100%)
 rename test/cmdlineTests/{ => ethdebug}/standard_output_selection_ethdebug_bytecode_ir/strip-ethdebug (100%)
 rename test/cmdlineTests/{ => ethdebug}/standard_output_selection_ethdebug_bytecode_iroptimized/input.json (100%)
 rename test/cmdlineTests/{ => ethdebug}/standard_output_selection_ethdebug_bytecode_iroptimized/output.json (100%)
 rename test/cmdlineTests/{ => ethdebug}/standard_output_selection_ethdebug_bytecode_iroptimized/strip-ethdebug (100%)
 rename test/cmdlineTests/{ => ethdebug}/standard_output_selection_ethdebug_deployedbytecode_ir/input.json (100%)
 rename test/cmdlineTests/{ => ethdebug}/standard_output_selection_ethdebug_deployedbytecode_ir/output.json (100%)
 rename test/cmdlineTests/{ => ethdebug}/standard_output_selection_ethdebug_deployedbytecode_ir/strip-ethdebug (100%)
 rename test/cmdlineTests/{ => ethdebug}/standard_output_selection_ethdebug_deployedbytecode_iroptimized/input.json (100%)
 rename test/cmdlineTests/{ => ethdebug}/standard_output_selection_ethdebug_deployedbytecode_iroptimized/output.json (100%)
 rename test/cmdlineTests/{ => ethdebug}/standard_output_selection_ethdebug_deployedbytecode_iroptimized/strip-ethdebug (100%)
 rename test/cmdlineTests/{ => ethdebug}/standard_output_selection_ethdebug_ir/input.json (100%)
 rename test/cmdlineTests/{ => ethdebug}/standard_output_selection_ethdebug_ir/output.json (100%)
 rename test/cmdlineTests/{ => ethdebug}/standard_output_selection_ethdebug_ir/strip-ethdebug (100%)
 rename test/cmdlineTests/{ => ethdebug}/standard_output_selection_ethdebug_iroptimized/input.json (100%)
 rename test/cmdlineTests/{ => ethdebug}/standard_output_selection_ethdebug_iroptimized/output.json (100%)
 rename test/cmdlineTests/{ => ethdebug}/standard_output_selection_ethdebug_iroptimized/strip-ethdebug (100%)
 rename test/cmdlineTests/{ => ethdebug}/standard_output_selection_ethdebug_no_viair/input.json (100%)
 rename test/cmdlineTests/{ => ethdebug}/standard_output_selection_ethdebug_no_viair/output.json (100%)
 rename test/cmdlineTests/{ => ethdebug}/standard_output_selection_ethdebug_optimize_ir/input.json (100%)
 rename test/cmdlineTests/{ => ethdebug}/standard_output_selection_ethdebug_optimize_ir/output.json (100%)
 rename test/cmdlineTests/{ => ethdebug}/standard_output_selection_ethdebug_optimize_iroptimized/input.json (100%)
 rename test/cmdlineTests/{ => ethdebug}/standard_output_selection_ethdebug_optimize_iroptimized/output.json (100%)
 rename test/cmdlineTests/{ => ethdebug}/standard_yul_debug_info_ethdebug_compatible_output/args (100%)
 rename test/cmdlineTests/{ => ethdebug}/standard_yul_debug_info_ethdebug_compatible_output/in.yul (100%)
 rename test/cmdlineTests/{ => ethdebug}/standard_yul_debug_info_ethdebug_compatible_output/input.json (75%)
 rename test/cmdlineTests/{ => ethdebug}/standard_yul_debug_info_ethdebug_compatible_output/output.json (100%)
 rename test/cmdlineTests/{ => ethdebug}/standard_yul_debug_info_ethdebug_compatible_output/strip-ethdebug (100%)
 rename test/cmdlineTests/{ => ethdebug}/standard_yul_debug_info_ethdebug_incompatible_output/args (100%)
 rename test/cmdlineTests/{ => ethdebug}/standard_yul_debug_info_ethdebug_incompatible_output/in.yul (100%)
 rename test/cmdlineTests/{ => ethdebug}/standard_yul_debug_info_ethdebug_incompatible_output/input.json (71%)
 rename test/cmdlineTests/{ => ethdebug}/standard_yul_debug_info_ethdebug_incompatible_output/output.json (100%)
 rename test/cmdlineTests/{ => ethdebug}/standard_yul_debug_info_ethdebug_verbatim_unimplemented/args (100%)
 rename test/cmdlineTests/{ => ethdebug}/standard_yul_debug_info_ethdebug_verbatim_unimplemented/in.yul (100%)
 rename test/cmdlineTests/{ => ethdebug}/standard_yul_debug_info_ethdebug_verbatim_unimplemented/input.json (71%)
 rename test/cmdlineTests/{ => ethdebug}/standard_yul_debug_info_ethdebug_verbatim_unimplemented/output.json (100%)
 rename test/cmdlineTests/{ => ethdebug}/standard_yul_ethdebug_assign_immutable/args (100%)
 rename test/cmdlineTests/{ => ethdebug}/standard_yul_ethdebug_assign_immutable/in.yul (100%)
 rename test/cmdlineTests/{ => ethdebug}/standard_yul_ethdebug_assign_immutable/input.json (62%)
 rename test/cmdlineTests/{ => ethdebug}/standard_yul_ethdebug_assign_immutable/output.json (100%)
 rename test/cmdlineTests/{ => ethdebug}/standard_yul_ethdebug_bytecode_ir/args (100%)
 rename test/cmdlineTests/{ => ethdebug}/standard_yul_ethdebug_bytecode_ir/in.yul (100%)
 rename test/cmdlineTests/{standard_yul_ethdebug_ir => ethdebug/standard_yul_ethdebug_bytecode_ir}/input.json (65%)
 rename test/cmdlineTests/{ => ethdebug}/standard_yul_ethdebug_bytecode_ir/output.json (100%)
 rename test/cmdlineTests/{ => ethdebug}/standard_yul_ethdebug_bytecode_ir/strip-ethdebug (100%)
 rename test/cmdlineTests/{ => ethdebug}/standard_yul_ethdebug_bytecode_iroptimized/args (100%)
 rename test/cmdlineTests/{ => ethdebug}/standard_yul_ethdebug_bytecode_iroptimized/in.yul (100%)
 rename test/cmdlineTests/{ => ethdebug}/standard_yul_ethdebug_bytecode_iroptimized/input.json (64%)
 rename test/cmdlineTests/{ => ethdebug}/standard_yul_ethdebug_bytecode_iroptimized/output.json (100%)
 rename test/cmdlineTests/{ => ethdebug}/standard_yul_ethdebug_bytecode_iroptimized/strip-ethdebug (100%)
 rename test/cmdlineTests/{ => ethdebug}/standard_yul_ethdebug_deployed_bytecode/args (100%)
 rename test/cmdlineTests/{ => ethdebug}/standard_yul_ethdebug_deployed_bytecode/in.yul (100%)
 rename test/cmdlineTests/{ => ethdebug}/standard_yul_ethdebug_deployed_bytecode/input.json (63%)
 rename test/cmdlineTests/{ => ethdebug}/standard_yul_ethdebug_deployed_bytecode/output.json (100%)
 rename test/cmdlineTests/{ => ethdebug}/standard_yul_ethdebug_deployed_bytecode/strip-ethdebug (100%)
 rename test/cmdlineTests/{ => ethdebug}/standard_yul_ethdebug_deployed_bytecode_and_bytecode/args (100%)
 rename test/cmdlineTests/{ => ethdebug}/standard_yul_ethdebug_deployed_bytecode_and_bytecode/in.yul (100%)
 rename test/cmdlineTests/{ => ethdebug}/standard_yul_ethdebug_deployed_bytecode_and_bytecode/input.json (67%)
 rename test/cmdlineTests/{ => ethdebug}/standard_yul_ethdebug_deployed_bytecode_and_bytecode/output.json (100%)
 rename test/cmdlineTests/{ => ethdebug}/standard_yul_ethdebug_deployed_bytecode_and_bytecode/strip-ethdebug (100%)
 rename test/cmdlineTests/{ => ethdebug}/standard_yul_ethdebug_ir/args (100%)
 rename test/cmdlineTests/{ => ethdebug}/standard_yul_ethdebug_ir/in.yul (100%)
 rename test/cmdlineTests/{standard_yul_ethdebug_bytecode_ir => ethdebug/standard_yul_ethdebug_ir}/input.json (68%)
 rename test/cmdlineTests/{ => ethdebug}/standard_yul_ethdebug_ir/output.json (100%)
 rename test/cmdlineTests/{ => ethdebug}/standard_yul_ethdebug_ir/strip-ethdebug (100%)
 rename test/cmdlineTests/{ => ethdebug}/standard_yul_ethdebug_iroptimize/args (100%)
 rename test/cmdlineTests/{ => ethdebug}/standard_yul_ethdebug_iroptimize/in.yul (100%)
 rename test/cmdlineTests/{ => ethdebug}/standard_yul_ethdebug_iroptimize/input.json (66%)
 rename test/cmdlineTests/{ => ethdebug}/standard_yul_ethdebug_iroptimize/output.json (100%)
 rename test/cmdlineTests/{ => ethdebug}/standard_yul_ethdebug_iroptimize/strip-ethdebug (100%)
 rename test/cmdlineTests/{ => ethdebug}/standard_yul_ethdebug_optimize_ir/args (100%)
 rename test/cmdlineTests/{ => ethdebug}/standard_yul_ethdebug_optimize_ir/in.yul (100%)
 rename test/cmdlineTests/{ => ethdebug}/standard_yul_ethdebug_optimize_ir/input.json (71%)
 rename test/cmdlineTests/{ => ethdebug}/standard_yul_ethdebug_optimize_ir/output.json (100%)
 rename test/cmdlineTests/{ => ethdebug}/standard_yul_ethdebug_optimize_iroptimized/args (100%)
 rename test/cmdlineTests/{ => ethdebug}/standard_yul_ethdebug_optimize_iroptimized/in.yul (100%)
 rename test/cmdlineTests/{ => ethdebug}/standard_yul_ethdebug_optimize_iroptimized/input.json (69%)
 rename test/cmdlineTests/{ => ethdebug}/standard_yul_ethdebug_optimize_iroptimized/output.json (100%)
 delete mode 100644 test/cmdlineTests/ethdebug_eof_container_osaka/output

diff --git a/test/cmdlineTests/ethdebug_eof_container_osaka/args b/test/cmdlineTests/ethdebug/ethdebug_eof_container_osaka/args
similarity index 100%
rename from test/cmdlineTests/ethdebug_eof_container_osaka/args
rename to test/cmdlineTests/ethdebug/ethdebug_eof_container_osaka/args
diff --git a/test/cmdlineTests/ethdebug_eof_container_osaka/err b/test/cmdlineTests/ethdebug/ethdebug_eof_container_osaka/err
similarity index 100%
rename from test/cmdlineTests/ethdebug_eof_container_osaka/err
rename to test/cmdlineTests/ethdebug/ethdebug_eof_container_osaka/err
diff --git a/test/cmdlineTests/ethdebug_eof_container_osaka/exit b/test/cmdlineTests/ethdebug/ethdebug_eof_container_osaka/exit
similarity index 100%
rename from test/cmdlineTests/ethdebug_eof_container_osaka/exit
rename to test/cmdlineTests/ethdebug/ethdebug_eof_container_osaka/exit
diff --git a/test/cmdlineTests/ethdebug_eof_container_osaka/input.sol b/test/cmdlineTests/ethdebug/ethdebug_eof_container_osaka/input.sol
similarity index 100%
rename from test/cmdlineTests/ethdebug_eof_container_osaka/input.sol
rename to test/cmdlineTests/ethdebug/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
new file mode 100644
index 000000000000..7d1e26dd48da
--- /dev/null
+++ 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/test/cmdlineTests/standard_output_debuginfo_ethdebug_compatible/input.json b/test/cmdlineTests/ethdebug/standard_output_debuginfo_ethdebug_compatible/input.json
similarity index 100%
rename from test/cmdlineTests/standard_output_debuginfo_ethdebug_compatible/input.json
rename to test/cmdlineTests/ethdebug/standard_output_debuginfo_ethdebug_compatible/input.json
diff --git a/test/cmdlineTests/standard_output_debuginfo_ethdebug_compatible/output.json b/test/cmdlineTests/ethdebug/standard_output_debuginfo_ethdebug_compatible/output.json
similarity index 100%
rename from test/cmdlineTests/standard_output_debuginfo_ethdebug_compatible/output.json
rename to test/cmdlineTests/ethdebug/standard_output_debuginfo_ethdebug_compatible/output.json
diff --git a/test/cmdlineTests/standard_output_debuginfo_ethdebug_compatible/strip-ethdebug b/test/cmdlineTests/ethdebug/standard_output_debuginfo_ethdebug_compatible/strip-ethdebug
similarity index 100%
rename from test/cmdlineTests/standard_output_debuginfo_ethdebug_compatible/strip-ethdebug
rename to test/cmdlineTests/ethdebug/standard_output_debuginfo_ethdebug_compatible/strip-ethdebug
diff --git a/test/cmdlineTests/standard_output_debuginfo_ethdebug_incompatible/input.json b/test/cmdlineTests/ethdebug/standard_output_debuginfo_ethdebug_incompatible/input.json
similarity index 100%
rename from test/cmdlineTests/standard_output_debuginfo_ethdebug_incompatible/input.json
rename to test/cmdlineTests/ethdebug/standard_output_debuginfo_ethdebug_incompatible/input.json
diff --git a/test/cmdlineTests/standard_output_debuginfo_ethdebug_incompatible/output.json b/test/cmdlineTests/ethdebug/standard_output_debuginfo_ethdebug_incompatible/output.json
similarity index 100%
rename from test/cmdlineTests/standard_output_debuginfo_ethdebug_incompatible/output.json
rename to test/cmdlineTests/ethdebug/standard_output_debuginfo_ethdebug_incompatible/output.json
diff --git a/test/cmdlineTests/standard_output_selection_ethdebug_bytecode_and_deployedbytecode_ir/input.json b/test/cmdlineTests/ethdebug/standard_output_selection_ethdebug_bytecode_and_deployedbytecode_ir/input.json
similarity index 100%
rename from test/cmdlineTests/standard_output_selection_ethdebug_bytecode_and_deployedbytecode_ir/input.json
rename to test/cmdlineTests/ethdebug/standard_output_selection_ethdebug_bytecode_and_deployedbytecode_ir/input.json
diff --git a/test/cmdlineTests/standard_output_selection_ethdebug_bytecode_and_deployedbytecode_ir/output.json b/test/cmdlineTests/ethdebug/standard_output_selection_ethdebug_bytecode_and_deployedbytecode_ir/output.json
similarity index 100%
rename from test/cmdlineTests/standard_output_selection_ethdebug_bytecode_and_deployedbytecode_ir/output.json
rename to test/cmdlineTests/ethdebug/standard_output_selection_ethdebug_bytecode_and_deployedbytecode_ir/output.json
diff --git a/test/cmdlineTests/standard_output_selection_ethdebug_bytecode_and_deployedbytecode_ir/strip-ethdebug b/test/cmdlineTests/ethdebug/standard_output_selection_ethdebug_bytecode_and_deployedbytecode_ir/strip-ethdebug
similarity index 100%
rename from test/cmdlineTests/standard_output_selection_ethdebug_bytecode_and_deployedbytecode_ir/strip-ethdebug
rename to test/cmdlineTests/ethdebug/standard_output_selection_ethdebug_bytecode_and_deployedbytecode_ir/strip-ethdebug
diff --git a/test/cmdlineTests/standard_output_selection_ethdebug_bytecode_and_deployedbytecode_iroptimized/input.json b/test/cmdlineTests/ethdebug/standard_output_selection_ethdebug_bytecode_and_deployedbytecode_iroptimized/input.json
similarity index 100%
rename from test/cmdlineTests/standard_output_selection_ethdebug_bytecode_and_deployedbytecode_iroptimized/input.json
rename to test/cmdlineTests/ethdebug/standard_output_selection_ethdebug_bytecode_and_deployedbytecode_iroptimized/input.json
diff --git a/test/cmdlineTests/standard_output_selection_ethdebug_bytecode_and_deployedbytecode_iroptimized/output.json b/test/cmdlineTests/ethdebug/standard_output_selection_ethdebug_bytecode_and_deployedbytecode_iroptimized/output.json
similarity index 100%
rename from test/cmdlineTests/standard_output_selection_ethdebug_bytecode_and_deployedbytecode_iroptimized/output.json
rename to test/cmdlineTests/ethdebug/standard_output_selection_ethdebug_bytecode_and_deployedbytecode_iroptimized/output.json
diff --git a/test/cmdlineTests/standard_output_selection_ethdebug_bytecode_and_deployedbytecode_iroptimized/strip-ethdebug b/test/cmdlineTests/ethdebug/standard_output_selection_ethdebug_bytecode_and_deployedbytecode_iroptimized/strip-ethdebug
similarity index 100%
rename from test/cmdlineTests/standard_output_selection_ethdebug_bytecode_and_deployedbytecode_iroptimized/strip-ethdebug
rename to test/cmdlineTests/ethdebug/standard_output_selection_ethdebug_bytecode_and_deployedbytecode_iroptimized/strip-ethdebug
diff --git a/test/cmdlineTests/standard_output_selection_ethdebug_bytecode_and_deployedbytecode_optimizer_ir/input.json b/test/cmdlineTests/ethdebug/standard_output_selection_ethdebug_bytecode_and_deployedbytecode_optimizer_ir/input.json
similarity index 100%
rename from test/cmdlineTests/standard_output_selection_ethdebug_bytecode_and_deployedbytecode_optimizer_ir/input.json
rename to test/cmdlineTests/ethdebug/standard_output_selection_ethdebug_bytecode_and_deployedbytecode_optimizer_ir/input.json
diff --git a/test/cmdlineTests/standard_output_selection_ethdebug_bytecode_and_deployedbytecode_optimizer_ir/output.json b/test/cmdlineTests/ethdebug/standard_output_selection_ethdebug_bytecode_and_deployedbytecode_optimizer_ir/output.json
similarity index 100%
rename from test/cmdlineTests/standard_output_selection_ethdebug_bytecode_and_deployedbytecode_optimizer_ir/output.json
rename to test/cmdlineTests/ethdebug/standard_output_selection_ethdebug_bytecode_and_deployedbytecode_optimizer_ir/output.json
diff --git a/test/cmdlineTests/standard_output_selection_ethdebug_bytecode_and_deployedbytecode_optimizer_iroptimized/input.json b/test/cmdlineTests/ethdebug/standard_output_selection_ethdebug_bytecode_and_deployedbytecode_optimizer_iroptimized/input.json
similarity index 100%
rename from test/cmdlineTests/standard_output_selection_ethdebug_bytecode_and_deployedbytecode_optimizer_iroptimized/input.json
rename to test/cmdlineTests/ethdebug/standard_output_selection_ethdebug_bytecode_and_deployedbytecode_optimizer_iroptimized/input.json
diff --git a/test/cmdlineTests/standard_output_selection_ethdebug_bytecode_and_deployedbytecode_optimizer_iroptimized/output.json b/test/cmdlineTests/ethdebug/standard_output_selection_ethdebug_bytecode_and_deployedbytecode_optimizer_iroptimized/output.json
similarity index 100%
rename from test/cmdlineTests/standard_output_selection_ethdebug_bytecode_and_deployedbytecode_optimizer_iroptimized/output.json
rename to test/cmdlineTests/ethdebug/standard_output_selection_ethdebug_bytecode_and_deployedbytecode_optimizer_iroptimized/output.json
diff --git a/test/cmdlineTests/standard_output_selection_ethdebug_bytecode_ir/input.json b/test/cmdlineTests/ethdebug/standard_output_selection_ethdebug_bytecode_ir/input.json
similarity index 100%
rename from test/cmdlineTests/standard_output_selection_ethdebug_bytecode_ir/input.json
rename to test/cmdlineTests/ethdebug/standard_output_selection_ethdebug_bytecode_ir/input.json
diff --git a/test/cmdlineTests/standard_output_selection_ethdebug_bytecode_ir/output.json b/test/cmdlineTests/ethdebug/standard_output_selection_ethdebug_bytecode_ir/output.json
similarity index 100%
rename from test/cmdlineTests/standard_output_selection_ethdebug_bytecode_ir/output.json
rename to test/cmdlineTests/ethdebug/standard_output_selection_ethdebug_bytecode_ir/output.json
diff --git a/test/cmdlineTests/standard_output_selection_ethdebug_bytecode_ir/strip-ethdebug b/test/cmdlineTests/ethdebug/standard_output_selection_ethdebug_bytecode_ir/strip-ethdebug
similarity index 100%
rename from test/cmdlineTests/standard_output_selection_ethdebug_bytecode_ir/strip-ethdebug
rename to test/cmdlineTests/ethdebug/standard_output_selection_ethdebug_bytecode_ir/strip-ethdebug
diff --git a/test/cmdlineTests/standard_output_selection_ethdebug_bytecode_iroptimized/input.json b/test/cmdlineTests/ethdebug/standard_output_selection_ethdebug_bytecode_iroptimized/input.json
similarity index 100%
rename from test/cmdlineTests/standard_output_selection_ethdebug_bytecode_iroptimized/input.json
rename to test/cmdlineTests/ethdebug/standard_output_selection_ethdebug_bytecode_iroptimized/input.json
diff --git a/test/cmdlineTests/standard_output_selection_ethdebug_bytecode_iroptimized/output.json b/test/cmdlineTests/ethdebug/standard_output_selection_ethdebug_bytecode_iroptimized/output.json
similarity index 100%
rename from test/cmdlineTests/standard_output_selection_ethdebug_bytecode_iroptimized/output.json
rename to test/cmdlineTests/ethdebug/standard_output_selection_ethdebug_bytecode_iroptimized/output.json
diff --git a/test/cmdlineTests/standard_output_selection_ethdebug_bytecode_iroptimized/strip-ethdebug b/test/cmdlineTests/ethdebug/standard_output_selection_ethdebug_bytecode_iroptimized/strip-ethdebug
similarity index 100%
rename from test/cmdlineTests/standard_output_selection_ethdebug_bytecode_iroptimized/strip-ethdebug
rename to test/cmdlineTests/ethdebug/standard_output_selection_ethdebug_bytecode_iroptimized/strip-ethdebug
diff --git a/test/cmdlineTests/standard_output_selection_ethdebug_deployedbytecode_ir/input.json b/test/cmdlineTests/ethdebug/standard_output_selection_ethdebug_deployedbytecode_ir/input.json
similarity index 100%
rename from test/cmdlineTests/standard_output_selection_ethdebug_deployedbytecode_ir/input.json
rename to test/cmdlineTests/ethdebug/standard_output_selection_ethdebug_deployedbytecode_ir/input.json
diff --git a/test/cmdlineTests/standard_output_selection_ethdebug_deployedbytecode_ir/output.json b/test/cmdlineTests/ethdebug/standard_output_selection_ethdebug_deployedbytecode_ir/output.json
similarity index 100%
rename from test/cmdlineTests/standard_output_selection_ethdebug_deployedbytecode_ir/output.json
rename to test/cmdlineTests/ethdebug/standard_output_selection_ethdebug_deployedbytecode_ir/output.json
diff --git a/test/cmdlineTests/standard_output_selection_ethdebug_deployedbytecode_ir/strip-ethdebug b/test/cmdlineTests/ethdebug/standard_output_selection_ethdebug_deployedbytecode_ir/strip-ethdebug
similarity index 100%
rename from test/cmdlineTests/standard_output_selection_ethdebug_deployedbytecode_ir/strip-ethdebug
rename to test/cmdlineTests/ethdebug/standard_output_selection_ethdebug_deployedbytecode_ir/strip-ethdebug
diff --git a/test/cmdlineTests/standard_output_selection_ethdebug_deployedbytecode_iroptimized/input.json b/test/cmdlineTests/ethdebug/standard_output_selection_ethdebug_deployedbytecode_iroptimized/input.json
similarity index 100%
rename from test/cmdlineTests/standard_output_selection_ethdebug_deployedbytecode_iroptimized/input.json
rename to test/cmdlineTests/ethdebug/standard_output_selection_ethdebug_deployedbytecode_iroptimized/input.json
diff --git a/test/cmdlineTests/standard_output_selection_ethdebug_deployedbytecode_iroptimized/output.json b/test/cmdlineTests/ethdebug/standard_output_selection_ethdebug_deployedbytecode_iroptimized/output.json
similarity index 100%
rename from test/cmdlineTests/standard_output_selection_ethdebug_deployedbytecode_iroptimized/output.json
rename to test/cmdlineTests/ethdebug/standard_output_selection_ethdebug_deployedbytecode_iroptimized/output.json
diff --git a/test/cmdlineTests/standard_output_selection_ethdebug_deployedbytecode_iroptimized/strip-ethdebug b/test/cmdlineTests/ethdebug/standard_output_selection_ethdebug_deployedbytecode_iroptimized/strip-ethdebug
similarity index 100%
rename from test/cmdlineTests/standard_output_selection_ethdebug_deployedbytecode_iroptimized/strip-ethdebug
rename to test/cmdlineTests/ethdebug/standard_output_selection_ethdebug_deployedbytecode_iroptimized/strip-ethdebug
diff --git a/test/cmdlineTests/standard_output_selection_ethdebug_ir/input.json b/test/cmdlineTests/ethdebug/standard_output_selection_ethdebug_ir/input.json
similarity index 100%
rename from test/cmdlineTests/standard_output_selection_ethdebug_ir/input.json
rename to test/cmdlineTests/ethdebug/standard_output_selection_ethdebug_ir/input.json
diff --git a/test/cmdlineTests/standard_output_selection_ethdebug_ir/output.json b/test/cmdlineTests/ethdebug/standard_output_selection_ethdebug_ir/output.json
similarity index 100%
rename from test/cmdlineTests/standard_output_selection_ethdebug_ir/output.json
rename to test/cmdlineTests/ethdebug/standard_output_selection_ethdebug_ir/output.json
diff --git a/test/cmdlineTests/standard_output_selection_ethdebug_ir/strip-ethdebug b/test/cmdlineTests/ethdebug/standard_output_selection_ethdebug_ir/strip-ethdebug
similarity index 100%
rename from test/cmdlineTests/standard_output_selection_ethdebug_ir/strip-ethdebug
rename to test/cmdlineTests/ethdebug/standard_output_selection_ethdebug_ir/strip-ethdebug
diff --git a/test/cmdlineTests/standard_output_selection_ethdebug_iroptimized/input.json b/test/cmdlineTests/ethdebug/standard_output_selection_ethdebug_iroptimized/input.json
similarity index 100%
rename from test/cmdlineTests/standard_output_selection_ethdebug_iroptimized/input.json
rename to test/cmdlineTests/ethdebug/standard_output_selection_ethdebug_iroptimized/input.json
diff --git a/test/cmdlineTests/standard_output_selection_ethdebug_iroptimized/output.json b/test/cmdlineTests/ethdebug/standard_output_selection_ethdebug_iroptimized/output.json
similarity index 100%
rename from test/cmdlineTests/standard_output_selection_ethdebug_iroptimized/output.json
rename to test/cmdlineTests/ethdebug/standard_output_selection_ethdebug_iroptimized/output.json
diff --git a/test/cmdlineTests/standard_output_selection_ethdebug_iroptimized/strip-ethdebug b/test/cmdlineTests/ethdebug/standard_output_selection_ethdebug_iroptimized/strip-ethdebug
similarity index 100%
rename from test/cmdlineTests/standard_output_selection_ethdebug_iroptimized/strip-ethdebug
rename to test/cmdlineTests/ethdebug/standard_output_selection_ethdebug_iroptimized/strip-ethdebug
diff --git a/test/cmdlineTests/standard_output_selection_ethdebug_no_viair/input.json b/test/cmdlineTests/ethdebug/standard_output_selection_ethdebug_no_viair/input.json
similarity index 100%
rename from test/cmdlineTests/standard_output_selection_ethdebug_no_viair/input.json
rename to test/cmdlineTests/ethdebug/standard_output_selection_ethdebug_no_viair/input.json
diff --git a/test/cmdlineTests/standard_output_selection_ethdebug_no_viair/output.json b/test/cmdlineTests/ethdebug/standard_output_selection_ethdebug_no_viair/output.json
similarity index 100%
rename from test/cmdlineTests/standard_output_selection_ethdebug_no_viair/output.json
rename to test/cmdlineTests/ethdebug/standard_output_selection_ethdebug_no_viair/output.json
diff --git a/test/cmdlineTests/standard_output_selection_ethdebug_optimize_ir/input.json b/test/cmdlineTests/ethdebug/standard_output_selection_ethdebug_optimize_ir/input.json
similarity index 100%
rename from test/cmdlineTests/standard_output_selection_ethdebug_optimize_ir/input.json
rename to test/cmdlineTests/ethdebug/standard_output_selection_ethdebug_optimize_ir/input.json
diff --git a/test/cmdlineTests/standard_output_selection_ethdebug_optimize_ir/output.json b/test/cmdlineTests/ethdebug/standard_output_selection_ethdebug_optimize_ir/output.json
similarity index 100%
rename from test/cmdlineTests/standard_output_selection_ethdebug_optimize_ir/output.json
rename to test/cmdlineTests/ethdebug/standard_output_selection_ethdebug_optimize_ir/output.json
diff --git a/test/cmdlineTests/standard_output_selection_ethdebug_optimize_iroptimized/input.json b/test/cmdlineTests/ethdebug/standard_output_selection_ethdebug_optimize_iroptimized/input.json
similarity index 100%
rename from test/cmdlineTests/standard_output_selection_ethdebug_optimize_iroptimized/input.json
rename to test/cmdlineTests/ethdebug/standard_output_selection_ethdebug_optimize_iroptimized/input.json
diff --git a/test/cmdlineTests/standard_output_selection_ethdebug_optimize_iroptimized/output.json b/test/cmdlineTests/ethdebug/standard_output_selection_ethdebug_optimize_iroptimized/output.json
similarity index 100%
rename from test/cmdlineTests/standard_output_selection_ethdebug_optimize_iroptimized/output.json
rename to test/cmdlineTests/ethdebug/standard_output_selection_ethdebug_optimize_iroptimized/output.json
diff --git a/test/cmdlineTests/standard_yul_debug_info_ethdebug_compatible_output/args b/test/cmdlineTests/ethdebug/standard_yul_debug_info_ethdebug_compatible_output/args
similarity index 100%
rename from test/cmdlineTests/standard_yul_debug_info_ethdebug_compatible_output/args
rename to test/cmdlineTests/ethdebug/standard_yul_debug_info_ethdebug_compatible_output/args
diff --git a/test/cmdlineTests/standard_yul_debug_info_ethdebug_compatible_output/in.yul b/test/cmdlineTests/ethdebug/standard_yul_debug_info_ethdebug_compatible_output/in.yul
similarity index 100%
rename from test/cmdlineTests/standard_yul_debug_info_ethdebug_compatible_output/in.yul
rename to test/cmdlineTests/ethdebug/standard_yul_debug_info_ethdebug_compatible_output/in.yul
diff --git a/test/cmdlineTests/standard_yul_debug_info_ethdebug_compatible_output/input.json b/test/cmdlineTests/ethdebug/standard_yul_debug_info_ethdebug_compatible_output/input.json
similarity index 75%
rename from test/cmdlineTests/standard_yul_debug_info_ethdebug_compatible_output/input.json
rename to test/cmdlineTests/ethdebug/standard_yul_debug_info_ethdebug_compatible_output/input.json
index 3e5b81c5ef69..f3650df55848 100644
--- a/test/cmdlineTests/standard_yul_debug_info_ethdebug_compatible_output/input.json
+++ b/test/cmdlineTests/ethdebug/standard_yul_debug_info_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/test/cmdlineTests/standard_yul_debug_info_ethdebug_compatible_output/output.json b/test/cmdlineTests/ethdebug/standard_yul_debug_info_ethdebug_compatible_output/output.json
similarity index 100%
rename from test/cmdlineTests/standard_yul_debug_info_ethdebug_compatible_output/output.json
rename to test/cmdlineTests/ethdebug/standard_yul_debug_info_ethdebug_compatible_output/output.json
diff --git a/test/cmdlineTests/standard_yul_debug_info_ethdebug_compatible_output/strip-ethdebug b/test/cmdlineTests/ethdebug/standard_yul_debug_info_ethdebug_compatible_output/strip-ethdebug
similarity index 100%
rename from test/cmdlineTests/standard_yul_debug_info_ethdebug_compatible_output/strip-ethdebug
rename to test/cmdlineTests/ethdebug/standard_yul_debug_info_ethdebug_compatible_output/strip-ethdebug
diff --git a/test/cmdlineTests/standard_yul_debug_info_ethdebug_incompatible_output/args b/test/cmdlineTests/ethdebug/standard_yul_debug_info_ethdebug_incompatible_output/args
similarity index 100%
rename from test/cmdlineTests/standard_yul_debug_info_ethdebug_incompatible_output/args
rename to test/cmdlineTests/ethdebug/standard_yul_debug_info_ethdebug_incompatible_output/args
diff --git a/test/cmdlineTests/standard_yul_debug_info_ethdebug_incompatible_output/in.yul b/test/cmdlineTests/ethdebug/standard_yul_debug_info_ethdebug_incompatible_output/in.yul
similarity index 100%
rename from test/cmdlineTests/standard_yul_debug_info_ethdebug_incompatible_output/in.yul
rename to test/cmdlineTests/ethdebug/standard_yul_debug_info_ethdebug_incompatible_output/in.yul
diff --git a/test/cmdlineTests/standard_yul_debug_info_ethdebug_incompatible_output/input.json b/test/cmdlineTests/ethdebug/standard_yul_debug_info_ethdebug_incompatible_output/input.json
similarity index 71%
rename from test/cmdlineTests/standard_yul_debug_info_ethdebug_incompatible_output/input.json
rename to test/cmdlineTests/ethdebug/standard_yul_debug_info_ethdebug_incompatible_output/input.json
index f05e6f361aca..f36f556024d3 100644
--- a/test/cmdlineTests/standard_yul_debug_info_ethdebug_incompatible_output/input.json
+++ b/test/cmdlineTests/ethdebug/standard_yul_debug_info_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/test/cmdlineTests/standard_yul_debug_info_ethdebug_incompatible_output/output.json b/test/cmdlineTests/ethdebug/standard_yul_debug_info_ethdebug_incompatible_output/output.json
similarity index 100%
rename from test/cmdlineTests/standard_yul_debug_info_ethdebug_incompatible_output/output.json
rename to test/cmdlineTests/ethdebug/standard_yul_debug_info_ethdebug_incompatible_output/output.json
diff --git a/test/cmdlineTests/standard_yul_debug_info_ethdebug_verbatim_unimplemented/args b/test/cmdlineTests/ethdebug/standard_yul_debug_info_ethdebug_verbatim_unimplemented/args
similarity index 100%
rename from test/cmdlineTests/standard_yul_debug_info_ethdebug_verbatim_unimplemented/args
rename to test/cmdlineTests/ethdebug/standard_yul_debug_info_ethdebug_verbatim_unimplemented/args
diff --git a/test/cmdlineTests/standard_yul_debug_info_ethdebug_verbatim_unimplemented/in.yul b/test/cmdlineTests/ethdebug/standard_yul_debug_info_ethdebug_verbatim_unimplemented/in.yul
similarity index 100%
rename from test/cmdlineTests/standard_yul_debug_info_ethdebug_verbatim_unimplemented/in.yul
rename to test/cmdlineTests/ethdebug/standard_yul_debug_info_ethdebug_verbatim_unimplemented/in.yul
diff --git a/test/cmdlineTests/standard_yul_debug_info_ethdebug_verbatim_unimplemented/input.json b/test/cmdlineTests/ethdebug/standard_yul_debug_info_ethdebug_verbatim_unimplemented/input.json
similarity index 71%
rename from test/cmdlineTests/standard_yul_debug_info_ethdebug_verbatim_unimplemented/input.json
rename to test/cmdlineTests/ethdebug/standard_yul_debug_info_ethdebug_verbatim_unimplemented/input.json
index be4fbb64fce3..421e9ca12211 100644
--- a/test/cmdlineTests/standard_yul_debug_info_ethdebug_verbatim_unimplemented/input.json
+++ b/test/cmdlineTests/ethdebug/standard_yul_debug_info_ethdebug_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/test/cmdlineTests/standard_yul_debug_info_ethdebug_verbatim_unimplemented/output.json b/test/cmdlineTests/ethdebug/standard_yul_debug_info_ethdebug_verbatim_unimplemented/output.json
similarity index 100%
rename from test/cmdlineTests/standard_yul_debug_info_ethdebug_verbatim_unimplemented/output.json
rename to test/cmdlineTests/ethdebug/standard_yul_debug_info_ethdebug_verbatim_unimplemented/output.json
diff --git a/test/cmdlineTests/standard_yul_ethdebug_assign_immutable/args b/test/cmdlineTests/ethdebug/standard_yul_ethdebug_assign_immutable/args
similarity index 100%
rename from test/cmdlineTests/standard_yul_ethdebug_assign_immutable/args
rename to test/cmdlineTests/ethdebug/standard_yul_ethdebug_assign_immutable/args
diff --git a/test/cmdlineTests/standard_yul_ethdebug_assign_immutable/in.yul b/test/cmdlineTests/ethdebug/standard_yul_ethdebug_assign_immutable/in.yul
similarity index 100%
rename from test/cmdlineTests/standard_yul_ethdebug_assign_immutable/in.yul
rename to test/cmdlineTests/ethdebug/standard_yul_ethdebug_assign_immutable/in.yul
diff --git a/test/cmdlineTests/standard_yul_ethdebug_assign_immutable/input.json b/test/cmdlineTests/ethdebug/standard_yul_ethdebug_assign_immutable/input.json
similarity index 62%
rename from test/cmdlineTests/standard_yul_ethdebug_assign_immutable/input.json
rename to test/cmdlineTests/ethdebug/standard_yul_ethdebug_assign_immutable/input.json
index 83acd4c42085..d728d635db9a 100644
--- a/test/cmdlineTests/standard_yul_ethdebug_assign_immutable/input.json
+++ b/test/cmdlineTests/ethdebug/standard_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/test/cmdlineTests/standard_yul_ethdebug_assign_immutable/output.json b/test/cmdlineTests/ethdebug/standard_yul_ethdebug_assign_immutable/output.json
similarity index 100%
rename from test/cmdlineTests/standard_yul_ethdebug_assign_immutable/output.json
rename to test/cmdlineTests/ethdebug/standard_yul_ethdebug_assign_immutable/output.json
diff --git a/test/cmdlineTests/standard_yul_ethdebug_bytecode_ir/args b/test/cmdlineTests/ethdebug/standard_yul_ethdebug_bytecode_ir/args
similarity index 100%
rename from test/cmdlineTests/standard_yul_ethdebug_bytecode_ir/args
rename to test/cmdlineTests/ethdebug/standard_yul_ethdebug_bytecode_ir/args
diff --git a/test/cmdlineTests/standard_yul_ethdebug_bytecode_ir/in.yul b/test/cmdlineTests/ethdebug/standard_yul_ethdebug_bytecode_ir/in.yul
similarity index 100%
rename from test/cmdlineTests/standard_yul_ethdebug_bytecode_ir/in.yul
rename to test/cmdlineTests/ethdebug/standard_yul_ethdebug_bytecode_ir/in.yul
diff --git a/test/cmdlineTests/standard_yul_ethdebug_ir/input.json b/test/cmdlineTests/ethdebug/standard_yul_ethdebug_bytecode_ir/input.json
similarity index 65%
rename from test/cmdlineTests/standard_yul_ethdebug_ir/input.json
rename to test/cmdlineTests/ethdebug/standard_yul_ethdebug_bytecode_ir/input.json
index 3153a378db84..e879925589b3 100644
--- a/test/cmdlineTests/standard_yul_ethdebug_ir/input.json
+++ b/test/cmdlineTests/ethdebug/standard_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/test/cmdlineTests/standard_yul_ethdebug_bytecode_ir/output.json b/test/cmdlineTests/ethdebug/standard_yul_ethdebug_bytecode_ir/output.json
similarity index 100%
rename from test/cmdlineTests/standard_yul_ethdebug_bytecode_ir/output.json
rename to test/cmdlineTests/ethdebug/standard_yul_ethdebug_bytecode_ir/output.json
diff --git a/test/cmdlineTests/standard_yul_ethdebug_bytecode_ir/strip-ethdebug b/test/cmdlineTests/ethdebug/standard_yul_ethdebug_bytecode_ir/strip-ethdebug
similarity index 100%
rename from test/cmdlineTests/standard_yul_ethdebug_bytecode_ir/strip-ethdebug
rename to test/cmdlineTests/ethdebug/standard_yul_ethdebug_bytecode_ir/strip-ethdebug
diff --git a/test/cmdlineTests/standard_yul_ethdebug_bytecode_iroptimized/args b/test/cmdlineTests/ethdebug/standard_yul_ethdebug_bytecode_iroptimized/args
similarity index 100%
rename from test/cmdlineTests/standard_yul_ethdebug_bytecode_iroptimized/args
rename to test/cmdlineTests/ethdebug/standard_yul_ethdebug_bytecode_iroptimized/args
diff --git a/test/cmdlineTests/standard_yul_ethdebug_bytecode_iroptimized/in.yul b/test/cmdlineTests/ethdebug/standard_yul_ethdebug_bytecode_iroptimized/in.yul
similarity index 100%
rename from test/cmdlineTests/standard_yul_ethdebug_bytecode_iroptimized/in.yul
rename to test/cmdlineTests/ethdebug/standard_yul_ethdebug_bytecode_iroptimized/in.yul
diff --git a/test/cmdlineTests/standard_yul_ethdebug_bytecode_iroptimized/input.json b/test/cmdlineTests/ethdebug/standard_yul_ethdebug_bytecode_iroptimized/input.json
similarity index 64%
rename from test/cmdlineTests/standard_yul_ethdebug_bytecode_iroptimized/input.json
rename to test/cmdlineTests/ethdebug/standard_yul_ethdebug_bytecode_iroptimized/input.json
index 54094c67305f..c13bec12335e 100644
--- a/test/cmdlineTests/standard_yul_ethdebug_bytecode_iroptimized/input.json
+++ b/test/cmdlineTests/ethdebug/standard_yul_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/test/cmdlineTests/standard_yul_ethdebug_bytecode_iroptimized/output.json b/test/cmdlineTests/ethdebug/standard_yul_ethdebug_bytecode_iroptimized/output.json
similarity index 100%
rename from test/cmdlineTests/standard_yul_ethdebug_bytecode_iroptimized/output.json
rename to test/cmdlineTests/ethdebug/standard_yul_ethdebug_bytecode_iroptimized/output.json
diff --git a/test/cmdlineTests/standard_yul_ethdebug_bytecode_iroptimized/strip-ethdebug b/test/cmdlineTests/ethdebug/standard_yul_ethdebug_bytecode_iroptimized/strip-ethdebug
similarity index 100%
rename from test/cmdlineTests/standard_yul_ethdebug_bytecode_iroptimized/strip-ethdebug
rename to test/cmdlineTests/ethdebug/standard_yul_ethdebug_bytecode_iroptimized/strip-ethdebug
diff --git a/test/cmdlineTests/standard_yul_ethdebug_deployed_bytecode/args b/test/cmdlineTests/ethdebug/standard_yul_ethdebug_deployed_bytecode/args
similarity index 100%
rename from test/cmdlineTests/standard_yul_ethdebug_deployed_bytecode/args
rename to test/cmdlineTests/ethdebug/standard_yul_ethdebug_deployed_bytecode/args
diff --git a/test/cmdlineTests/standard_yul_ethdebug_deployed_bytecode/in.yul b/test/cmdlineTests/ethdebug/standard_yul_ethdebug_deployed_bytecode/in.yul
similarity index 100%
rename from test/cmdlineTests/standard_yul_ethdebug_deployed_bytecode/in.yul
rename to test/cmdlineTests/ethdebug/standard_yul_ethdebug_deployed_bytecode/in.yul
diff --git a/test/cmdlineTests/standard_yul_ethdebug_deployed_bytecode/input.json b/test/cmdlineTests/ethdebug/standard_yul_ethdebug_deployed_bytecode/input.json
similarity index 63%
rename from test/cmdlineTests/standard_yul_ethdebug_deployed_bytecode/input.json
rename to test/cmdlineTests/ethdebug/standard_yul_ethdebug_deployed_bytecode/input.json
index e222dfeda8c2..f8c559f45158 100644
--- a/test/cmdlineTests/standard_yul_ethdebug_deployed_bytecode/input.json
+++ b/test/cmdlineTests/ethdebug/standard_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/test/cmdlineTests/standard_yul_ethdebug_deployed_bytecode/output.json b/test/cmdlineTests/ethdebug/standard_yul_ethdebug_deployed_bytecode/output.json
similarity index 100%
rename from test/cmdlineTests/standard_yul_ethdebug_deployed_bytecode/output.json
rename to test/cmdlineTests/ethdebug/standard_yul_ethdebug_deployed_bytecode/output.json
diff --git a/test/cmdlineTests/standard_yul_ethdebug_deployed_bytecode/strip-ethdebug b/test/cmdlineTests/ethdebug/standard_yul_ethdebug_deployed_bytecode/strip-ethdebug
similarity index 100%
rename from test/cmdlineTests/standard_yul_ethdebug_deployed_bytecode/strip-ethdebug
rename to test/cmdlineTests/ethdebug/standard_yul_ethdebug_deployed_bytecode/strip-ethdebug
diff --git a/test/cmdlineTests/standard_yul_ethdebug_deployed_bytecode_and_bytecode/args b/test/cmdlineTests/ethdebug/standard_yul_ethdebug_deployed_bytecode_and_bytecode/args
similarity index 100%
rename from test/cmdlineTests/standard_yul_ethdebug_deployed_bytecode_and_bytecode/args
rename to test/cmdlineTests/ethdebug/standard_yul_ethdebug_deployed_bytecode_and_bytecode/args
diff --git a/test/cmdlineTests/standard_yul_ethdebug_deployed_bytecode_and_bytecode/in.yul b/test/cmdlineTests/ethdebug/standard_yul_ethdebug_deployed_bytecode_and_bytecode/in.yul
similarity index 100%
rename from test/cmdlineTests/standard_yul_ethdebug_deployed_bytecode_and_bytecode/in.yul
rename to test/cmdlineTests/ethdebug/standard_yul_ethdebug_deployed_bytecode_and_bytecode/in.yul
diff --git a/test/cmdlineTests/standard_yul_ethdebug_deployed_bytecode_and_bytecode/input.json b/test/cmdlineTests/ethdebug/standard_yul_ethdebug_deployed_bytecode_and_bytecode/input.json
similarity index 67%
rename from test/cmdlineTests/standard_yul_ethdebug_deployed_bytecode_and_bytecode/input.json
rename to test/cmdlineTests/ethdebug/standard_yul_ethdebug_deployed_bytecode_and_bytecode/input.json
index 20779012030d..a13f651eee26 100644
--- a/test/cmdlineTests/standard_yul_ethdebug_deployed_bytecode_and_bytecode/input.json
+++ b/test/cmdlineTests/ethdebug/standard_yul_ethdebug_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/test/cmdlineTests/standard_yul_ethdebug_deployed_bytecode_and_bytecode/output.json b/test/cmdlineTests/ethdebug/standard_yul_ethdebug_deployed_bytecode_and_bytecode/output.json
similarity index 100%
rename from test/cmdlineTests/standard_yul_ethdebug_deployed_bytecode_and_bytecode/output.json
rename to test/cmdlineTests/ethdebug/standard_yul_ethdebug_deployed_bytecode_and_bytecode/output.json
diff --git a/test/cmdlineTests/standard_yul_ethdebug_deployed_bytecode_and_bytecode/strip-ethdebug b/test/cmdlineTests/ethdebug/standard_yul_ethdebug_deployed_bytecode_and_bytecode/strip-ethdebug
similarity index 100%
rename from test/cmdlineTests/standard_yul_ethdebug_deployed_bytecode_and_bytecode/strip-ethdebug
rename to test/cmdlineTests/ethdebug/standard_yul_ethdebug_deployed_bytecode_and_bytecode/strip-ethdebug
diff --git a/test/cmdlineTests/standard_yul_ethdebug_ir/args b/test/cmdlineTests/ethdebug/standard_yul_ethdebug_ir/args
similarity index 100%
rename from test/cmdlineTests/standard_yul_ethdebug_ir/args
rename to test/cmdlineTests/ethdebug/standard_yul_ethdebug_ir/args
diff --git a/test/cmdlineTests/standard_yul_ethdebug_ir/in.yul b/test/cmdlineTests/ethdebug/standard_yul_ethdebug_ir/in.yul
similarity index 100%
rename from test/cmdlineTests/standard_yul_ethdebug_ir/in.yul
rename to test/cmdlineTests/ethdebug/standard_yul_ethdebug_ir/in.yul
diff --git a/test/cmdlineTests/standard_yul_ethdebug_bytecode_ir/input.json b/test/cmdlineTests/ethdebug/standard_yul_ethdebug_ir/input.json
similarity index 68%
rename from test/cmdlineTests/standard_yul_ethdebug_bytecode_ir/input.json
rename to test/cmdlineTests/ethdebug/standard_yul_ethdebug_ir/input.json
index abfb7ee863af..05571275876e 100644
--- a/test/cmdlineTests/standard_yul_ethdebug_bytecode_ir/input.json
+++ b/test/cmdlineTests/ethdebug/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/test/cmdlineTests/standard_yul_ethdebug_ir/output.json b/test/cmdlineTests/ethdebug/standard_yul_ethdebug_ir/output.json
similarity index 100%
rename from test/cmdlineTests/standard_yul_ethdebug_ir/output.json
rename to test/cmdlineTests/ethdebug/standard_yul_ethdebug_ir/output.json
diff --git a/test/cmdlineTests/standard_yul_ethdebug_ir/strip-ethdebug b/test/cmdlineTests/ethdebug/standard_yul_ethdebug_ir/strip-ethdebug
similarity index 100%
rename from test/cmdlineTests/standard_yul_ethdebug_ir/strip-ethdebug
rename to test/cmdlineTests/ethdebug/standard_yul_ethdebug_ir/strip-ethdebug
diff --git a/test/cmdlineTests/standard_yul_ethdebug_iroptimize/args b/test/cmdlineTests/ethdebug/standard_yul_ethdebug_iroptimize/args
similarity index 100%
rename from test/cmdlineTests/standard_yul_ethdebug_iroptimize/args
rename to test/cmdlineTests/ethdebug/standard_yul_ethdebug_iroptimize/args
diff --git a/test/cmdlineTests/standard_yul_ethdebug_iroptimize/in.yul b/test/cmdlineTests/ethdebug/standard_yul_ethdebug_iroptimize/in.yul
similarity index 100%
rename from test/cmdlineTests/standard_yul_ethdebug_iroptimize/in.yul
rename to test/cmdlineTests/ethdebug/standard_yul_ethdebug_iroptimize/in.yul
diff --git a/test/cmdlineTests/standard_yul_ethdebug_iroptimize/input.json b/test/cmdlineTests/ethdebug/standard_yul_ethdebug_iroptimize/input.json
similarity index 66%
rename from test/cmdlineTests/standard_yul_ethdebug_iroptimize/input.json
rename to test/cmdlineTests/ethdebug/standard_yul_ethdebug_iroptimize/input.json
index 180abcf31f8d..baed5871c1ec 100644
--- a/test/cmdlineTests/standard_yul_ethdebug_iroptimize/input.json
+++ b/test/cmdlineTests/ethdebug/standard_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/test/cmdlineTests/standard_yul_ethdebug_iroptimize/output.json b/test/cmdlineTests/ethdebug/standard_yul_ethdebug_iroptimize/output.json
similarity index 100%
rename from test/cmdlineTests/standard_yul_ethdebug_iroptimize/output.json
rename to test/cmdlineTests/ethdebug/standard_yul_ethdebug_iroptimize/output.json
diff --git a/test/cmdlineTests/standard_yul_ethdebug_iroptimize/strip-ethdebug b/test/cmdlineTests/ethdebug/standard_yul_ethdebug_iroptimize/strip-ethdebug
similarity index 100%
rename from test/cmdlineTests/standard_yul_ethdebug_iroptimize/strip-ethdebug
rename to test/cmdlineTests/ethdebug/standard_yul_ethdebug_iroptimize/strip-ethdebug
diff --git a/test/cmdlineTests/standard_yul_ethdebug_optimize_ir/args b/test/cmdlineTests/ethdebug/standard_yul_ethdebug_optimize_ir/args
similarity index 100%
rename from test/cmdlineTests/standard_yul_ethdebug_optimize_ir/args
rename to test/cmdlineTests/ethdebug/standard_yul_ethdebug_optimize_ir/args
diff --git a/test/cmdlineTests/standard_yul_ethdebug_optimize_ir/in.yul b/test/cmdlineTests/ethdebug/standard_yul_ethdebug_optimize_ir/in.yul
similarity index 100%
rename from test/cmdlineTests/standard_yul_ethdebug_optimize_ir/in.yul
rename to test/cmdlineTests/ethdebug/standard_yul_ethdebug_optimize_ir/in.yul
diff --git a/test/cmdlineTests/standard_yul_ethdebug_optimize_ir/input.json b/test/cmdlineTests/ethdebug/standard_yul_ethdebug_optimize_ir/input.json
similarity index 71%
rename from test/cmdlineTests/standard_yul_ethdebug_optimize_ir/input.json
rename to test/cmdlineTests/ethdebug/standard_yul_ethdebug_optimize_ir/input.json
index 9f0c8b0d5cef..edcce936072c 100644
--- a/test/cmdlineTests/standard_yul_ethdebug_optimize_ir/input.json
+++ b/test/cmdlineTests/ethdebug/standard_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/test/cmdlineTests/standard_yul_ethdebug_optimize_ir/output.json b/test/cmdlineTests/ethdebug/standard_yul_ethdebug_optimize_ir/output.json
similarity index 100%
rename from test/cmdlineTests/standard_yul_ethdebug_optimize_ir/output.json
rename to test/cmdlineTests/ethdebug/standard_yul_ethdebug_optimize_ir/output.json
diff --git a/test/cmdlineTests/standard_yul_ethdebug_optimize_iroptimized/args b/test/cmdlineTests/ethdebug/standard_yul_ethdebug_optimize_iroptimized/args
similarity index 100%
rename from test/cmdlineTests/standard_yul_ethdebug_optimize_iroptimized/args
rename to test/cmdlineTests/ethdebug/standard_yul_ethdebug_optimize_iroptimized/args
diff --git a/test/cmdlineTests/standard_yul_ethdebug_optimize_iroptimized/in.yul b/test/cmdlineTests/ethdebug/standard_yul_ethdebug_optimize_iroptimized/in.yul
similarity index 100%
rename from test/cmdlineTests/standard_yul_ethdebug_optimize_iroptimized/in.yul
rename to test/cmdlineTests/ethdebug/standard_yul_ethdebug_optimize_iroptimized/in.yul
diff --git a/test/cmdlineTests/standard_yul_ethdebug_optimize_iroptimized/input.json b/test/cmdlineTests/ethdebug/standard_yul_ethdebug_optimize_iroptimized/input.json
similarity index 69%
rename from test/cmdlineTests/standard_yul_ethdebug_optimize_iroptimized/input.json
rename to test/cmdlineTests/ethdebug/standard_yul_ethdebug_optimize_iroptimized/input.json
index 81b637abd5b5..6d42088ce848 100644
--- a/test/cmdlineTests/standard_yul_ethdebug_optimize_iroptimized/input.json
+++ b/test/cmdlineTests/ethdebug/standard_yul_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/test/cmdlineTests/standard_yul_ethdebug_optimize_iroptimized/output.json b/test/cmdlineTests/ethdebug/standard_yul_ethdebug_optimize_iroptimized/output.json
similarity index 100%
rename from test/cmdlineTests/standard_yul_ethdebug_optimize_iroptimized/output.json
rename to test/cmdlineTests/ethdebug/standard_yul_ethdebug_optimize_iroptimized/output.json
diff --git a/test/cmdlineTests/ethdebug_eof_container_osaka/output b/test/cmdlineTests/ethdebug_eof_container_osaka/output
deleted file mode 100644
index 9d002fadc317..000000000000
--- a/test/cmdlineTests/ethdebug_eof_container_osaka/output
+++ /dev/null
@@ -1,4 +0,0 @@
-======= Debug Data (ethdebug/format/info/resources) =======
-{"compilation":{"compiler":{"name":"solc","version": "<VERSION REMOVED>"},"sources":[{"id":0,"path":"ethdebug_eof_container_osaka/input.sol"}]}}
-
-======= ethdebug_eof_container_osaka/input.sol:C =======