Merge pull request #5685 from androlo/develop

Update command-line tests

101 files changed, 40 insertions, 45 deletions

diff --git a/test/cmdlineTests.sh b/test/cmdlineTests.sh
index 3beee552..1ef1b320 100755
--- a/test/cmdlineTests.sh
+++ b/test/cmdlineTests.sh
@@ -215,32 +215,27 @@ printTask "Testing passing empty remappings..."
 test_solc_behaviour "${0}" "=/some/remapping/target" "" "" 1 "Invalid remapping: \"=/some/remapping/target\"."
 test_solc_behaviour "${0}" "ctx:=/some/remapping/target" "" "" 1 "Invalid remapping: \"ctx:=/some/remapping/target\"."
 
-printTask "Running standard JSON commandline tests..."
-(
-    cd "$REPO_ROOT"/test/cmdlineTests/
-    for file in *.json
-    do
-        args="--standard-json"
-        stdin="$REPO_ROOT/test/cmdlineTests/$file"
-        stdout=$(cat $file.stdout 2>/dev/null || true)
-        exitCode=$(cat $file.exit 2>/dev/null || true)
-        err=$(cat $file.err 2>/dev/null || true)
-        printTask " - $file"
-        test_solc_behaviour "" "$args" "$stdin" "$stdout" "$exitCode" "$err"
-    done
-)
-
 printTask "Running general commandline tests..."
 (
     cd "$REPO_ROOT"/test/cmdlineTests/
-    for file in *.sol
+    for tdir in */
     do
-        args=$(cat $file.args 2>/dev/null || true)
-        stdout=$(cat $file.stdout 2>/dev/null || true)
-        exitCode=$(cat $file.exit 2>/dev/null || true)
-        err=$(cat $file.err 2>/dev/null || true)
-        printTask " - $file"
-        test_solc_behaviour "$file" "$args" "" "$stdout" "$exitCode" "$err"
+        if [ -e "${tdir}/input.json" ]
+        then
+            inputFile=""
+            stdin="${tdir}/input.json"
+            stdout=$(cat ${tdir}/output.json 2>/dev/null || true)
+            args="--standard-json "$(cat ${tdir}/args 2>/dev/null || true)
+        else
+            inputFile="${tdir}input.sol"
+            stdin=""
+            stdout=$(cat ${tdir}/output 2>/dev/null || true)
+            args=$(cat ${tdir}/args 2>/dev/null || true)
+        fi
+        exitCode=$(cat ${tdir}/exit 2>/dev/null || true)
+        err=$(cat ${tdir}/err 2>/dev/null || true)
+        printTask " - ${tdir}"
+        test_solc_behaviour "$inputFile" "$args" "$stdin" "$stdout" "$exitCode" "$err"
     done
 )
 
diff --git a/test/cmdlineTests/data_storage.sol.args b/test/cmdlineTests/data_storage/args
index 3684987e..3684987e 100644
--- a/test/cmdlineTests/data_storage.sol.args
+++ b/test/cmdlineTests/data_storage/args
diff --git a/test/cmdlineTests/data_storage.sol b/test/cmdlineTests/data_storage/input.sol
index cc602cc9..cc602cc9 100644
--- a/test/cmdlineTests/data_storage.sol
+++ b/test/cmdlineTests/data_storage/input.sol
diff --git a/test/cmdlineTests/data_storage.sol.stdout b/test/cmdlineTests/data_storage/output
index 4a5250f7..e0dae4bd 100644
--- a/test/cmdlineTests/data_storage.sol.stdout
+++ b/test/cmdlineTests/data_storage/output
@@ -1,5 +1,5 @@
 
-======= data_storage.sol:C =======
+======= data_storage/input.sol:C =======
 Gas estimation:
 construction:
    306 + 264400 = 264706
diff --git a/test/cmdlineTests/gas_test_dispatch.sol.args b/test/cmdlineTests/gas_test_dispatch/args
index 3684987e..3684987e 100644
--- a/test/cmdlineTests/gas_test_dispatch.sol.args
+++ b/test/cmdlineTests/gas_test_dispatch/args
diff --git a/test/cmdlineTests/gas_test_dispatch.sol b/test/cmdlineTests/gas_test_dispatch/input.sol
index a5ca9e7d..a5ca9e7d 100644
--- a/test/cmdlineTests/gas_test_dispatch.sol
+++ b/test/cmdlineTests/gas_test_dispatch/input.sol
diff --git a/test/cmdlineTests/gas_test_dispatch.sol.stdout b/test/cmdlineTests/gas_test_dispatch/output
index 117affad..d817e85c 100644
--- a/test/cmdlineTests/gas_test_dispatch.sol.stdout
+++ b/test/cmdlineTests/gas_test_dispatch/output
@@ -1,5 +1,5 @@
 
-======= gas_test_dispatch.sol:Large =======
+======= gas_test_dispatch/input.sol:Large =======
 Gas estimation:
 construction:
    1034 + 998400 = 999434
@@ -27,7 +27,7 @@ external:
    g8(uint256):	20721
    g9(uint256):	20678
 
-======= gas_test_dispatch.sol:Medium =======
+======= gas_test_dispatch/input.sol:Medium =======
 Gas estimation:
 construction:
    411 + 376600 = 377011
@@ -42,7 +42,7 @@ external:
    g8(uint256):	20699
    g9(uint256):	20655
 
-======= gas_test_dispatch.sol:Small =======
+======= gas_test_dispatch/input.sol:Small =======
 Gas estimation:
 construction:
    153 + 107800 = 107953
diff --git a/test/cmdlineTests/gas_test_dispatch_optimize.sol.args b/test/cmdlineTests/gas_test_dispatch_optimize/args
index 814e0591..814e0591 100644
--- a/test/cmdlineTests/gas_test_dispatch_optimize.sol.args
+++ b/test/cmdlineTests/gas_test_dispatch_optimize/args
diff --git a/test/cmdlineTests/gas_test_dispatch_optimize.sol b/test/cmdlineTests/gas_test_dispatch_optimize/input.sol
index a5ca9e7d..a5ca9e7d 100644
--- a/test/cmdlineTests/gas_test_dispatch_optimize.sol
+++ b/test/cmdlineTests/gas_test_dispatch_optimize/input.sol
diff --git a/test/cmdlineTests/gas_test_dispatch_optimize.sol.stdout b/test/cmdlineTests/gas_test_dispatch_optimize/output
index 76fa086e..fd8e9e93 100644
--- a/test/cmdlineTests/gas_test_dispatch_optimize.sol.stdout
+++ b/test/cmdlineTests/gas_test_dispatch_optimize/output
@@ -1,5 +1,5 @@
 
-======= gas_test_dispatch_optimize.sol:Large =======
+======= gas_test_dispatch_optimize/input.sol:Large =======
 Gas estimation:
 construction:
    300 + 262000 = 262300
@@ -27,7 +27,7 @@ external:
    g8(uint256):	20980
    g9(uint256):	20826
 
-======= gas_test_dispatch_optimize.sol:Medium =======
+======= gas_test_dispatch_optimize/input.sol:Medium =======
 Gas estimation:
 construction:
    190 + 143000 = 143190
@@ -42,7 +42,7 @@ external:
    g8(uint256):	20870
    g9(uint256):	20826
 
-======= gas_test_dispatch_optimize.sol:Small =======
+======= gas_test_dispatch_optimize/input.sol:Small =======
 Gas estimation:
 construction:
    117 + 67400 = 67517
diff --git a/test/cmdlineTests/standard_binaries_requested.json b/test/cmdlineTests/standard_binaries_requested/input.json
index 65f19543..65f19543 100644
--- a/test/cmdlineTests/standard_binaries_requested.json
+++ b/test/cmdlineTests/standard_binaries_requested/input.json
diff --git a/test/cmdlineTests/standard_binaries_requested.json.stdout b/test/cmdlineTests/standard_binaries_requested/output.json
index 2baef22a..2baef22a 100644
--- a/test/cmdlineTests/standard_binaries_requested.json.stdout
+++ b/test/cmdlineTests/standard_binaries_requested/output.json
diff --git a/test/cmdlineTests/standard.json.exit b/test/cmdlineTests/standard_default_success/exit
index 573541ac..573541ac 100644
--- a/test/cmdlineTests/standard.json.exit
+++ b/test/cmdlineTests/standard_default_success/exit
diff --git a/test/cmdlineTests/standard.json b/test/cmdlineTests/standard_default_success/input.json
index 826253b8..826253b8 100644
--- a/test/cmdlineTests/standard.json
+++ b/test/cmdlineTests/standard_default_success/input.json
diff --git a/test/cmdlineTests/standard.json.stdout b/test/cmdlineTests/standard_default_success/output.json
index 59b90c8c..59b90c8c 100644
--- a/test/cmdlineTests/standard.json.stdout
+++ b/test/cmdlineTests/standard_default_success/output.json
diff --git a/test/cmdlineTests/standard_methodIdentifiersRequested.json b/test/cmdlineTests/standard_method_identifiers_requested/input.json
index 79a3c75d..79a3c75d 100644
--- a/test/cmdlineTests/standard_methodIdentifiersRequested.json
+++ b/test/cmdlineTests/standard_method_identifiers_requested/input.json
diff --git a/test/cmdlineTests/standard_methodIdentifiersRequested.json.stdout b/test/cmdlineTests/standard_method_identifiers_requested/output.json
index 7e3f139f..7e3f139f 100644
--- a/test/cmdlineTests/standard_methodIdentifiersRequested.json.stdout
+++ b/test/cmdlineTests/standard_method_identifiers_requested/output.json
diff --git a/test/cmdlineTests/standard_only_ast_requested.json b/test/cmdlineTests/standard_only_ast_requested/input.json
index 7abd6da5..7abd6da5 100644
--- a/test/cmdlineTests/standard_only_ast_requested.json
+++ b/test/cmdlineTests/standard_only_ast_requested/input.json
diff --git a/test/cmdlineTests/standard_only_ast_requested.json.stdout b/test/cmdlineTests/standard_only_ast_requested/output.json
index b884ab7d..b884ab7d 100644
--- a/test/cmdlineTests/standard_only_ast_requested.json.stdout
+++ b/test/cmdlineTests/standard_only_ast_requested/output.json
diff --git a/test/cmdlineTests/standard_wrong_key_auxiliary_input.json.exit b/test/cmdlineTests/standard_wrong_key_auxiliary_input/exit
index 573541ac..573541ac 100644
--- a/test/cmdlineTests/standard_wrong_key_auxiliary_input.json.exit
+++ b/test/cmdlineTests/standard_wrong_key_auxiliary_input/exit
diff --git a/test/cmdlineTests/standard_wrong_key_auxiliary_input.json b/test/cmdlineTests/standard_wrong_key_auxiliary_input/input.json
index 51dbce41..51dbce41 100644
--- a/test/cmdlineTests/standard_wrong_key_auxiliary_input.json
+++ b/test/cmdlineTests/standard_wrong_key_auxiliary_input/input.json
diff --git a/test/cmdlineTests/standard_wrong_key_auxiliary_input.json.stdout b/test/cmdlineTests/standard_wrong_key_auxiliary_input/output.json
index 077ac47e..077ac47e 100644
--- a/test/cmdlineTests/standard_wrong_key_auxiliary_input.json.stdout
+++ b/test/cmdlineTests/standard_wrong_key_auxiliary_input/output.json
diff --git a/test/cmdlineTests/standard_wrong_key_metadata.json.exit b/test/cmdlineTests/standard_wrong_key_metadata/exit
index 573541ac..573541ac 100644
--- a/test/cmdlineTests/standard_wrong_key_metadata.json.exit
+++ b/test/cmdlineTests/standard_wrong_key_metadata/exit
diff --git a/test/cmdlineTests/standard_wrong_key_metadata.json b/test/cmdlineTests/standard_wrong_key_metadata/input.json
index 490e489a..490e489a 100644
--- a/test/cmdlineTests/standard_wrong_key_metadata.json
+++ b/test/cmdlineTests/standard_wrong_key_metadata/input.json
diff --git a/test/cmdlineTests/standard_wrong_key_metadata.json.stdout b/test/cmdlineTests/standard_wrong_key_metadata/output.json
index 077ac47e..077ac47e 100644
--- a/test/cmdlineTests/standard_wrong_key_metadata.json.stdout
+++ b/test/cmdlineTests/standard_wrong_key_metadata/output.json
diff --git a/test/cmdlineTests/standard_wrong_key_optimizer.json.exit b/test/cmdlineTests/standard_wrong_key_optimizer/exit
index 573541ac..573541ac 100644
--- a/test/cmdlineTests/standard_wrong_key_optimizer.json.exit
+++ b/test/cmdlineTests/standard_wrong_key_optimizer/exit
diff --git a/test/cmdlineTests/standard_wrong_key_optimizer.json b/test/cmdlineTests/standard_wrong_key_optimizer/input.json
index c28c3a92..c28c3a92 100644
--- a/test/cmdlineTests/standard_wrong_key_optimizer.json
+++ b/test/cmdlineTests/standard_wrong_key_optimizer/input.json
diff --git a/test/cmdlineTests/standard_wrong_key_optimizer.json.stdout b/test/cmdlineTests/standard_wrong_key_optimizer/output.json
index 077ac47e..077ac47e 100644
--- a/test/cmdlineTests/standard_wrong_key_optimizer.json.stdout
+++ b/test/cmdlineTests/standard_wrong_key_optimizer/output.json
diff --git a/test/cmdlineTests/standard_wrong_key_root.json.exit b/test/cmdlineTests/standard_wrong_key_root/exit
index 573541ac..573541ac 100644
--- a/test/cmdlineTests/standard_wrong_key_root.json.exit
+++ b/test/cmdlineTests/standard_wrong_key_root/exit
diff --git a/test/cmdlineTests/standard_wrong_key_root.json b/test/cmdlineTests/standard_wrong_key_root/input.json
index 4689c50c..4689c50c 100644
--- a/test/cmdlineTests/standard_wrong_key_root.json
+++ b/test/cmdlineTests/standard_wrong_key_root/input.json
diff --git a/test/cmdlineTests/standard_wrong_key_root.json.stdout b/test/cmdlineTests/standard_wrong_key_root/output.json
index 077ac47e..077ac47e 100644
--- a/test/cmdlineTests/standard_wrong_key_root.json.stdout
+++ b/test/cmdlineTests/standard_wrong_key_root/output.json
diff --git a/test/cmdlineTests/standard_wrong_key_settings.json.exit b/test/cmdlineTests/standard_wrong_key_settings/exit
index 573541ac..573541ac 100644
--- a/test/cmdlineTests/standard_wrong_key_settings.json.exit
+++ b/test/cmdlineTests/standard_wrong_key_settings/exit
diff --git a/test/cmdlineTests/standard_wrong_key_settings.json b/test/cmdlineTests/standard_wrong_key_settings/input.json
index d7809b1c..d7809b1c 100644
--- a/test/cmdlineTests/standard_wrong_key_settings.json
+++ b/test/cmdlineTests/standard_wrong_key_settings/input.json
diff --git a/test/cmdlineTests/standard_wrong_key_settings.json.stdout b/test/cmdlineTests/standard_wrong_key_settings/output.json
index 077ac47e..077ac47e 100644
--- a/test/cmdlineTests/standard_wrong_key_settings.json.stdout
+++ b/test/cmdlineTests/standard_wrong_key_settings/output.json
diff --git a/test/cmdlineTests/standard_wrong_key_source.json.exit b/test/cmdlineTests/standard_wrong_key_source/exit
index 573541ac..573541ac 100644
--- a/test/cmdlineTests/standard_wrong_key_source.json.exit
+++ b/test/cmdlineTests/standard_wrong_key_source/exit
diff --git a/test/cmdlineTests/standard_wrong_key_source.json b/test/cmdlineTests/standard_wrong_key_source/input.json
index d8a8aa16..d8a8aa16 100644
--- a/test/cmdlineTests/standard_wrong_key_source.json
+++ b/test/cmdlineTests/standard_wrong_key_source/input.json
diff --git a/test/cmdlineTests/standard_wrong_key_source.json.stdout b/test/cmdlineTests/standard_wrong_key_source/output.json
index 077ac47e..077ac47e 100644
--- a/test/cmdlineTests/standard_wrong_key_source.json.stdout
+++ b/test/cmdlineTests/standard_wrong_key_source/output.json
diff --git a/test/cmdlineTests/standard_wrong_type_auxiliary_input.json.exit b/test/cmdlineTests/standard_wrong_type_auxiliary_input/exit
index 573541ac..573541ac 100644
--- a/test/cmdlineTests/standard_wrong_type_auxiliary_input.json.exit
+++ b/test/cmdlineTests/standard_wrong_type_auxiliary_input/exit
diff --git a/test/cmdlineTests/standard_wrong_type_auxiliary_input.json b/test/cmdlineTests/standard_wrong_type_auxiliary_input/input.json
index 8d2c7593..8d2c7593 100644
--- a/test/cmdlineTests/standard_wrong_type_auxiliary_input.json
+++ b/test/cmdlineTests/standard_wrong_type_auxiliary_input/input.json
diff --git a/test/cmdlineTests/standard_wrong_type_auxiliary_input.json.stdout b/test/cmdlineTests/standard_wrong_type_auxiliary_input/output.json
index 046cb6d9..046cb6d9 100644
--- a/test/cmdlineTests/standard_wrong_type_auxiliary_input.json.stdout
+++ b/test/cmdlineTests/standard_wrong_type_auxiliary_input/output.json
diff --git a/test/cmdlineTests/standard_wrong_type_auxiliary_input_smtlib2responses.json.exit b/test/cmdlineTests/standard_wrong_type_auxiliary_input_smtlib2responses/exit
index 573541ac..573541ac 100644
--- a/test/cmdlineTests/standard_wrong_type_auxiliary_input_smtlib2responses.json.exit
+++ b/test/cmdlineTests/standard_wrong_type_auxiliary_input_smtlib2responses/exit
diff --git a/test/cmdlineTests/standard_wrong_type_auxiliary_input_smtlib2responses.json b/test/cmdlineTests/standard_wrong_type_auxiliary_input_smtlib2responses/input.json
index 9175050f..9175050f 100644
--- a/test/cmdlineTests/standard_wrong_type_auxiliary_input_smtlib2responses.json
+++ b/test/cmdlineTests/standard_wrong_type_auxiliary_input_smtlib2responses/input.json
diff --git a/test/cmdlineTests/standard_wrong_type_auxiliary_input_smtlib2responses.json.stdout b/test/cmdlineTests/standard_wrong_type_auxiliary_input_smtlib2responses/output.json
index 3efaea20..3efaea20 100644
--- a/test/cmdlineTests/standard_wrong_type_auxiliary_input_smtlib2responses.json.stdout
+++ b/test/cmdlineTests/standard_wrong_type_auxiliary_input_smtlib2responses/output.json
diff --git a/test/cmdlineTests/standard_wrong_type_auxiliary_input_smtlib2responses_member.json.exit b/test/cmdlineTests/standard_wrong_type_auxiliary_input_smtlib2responses_member/exit
index 573541ac..573541ac 100644
--- a/test/cmdlineTests/standard_wrong_type_auxiliary_input_smtlib2responses_member.json.exit
+++ b/test/cmdlineTests/standard_wrong_type_auxiliary_input_smtlib2responses_member/exit
diff --git a/test/cmdlineTests/standard_wrong_type_auxiliary_input_smtlib2responses_member.json b/test/cmdlineTests/standard_wrong_type_auxiliary_input_smtlib2responses_member/input.json
index aa7d451b..aa7d451b 100644
--- a/test/cmdlineTests/standard_wrong_type_auxiliary_input_smtlib2responses_member.json
+++ b/test/cmdlineTests/standard_wrong_type_auxiliary_input_smtlib2responses_member/input.json
diff --git a/test/cmdlineTests/standard_wrong_type_auxiliary_input_smtlib2responses_member.json.stdout b/test/cmdlineTests/standard_wrong_type_auxiliary_input_smtlib2responses_member/output.json
index a05176be..a05176be 100644
--- a/test/cmdlineTests/standard_wrong_type_auxiliary_input_smtlib2responses_member.json.stdout
+++ b/test/cmdlineTests/standard_wrong_type_auxiliary_input_smtlib2responses_member/output.json
diff --git a/test/cmdlineTests/standard_wrong_type_metadata.json.exit b/test/cmdlineTests/standard_wrong_type_metadata/exit
index 573541ac..573541ac 100644
--- a/test/cmdlineTests/standard_wrong_type_metadata.json.exit
+++ b/test/cmdlineTests/standard_wrong_type_metadata/exit
diff --git a/test/cmdlineTests/standard_wrong_type_metadata.json b/test/cmdlineTests/standard_wrong_type_metadata/input.json
index d4dd06a1..d4dd06a1 100644
--- a/test/cmdlineTests/standard_wrong_type_metadata.json
+++ b/test/cmdlineTests/standard_wrong_type_metadata/input.json
diff --git a/test/cmdlineTests/standard_wrong_type_metadata.json.stdout b/test/cmdlineTests/standard_wrong_type_metadata/output.json
index 7b997cec..7b997cec 100644
--- a/test/cmdlineTests/standard_wrong_type_metadata.json.stdout
+++ b/test/cmdlineTests/standard_wrong_type_metadata/output.json
diff --git a/test/cmdlineTests/standard_wrong_type_optimizer.json.exit b/test/cmdlineTests/standard_wrong_type_optimizer/exit
index 573541ac..573541ac 100644
--- a/test/cmdlineTests/standard_wrong_type_optimizer.json.exit
+++ b/test/cmdlineTests/standard_wrong_type_optimizer/exit
diff --git a/test/cmdlineTests/standard_wrong_type_optimizer.json b/test/cmdlineTests/standard_wrong_type_optimizer/input.json
index b42ca550..b42ca550 100644
--- a/test/cmdlineTests/standard_wrong_type_optimizer.json
+++ b/test/cmdlineTests/standard_wrong_type_optimizer/input.json
diff --git a/test/cmdlineTests/standard_wrong_type_optimizer.json.stdout b/test/cmdlineTests/standard_wrong_type_optimizer/output.json
index d43b6470..d43b6470 100644
--- a/test/cmdlineTests/standard_wrong_type_optimizer.json.stdout
+++ b/test/cmdlineTests/standard_wrong_type_optimizer/output.json
diff --git a/test/cmdlineTests/standard_wrong_type_output_selection.json.exit b/test/cmdlineTests/standard_wrong_type_output_selection/exit
index 573541ac..573541ac 100644
--- a/test/cmdlineTests/standard_wrong_type_output_selection.json.exit
+++ b/test/cmdlineTests/standard_wrong_type_output_selection/exit
diff --git a/test/cmdlineTests/standard_wrong_type_output_selection.json b/test/cmdlineTests/standard_wrong_type_output_selection/input.json
index a7b615d1..a7b615d1 100644
--- a/test/cmdlineTests/standard_wrong_type_output_selection.json
+++ b/test/cmdlineTests/standard_wrong_type_output_selection/input.json
diff --git a/test/cmdlineTests/standard_wrong_type_output_selection.json.stdout b/test/cmdlineTests/standard_wrong_type_output_selection/output.json
index 39e74882..39e74882 100644
--- a/test/cmdlineTests/standard_wrong_type_output_selection.json.stdout
+++ b/test/cmdlineTests/standard_wrong_type_output_selection/output.json
diff --git a/test/cmdlineTests/standard_wrong_type_output_selection_contract.json.exit b/test/cmdlineTests/standard_wrong_type_output_selection_contract/exit
index 573541ac..573541ac 100644
--- a/test/cmdlineTests/standard_wrong_type_output_selection_contract.json.exit
+++ b/test/cmdlineTests/standard_wrong_type_output_selection_contract/exit
diff --git a/test/cmdlineTests/standard_wrong_type_output_selection_contract.json b/test/cmdlineTests/standard_wrong_type_output_selection_contract/input.json
index 9840a97e..9840a97e 100644
--- a/test/cmdlineTests/standard_wrong_type_output_selection_contract.json
+++ b/test/cmdlineTests/standard_wrong_type_output_selection_contract/input.json
diff --git a/test/cmdlineTests/standard_wrong_type_output_selection_contract.json.stdout b/test/cmdlineTests/standard_wrong_type_output_selection_contract/output.json
index a4ba320e..a4ba320e 100644
--- a/test/cmdlineTests/standard_wrong_type_output_selection_contract.json.stdout
+++ b/test/cmdlineTests/standard_wrong_type_output_selection_contract/output.json
diff --git a/test/cmdlineTests/standard_wrong_type_output_selection_file.json.exit b/test/cmdlineTests/standard_wrong_type_output_selection_file/exit
index 573541ac..573541ac 100644
--- a/test/cmdlineTests/standard_wrong_type_output_selection_file.json.exit
+++ b/test/cmdlineTests/standard_wrong_type_output_selection_file/exit
diff --git a/test/cmdlineTests/standard_wrong_type_output_selection_file.json b/test/cmdlineTests/standard_wrong_type_output_selection_file/input.json
index 7ab12ba8..7ab12ba8 100644
--- a/test/cmdlineTests/standard_wrong_type_output_selection_file.json
+++ b/test/cmdlineTests/standard_wrong_type_output_selection_file/input.json
diff --git a/test/cmdlineTests/standard_wrong_type_output_selection_file.json.stdout b/test/cmdlineTests/standard_wrong_type_output_selection_file/output.json
index 8874e636..8874e636 100644
--- a/test/cmdlineTests/standard_wrong_type_output_selection_file.json.stdout
+++ b/test/cmdlineTests/standard_wrong_type_output_selection_file/output.json
diff --git a/test/cmdlineTests/standard_wrong_type_output_selection_output.json.exit b/test/cmdlineTests/standard_wrong_type_output_selection_output/exit
index 573541ac..573541ac 100644
--- a/test/cmdlineTests/standard_wrong_type_output_selection_output.json.exit
+++ b/test/cmdlineTests/standard_wrong_type_output_selection_output/exit
diff --git a/test/cmdlineTests/standard_wrong_type_output_selection_output.json b/test/cmdlineTests/standard_wrong_type_output_selection_output/input.json
index 3e5cd661..3e5cd661 100644
--- a/test/cmdlineTests/standard_wrong_type_output_selection_output.json
+++ b/test/cmdlineTests/standard_wrong_type_output_selection_output/input.json
diff --git a/test/cmdlineTests/standard_wrong_type_output_selection_output.json.stdout b/test/cmdlineTests/standard_wrong_type_output_selection_output/output.json
index a4ba320e..a4ba320e 100644
--- a/test/cmdlineTests/standard_wrong_type_output_selection_output.json.stdout
+++ b/test/cmdlineTests/standard_wrong_type_output_selection_output/output.json
diff --git a/test/cmdlineTests/standard_wrong_type_remappings.json.exit b/test/cmdlineTests/standard_wrong_type_remappings/exit
index 573541ac..573541ac 100644
--- a/test/cmdlineTests/standard_wrong_type_remappings.json.exit
+++ b/test/cmdlineTests/standard_wrong_type_remappings/exit
diff --git a/test/cmdlineTests/standard_wrong_type_remappings.json b/test/cmdlineTests/standard_wrong_type_remappings/input.json
index 1436e014..1436e014 100644
--- a/test/cmdlineTests/standard_wrong_type_remappings.json
+++ b/test/cmdlineTests/standard_wrong_type_remappings/input.json
diff --git a/test/cmdlineTests/standard_wrong_type_remappings.json.stdout b/test/cmdlineTests/standard_wrong_type_remappings/output.json
index b5e4ea5c..b5e4ea5c 100644
--- a/test/cmdlineTests/standard_wrong_type_remappings.json.stdout
+++ b/test/cmdlineTests/standard_wrong_type_remappings/output.json
diff --git a/test/cmdlineTests/standard_wrong_type_remappings_entry.json.exit b/test/cmdlineTests/standard_wrong_type_remappings_entry/exit
index 573541ac..573541ac 100644
--- a/test/cmdlineTests/standard_wrong_type_remappings_entry.json.exit
+++ b/test/cmdlineTests/standard_wrong_type_remappings_entry/exit
diff --git a/test/cmdlineTests/standard_wrong_type_remappings_entry.json b/test/cmdlineTests/standard_wrong_type_remappings_entry/input.json
index c96611f3..c96611f3 100644
--- a/test/cmdlineTests/standard_wrong_type_remappings_entry.json
+++ b/test/cmdlineTests/standard_wrong_type_remappings_entry/input.json
diff --git a/test/cmdlineTests/standard_wrong_type_remappings_entry.json.stdout b/test/cmdlineTests/standard_wrong_type_remappings_entry/output.json
index 0fc71ded..0fc71ded 100644
--- a/test/cmdlineTests/standard_wrong_type_remappings_entry.json.stdout
+++ b/test/cmdlineTests/standard_wrong_type_remappings_entry/output.json
diff --git a/test/cmdlineTests/standard_wrong_type_root.json.exit b/test/cmdlineTests/standard_wrong_type_root/exit
index 573541ac..573541ac 100644
--- a/test/cmdlineTests/standard_wrong_type_root.json.exit
+++ b/test/cmdlineTests/standard_wrong_type_root/exit
diff --git a/test/cmdlineTests/standard_wrong_type_root.json b/test/cmdlineTests/standard_wrong_type_root/input.json
index 4763607a..4763607a 100644
--- a/test/cmdlineTests/standard_wrong_type_root.json
+++ b/test/cmdlineTests/standard_wrong_type_root/input.json
diff --git a/test/cmdlineTests/standard_wrong_type_root.json.stdout b/test/cmdlineTests/standard_wrong_type_root/output.json
index 15c12e77..15c12e77 100644
--- a/test/cmdlineTests/standard_wrong_type_root.json.stdout
+++ b/test/cmdlineTests/standard_wrong_type_root/output.json
diff --git a/test/cmdlineTests/standard_wrong_type_settings.json.exit b/test/cmdlineTests/standard_wrong_type_settings/exit
index 573541ac..573541ac 100644
--- a/test/cmdlineTests/standard_wrong_type_settings.json.exit
+++ b/test/cmdlineTests/standard_wrong_type_settings/exit
diff --git a/test/cmdlineTests/standard_wrong_type_settings.json b/test/cmdlineTests/standard_wrong_type_settings/input.json
index 7cdb0881..7cdb0881 100644
--- a/test/cmdlineTests/standard_wrong_type_settings.json
+++ b/test/cmdlineTests/standard_wrong_type_settings/input.json
diff --git a/test/cmdlineTests/standard_wrong_type_settings.json.stdout b/test/cmdlineTests/standard_wrong_type_settings/output.json
index c78c6086..c78c6086 100644
--- a/test/cmdlineTests/standard_wrong_type_settings.json.stdout
+++ b/test/cmdlineTests/standard_wrong_type_settings/output.json
diff --git a/test/cmdlineTests/standard_wrong_type_source.json.exit b/test/cmdlineTests/standard_wrong_type_source/exit
index 573541ac..573541ac 100644
--- a/test/cmdlineTests/standard_wrong_type_source.json.exit
+++ b/test/cmdlineTests/standard_wrong_type_source/exit
diff --git a/test/cmdlineTests/standard_wrong_type_source.json b/test/cmdlineTests/standard_wrong_type_source/input.json
index d58504fe..d58504fe 100644
--- a/test/cmdlineTests/standard_wrong_type_source.json
+++ b/test/cmdlineTests/standard_wrong_type_source/input.json
diff --git a/test/cmdlineTests/standard_wrong_type_source.json.stdout b/test/cmdlineTests/standard_wrong_type_source/output.json
index 98fe32fd..98fe32fd 100644
--- a/test/cmdlineTests/standard_wrong_type_source.json.stdout
+++ b/test/cmdlineTests/standard_wrong_type_source/output.json
diff --git a/test/cmdlineTests/standard_wrong_type_sources.json.exit b/test/cmdlineTests/standard_wrong_type_sources/exit
index 573541ac..573541ac 100644
--- a/test/cmdlineTests/standard_wrong_type_sources.json.exit
+++ b/test/cmdlineTests/standard_wrong_type_sources/exit
diff --git a/test/cmdlineTests/standard_wrong_type_sources.json b/test/cmdlineTests/standard_wrong_type_sources/input.json
index 76e1ae7d..76e1ae7d 100644
--- a/test/cmdlineTests/standard_wrong_type_sources.json
+++ b/test/cmdlineTests/standard_wrong_type_sources/input.json
diff --git a/test/cmdlineTests/standard_wrong_type_sources.json.stdout b/test/cmdlineTests/standard_wrong_type_sources/output.json
index ac6c613f..ac6c613f 100644
--- a/test/cmdlineTests/standard_wrong_type_sources.json.stdout
+++ b/test/cmdlineTests/standard_wrong_type_sources/output.json
diff --git a/test/cmdlineTests/too_long_line.sol.err b/test/cmdlineTests/too_long_line/err
index 55cd1935..bfbc8e1e 100644
--- a/test/cmdlineTests/too_long_line.sol.err
+++ b/test/cmdlineTests/too_long_line/err
@@ -1,6 +1,6 @@
-too_long_line.sol:1:1: Warning: Source file does not specify required compiler version!
+too_long_line/input.sol:1:1: Warning: Source file does not specify required compiler version!
 contract C {
 ^ (Relevant source part starts here and spans across multiple lines).
-too_long_line.sol:2:164: Error: Identifier not found or not unique.
+too_long_line/input.sol:2:164: Error: Identifier not found or not unique.
  ... ffffffffffffffffffffffffffffffffff(announcementType Type, string Announcement, string  ...
                                         ^--------------^
diff --git a/test/cmdlineTests/too_long_line.sol.exit b/test/cmdlineTests/too_long_line/exit
index d00491fd..d00491fd 100644
--- a/test/cmdlineTests/too_long_line.sol.exit
+++ b/test/cmdlineTests/too_long_line/exit
diff --git a/test/cmdlineTests/too_long_line.sol b/test/cmdlineTests/too_long_line/input.sol
index 7df1057a..7df1057a 100644
--- a/test/cmdlineTests/too_long_line.sol
+++ b/test/cmdlineTests/too_long_line/input.sol
diff --git a/test/cmdlineTests/too_long_line_both_sides_short.sol.err b/test/cmdlineTests/too_long_line_both_sides_short/err
index 9a5ebfba..2868fcb1 100644
--- a/test/cmdlineTests/too_long_line_both_sides_short.sol.err
+++ b/test/cmdlineTests/too_long_line_both_sides_short/err
@@ -1,6 +1,6 @@
-too_long_line_both_sides_short.sol:1:1: Warning: Source file does not specify required compiler version!
+too_long_line_both_sides_short/input.sol:1:1: Warning: Source file does not specify required compiler version!
 contract C {
 ^ (Relevant source part starts here and spans across multiple lines).
-too_long_line_both_sides_short.sol:2:15: Error: Identifier not found or not unique.
+too_long_line_both_sides_short/input.sol:2:15: Error: Identifier not found or not unique.
    function f(announcementTypeXXXXXXXXXXXXXXXXXXX ... XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX Type,
               ^-------------------------------------------------------------------------^
diff --git a/test/cmdlineTests/too_long_line_both_sides_short.sol.exit b/test/cmdlineTests/too_long_line_both_sides_short/exit
index d00491fd..d00491fd 100644
--- a/test/cmdlineTests/too_long_line_both_sides_short.sol.exit
+++ b/test/cmdlineTests/too_long_line_both_sides_short/exit
diff --git a/test/cmdlineTests/too_long_line_both_sides_short.sol b/test/cmdlineTests/too_long_line_both_sides_short/input.sol
index 062f0292..062f0292 100644
--- a/test/cmdlineTests/too_long_line_both_sides_short.sol
+++ b/test/cmdlineTests/too_long_line_both_sides_short/input.sol
diff --git a/test/cmdlineTests/too_long_line_edge_in.sol.err b/test/cmdlineTests/too_long_line_edge_in/err
index ad3b7805..626451e1 100644
--- a/test/cmdlineTests/too_long_line_edge_in.sol.err
+++ b/test/cmdlineTests/too_long_line_edge_in/err
@@ -1,6 +1,6 @@
-too_long_line_edge_in.sol:1:1: Warning: Source file does not specify required compiler version!
+too_long_line_edge_in/input.sol:1:1: Warning: Source file does not specify required compiler version!
 contract C {
 ^ (Relevant source part starts here and spans across multiple lines).
-too_long_line_edge_in.sol:2:36: Error: Identifier not found or not unique.
+too_long_line_edge_in/input.sol:2:36: Error: Identifier not found or not unique.
    function ffffffffffffffffffffff(announcementTypeTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTT Ty, string A) onlyOwner external {
                                    ^----------------------------------------------------------------------------------------------^
diff --git a/test/cmdlineTests/too_long_line_edge_in.sol.exit b/test/cmdlineTests/too_long_line_edge_in/exit
index d00491fd..d00491fd 100644
--- a/test/cmdlineTests/too_long_line_edge_in.sol.exit
+++ b/test/cmdlineTests/too_long_line_edge_in/exit
diff --git a/test/cmdlineTests/too_long_line_edge_in.sol b/test/cmdlineTests/too_long_line_edge_in/input.sol
index 6f181c83..6f181c83 100644
--- a/test/cmdlineTests/too_long_line_edge_in.sol
+++ b/test/cmdlineTests/too_long_line_edge_in/input.sol
diff --git a/test/cmdlineTests/too_long_line_edge_out.sol.err b/test/cmdlineTests/too_long_line_edge_out/err
index d8495c11..7a4f935a 100644
--- a/test/cmdlineTests/too_long_line_edge_out.sol.err
+++ b/test/cmdlineTests/too_long_line_edge_out/err
@@ -1,6 +1,6 @@
-too_long_line_edge_out.sol:1:1: Warning: Source file does not specify required compiler version!
+too_long_line_edge_out/input.sol:1:1: Warning: Source file does not specify required compiler version!
 contract C {
 ^ (Relevant source part starts here and spans across multiple lines).
-too_long_line_edge_out.sol:2:37: Error: Identifier not found or not unique.
+too_long_line_edge_out/input.sol:2:37: Error: Identifier not found or not unique.
  ...   function fffffffffffffffffffffff(announcementTypeTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTT Typ, string A) onlyOwner external  ...
                                         ^----------------------------------------------------------------------------------------------^
diff --git a/test/cmdlineTests/too_long_line_edge_out.sol.exit b/test/cmdlineTests/too_long_line_edge_out/exit
index d00491fd..d00491fd 100644
--- a/test/cmdlineTests/too_long_line_edge_out.sol.exit
+++ b/test/cmdlineTests/too_long_line_edge_out/exit
diff --git a/test/cmdlineTests/too_long_line_edge_out.sol b/test/cmdlineTests/too_long_line_edge_out/input.sol
index 29d3cee6..29d3cee6 100644
--- a/test/cmdlineTests/too_long_line_edge_out.sol
+++ b/test/cmdlineTests/too_long_line_edge_out/input.sol
diff --git a/test/cmdlineTests/too_long_line_left_short.sol.err b/test/cmdlineTests/too_long_line_left_short.sol.err
deleted file mode 100644
index 00b6be5c..00000000
--- a/test/cmdlineTests/too_long_line_left_short.sol.err
+++ /dev/null
@@ -1,6 +0,0 @@
-too_long_line_left_short.sol:1:1: Warning: Source file does not specify required compiler version!
-contract C {
-^ (Relevant source part starts here and spans across multiple lines).
-too_long_line_left_short.sol:2:15: Error: Identifier not found or not unique.
-   function f(announcementType Type, string Announcement, string  ...
-              ^--------------^
diff --git a/test/cmdlineTests/too_long_line_left_short/err b/test/cmdlineTests/too_long_line_left_short/err
new file mode 100644
index 00000000..4aa830b6
--- /dev/null
+++ b/test/cmdlineTests/too_long_line_left_short/err
@@ -0,0 +1,6 @@
+too_long_line_left_short/input.sol:1:1: Warning: Source file does not specify required compiler version!
+contract C {
+^ (Relevant source part starts here and spans across multiple lines).
+too_long_line_left_short/input.sol:2:15: Error: Identifier not found or not unique.
+   function f(announcementType Type, string Announcement, string  ...
+              ^--------------^
diff --git a/test/cmdlineTests/too_long_line_left_short.sol.exit b/test/cmdlineTests/too_long_line_left_short/exit
index d00491fd..d00491fd 100644
--- a/test/cmdlineTests/too_long_line_left_short.sol.exit
+++ b/test/cmdlineTests/too_long_line_left_short/exit
diff --git a/test/cmdlineTests/too_long_line_left_short.sol b/test/cmdlineTests/too_long_line_left_short/input.sol
index 2accfcce..2accfcce 100644
--- a/test/cmdlineTests/too_long_line_left_short.sol
+++ b/test/cmdlineTests/too_long_line_left_short/input.sol
diff --git a/test/cmdlineTests/too_long_line_right_short.sol.err b/test/cmdlineTests/too_long_line_right_short/err
index 88072d95..ed992565 100644
--- a/test/cmdlineTests/too_long_line_right_short.sol.err
+++ b/test/cmdlineTests/too_long_line_right_short/err
@@ -1,6 +1,6 @@
-too_long_line_right_short.sol:1:1: Warning: Source file does not specify required compiler version!
+too_long_line_right_short/input.sol:1:1: Warning: Source file does not specify required compiler version!
 contract C {
 ^ (Relevant source part starts here and spans across multiple lines).
-too_long_line_right_short.sol:2:164: Error: Identifier not found or not unique.
+too_long_line_right_short/input.sol:2:164: Error: Identifier not found or not unique.
  ... ffffffffffffffffffffffffffffffffff(announcementType Type,
                                         ^--------------^
diff --git a/test/cmdlineTests/too_long_line_right_short.sol.exit b/test/cmdlineTests/too_long_line_right_short/exit
index d00491fd..d00491fd 100644
--- a/test/cmdlineTests/too_long_line_right_short.sol.exit
+++ b/test/cmdlineTests/too_long_line_right_short/exit
diff --git a/test/cmdlineTests/too_long_line_right_short.sol b/test/cmdlineTests/too_long_line_right_short/input.sol
index 936b3961..936b3961 100644
--- a/test/cmdlineTests/too_long_line_right_short.sol
+++ b/test/cmdlineTests/too_long_line_right_short/input.sol