cmdlineTests: Remove unnecessary subshells

- Whitespace-only change, separated out to make it easy to diff.
2023-10-03 13:03:40 +00:00 · 2023-06-01 18:44:23 +02:00 · 2023-06-01 18:44:23 +02:00 · c1df8ed563
commit c1df8ed563
parent 6b061ba696
11 changed files with 161 additions and 162 deletions
--- a/test/cmdlineTests/~assembler_modes/test.sh
+++ b/test/cmdlineTests/~assembler_modes/test.sh
@ -25,22 +25,20 @@ function test_solc_assembly_output
 }

 printTask "Testing assemble, yul, strict-assembly and optimize..."
-(
-    echo '{}' | msg_on_error --silent "$SOLC" - --assemble
-    echo '{}' | msg_on_error --silent "$SOLC" - --yul
-    echo '{}' | msg_on_error --silent "$SOLC" - --strict-assembly
+echo '{}' | msg_on_error --silent "$SOLC" - --assemble
+echo '{}' | msg_on_error --silent "$SOLC" - --yul
+echo '{}' | msg_on_error --silent "$SOLC" - --strict-assembly

-    # Test options above in conjunction with --optimize.
-    # Using both, --assemble and --optimize should fail.
-    echo '{}' | "$SOLC" - --assemble --optimize &>/dev/null && fail "solc --assemble --optimize did not fail as expected."
-    echo '{}' | "$SOLC" - --yul --optimize &>/dev/null && fail "solc --yul --optimize did not fail as expected."
+# Test options above in conjunction with --optimize.
+# Using both, --assemble and --optimize should fail.
+echo '{}' | "$SOLC" - --assemble --optimize &>/dev/null && fail "solc --assemble --optimize did not fail as expected."
+echo '{}' | "$SOLC" - --yul --optimize &>/dev/null && fail "solc --yul --optimize did not fail as expected."

-    # Test yul and strict assembly output
-    # Non-empty code results in non-empty binary representation with optimizations turned off,
-    # while it results in empty binary representation with optimizations turned on.
-    test_solc_assembly_output "{ let x:u256 := 0:u256 }" "{ let x := 0 }" "--yul"
-    test_solc_assembly_output "{ let x:u256 := bitnot(7:u256) }" "{ let x := bitnot(7) }" "--yul"
-    test_solc_assembly_output "{ let t:bool := not(true) }" "{ let t:bool := not(true) }" "--yul"
-    test_solc_assembly_output "{ let x := 0 }" "{ let x := 0 }" "--strict-assembly"
-    test_solc_assembly_output "{ let x := 0 }" "{ { } }" "--strict-assembly --optimize"
-)
+# Test yul and strict assembly output
+# Non-empty code results in non-empty binary representation with optimizations turned off,
+# while it results in empty binary representation with optimizations turned on.
+test_solc_assembly_output "{ let x:u256 := 0:u256 }" "{ let x := 0 }" "--yul"
+test_solc_assembly_output "{ let x:u256 := bitnot(7:u256) }" "{ let x := bitnot(7) }" "--yul"
+test_solc_assembly_output "{ let t:bool := not(true) }" "{ let t:bool := not(true) }" "--yul"
+test_solc_assembly_output "{ let x := 0 }" "{ let x := 0 }" "--strict-assembly"
+test_solc_assembly_output "{ let x := 0 }" "{ { } }" "--strict-assembly --optimize"
--- a/test/cmdlineTests/~ast_import_export/test.sh
+++ b/test/cmdlineTests/~ast_import_export/test.sh
@ -6,12 +6,10 @@ source "${REPO_ROOT}/scripts/common.sh"

 printTask "Testing AST import/export..."
 SOLTMPDIR=$(mktemp -d)
-(
-    cd "$SOLTMPDIR"
-    if ! "$REPO_ROOT/scripts/ASTImportTest.sh" ast
-    then
-        rm -r "$SOLTMPDIR"
-        fail
-    fi
-)
+cd "$SOLTMPDIR"
+if ! "$REPO_ROOT/scripts/ASTImportTest.sh" ast
+then
+    rm -r "$SOLTMPDIR"
+    fail
+fi
 rm -r "$SOLTMPDIR"
--- a/test/cmdlineTests/~compilation_tests/test.sh
+++ b/test/cmdlineTests/~compilation_tests/test.sh
@ -7,14 +7,12 @@ source "${REPO_ROOT}/scripts/common.sh"
 source "${REPO_ROOT}/scripts/common_cmdline.sh"

 printTask "Compiling various other contracts and libraries..."
-(
-    cd "$REPO_ROOT"/test/compilationTests/
-    for dir in */
-    do
-        echo " - $dir"
-        cd "$dir"
-        # shellcheck disable=SC2046 # These file names are not supposed to contain spaces.
-        compileFull --expect-warnings $(find . -name '*.sol')
-        cd ..
-    done
-)
+cd "$REPO_ROOT"/test/compilationTests/
+for dir in */
+do
+    echo " - $dir"
+    cd "$dir"
+    # shellcheck disable=SC2046 # These file names are not supposed to contain spaces.
+    compileFull --expect-warnings $(find . -name '*.sol')
+    cd ..
+done
--- a/test/cmdlineTests/~documentation_examples/test.sh
+++ b/test/cmdlineTests/~documentation_examples/test.sh
@ -8,44 +8,45 @@ source "${REPO_ROOT}/scripts/common_cmdline.sh"

 printTask "Compiling all examples from the documentation..."
 SOLTMPDIR=$(mktemp -d)
-(
-    set -e
-    cd "$SOLTMPDIR"
-    "$REPO_ROOT"/scripts/isolate_tests.py "$REPO_ROOT"/docs/
-    developmentVersion=$("$REPO_ROOT/scripts/get_version.sh")

-    for f in *.yul *.sol
-    do
-        # The contributors guide uses syntax tests, but we cannot
-        # really handle them here.
-        if grep -E 'DeclarationError:|// ----' "$f" >/dev/null
-        then
-            continue
-        fi
-        echo "$f"
+set -e
+cd "$SOLTMPDIR"

-        opts=()
-        # We expect errors if explicitly stated, or if imports
-        # are used (in the style guide)
-        if grep -E "// This will not compile" "$f" >/dev/null ||
-            sed -e 's|//.*||g' "$f" | grep -E "import \"" >/dev/null
-        then
-            opts=(--expect-errors)
-        fi
-        if grep "// This will report a warning" "$f" >/dev/null
-        then
-            opts+=(--expect-warnings)
-        fi
-        if grep "// This may report a warning" "$f" >/dev/null
-        then
-            opts+=(--ignore-warnings)
-        fi
+"$REPO_ROOT"/scripts/isolate_tests.py "$REPO_ROOT"/docs/

-        # Disable the version pragma in code snippets that only work with the current development version.
-        # It's necessary because x.y.z won't match `^x.y.z` or `>=x.y.z` pragmas until it's officially released.
-        sed -i.bak -E -e 's/pragma[[:space:]]+solidity[[:space:]]*(\^|>=)[[:space:]]*'"$developmentVersion"'/pragma solidity >0.0.1/' "$f"
-        compileFull "${opts[@]}" "$SOLTMPDIR/$f"
-    done
-)
+developmentVersion=$("$REPO_ROOT/scripts/get_version.sh")
+
+for f in *.yul *.sol
+do
+    # The contributors guide uses syntax tests, but we cannot
+    # really handle them here.
+    if grep -E 'DeclarationError:|// ----' "$f" >/dev/null
+    then
+        continue
+    fi
+    echo "$f"
+
+    opts=()
+    # We expect errors if explicitly stated, or if imports
+    # are used (in the style guide)
+    if grep -E "// This will not compile" "$f" >/dev/null ||
+        sed -e 's|//.*||g' "$f" | grep -E "import \"" >/dev/null
+    then
+        opts=(--expect-errors)
+    fi
+    if grep "// This will report a warning" "$f" >/dev/null
+    then
+        opts+=(--expect-warnings)
+    fi
+    if grep "// This may report a warning" "$f" >/dev/null
+    then
+        opts+=(--ignore-warnings)
+    fi
+
+    # Disable the version pragma in code snippets that only work with the current development version.
+    # It's necessary because x.y.z won't match `^x.y.z` or `>=x.y.z` pragmas until it's officially released.
+    sed -i.bak -E -e 's/pragma[[:space:]]+solidity[[:space:]]*(\^|>=)[[:space:]]*'"$developmentVersion"'/pragma solidity >0.0.1/' "$f"
+    compileFull "${opts[@]}" "$SOLTMPDIR/$f"
+done
 rm -r "$SOLTMPDIR"
 echo "Done."
--- a/test/cmdlineTests/~linking/test.sh
+++ b/test/cmdlineTests/~linking/test.sh
@ -6,17 +6,21 @@ source "${REPO_ROOT}/scripts/common.sh"

 printTask "Testing linking itself..."
 SOLTMPDIR=$(mktemp -d)
-(
-    cd "$SOLTMPDIR"
-    echo 'library L { function f() public pure {} } contract C { function f() public pure { L.f(); } }' > x.sol
-    msg_on_error --no-stderr "$SOLC" --bin -o . x.sol
-    # Explanation and placeholder should be there
-    grep -q '//' C.bin && grep -q '__' C.bin
-    # But not in library file.
-    grep -q -v '[/_]' L.bin
-    # Now link
-    msg_on_error "$SOLC" --link --libraries x.sol:L=0x90f20564390eAe531E810af625A22f51385Cd222 C.bin
-    # Now the placeholder and explanation should be gone.
-    grep -q -v '[/_]' C.bin
-)
+cd "$SOLTMPDIR"
+
+echo 'library L { function f() public pure {} } contract C { function f() public pure { L.f(); } }' > x.sol
+msg_on_error --no-stderr "$SOLC" --bin -o . x.sol
+
+# Explanation and placeholder should be there
+grep -q '//' C.bin && grep -q '__' C.bin
+
+# But not in library file.
+grep -q -v '[/_]' L.bin
+
+# Now link
+msg_on_error "$SOLC" --link --libraries x.sol:L=0x90f20564390eAe531E810af625A22f51385Cd222 C.bin
+
+# Now the placeholder and explanation should be gone.
+grep -q -v '[/_]' C.bin
+
 rm -r "$SOLTMPDIR"
--- a/test/cmdlineTests/~overwriting_files/test.sh
+++ b/test/cmdlineTests/~overwriting_files/test.sh
@ -6,13 +6,15 @@ source "${REPO_ROOT}/scripts/common.sh"

 printTask "Testing overwriting files..."
 SOLTMPDIR=$(mktemp -d)
-(
-    # First time it works
-    echo 'contract C {}' | msg_on_error --no-stderr "$SOLC" - --bin -o "$SOLTMPDIR/non-existing-stuff-to-create"
-    # Second time it fails
-    echo 'contract C {}' | "$SOLC" - --bin -o "$SOLTMPDIR/non-existing-stuff-to-create" 2>/dev/null && \
-        fail "solc did not refuse to overwrite $SOLTMPDIR/non-existing-stuff-to-create."
-    # Unless we force
-    echo 'contract C {}' | msg_on_error --no-stderr "$SOLC" - --overwrite --bin -o "$SOLTMPDIR/non-existing-stuff-to-create"
-)
+
+# First time it works
+echo 'contract C {}' | msg_on_error --no-stderr "$SOLC" - --bin -o "$SOLTMPDIR/non-existing-stuff-to-create"
+
+# Second time it fails
+echo 'contract C {}' | "$SOLC" - --bin -o "$SOLTMPDIR/non-existing-stuff-to-create" 2>/dev/null && \
+    fail "solc did not refuse to overwrite $SOLTMPDIR/non-existing-stuff-to-create."
+
+# Unless we force
+echo 'contract C {}' | msg_on_error --no-stderr "$SOLC" - --overwrite --bin -o "$SOLTMPDIR/non-existing-stuff-to-create"
+
 rm -r "$SOLTMPDIR"
--- a/test/cmdlineTests/~soljson_via_fuzzer/test.sh
+++ b/test/cmdlineTests/~soljson_via_fuzzer/test.sh
@ -6,13 +6,14 @@ source "${REPO_ROOT}/scripts/common.sh"

 printTask "Testing soljson via the fuzzer..."
 SOLTMPDIR=$(mktemp -d)
-(
-    set -e
-    cd "$SOLTMPDIR"
-    "$REPO_ROOT"/scripts/isolate_tests.py "$REPO_ROOT"/test/
-    "$REPO_ROOT"/scripts/isolate_tests.py "$REPO_ROOT"/docs/

-    echo ./*.sol | xargs -P 4 -n 50 "${SOLIDITY_BUILD_DIR}/test/tools/solfuzzer" --quiet --input-files
-    echo ./*.sol | xargs -P 4 -n 50 "${SOLIDITY_BUILD_DIR}/test/tools/solfuzzer" --without-optimizer --quiet --input-files
-)
+set -e
+cd "$SOLTMPDIR"
+
+"$REPO_ROOT"/scripts/isolate_tests.py "$REPO_ROOT"/test/
+"$REPO_ROOT"/scripts/isolate_tests.py "$REPO_ROOT"/docs/
+
+echo ./*.sol | xargs -P 4 -n 50 "${SOLIDITY_BUILD_DIR}/test/tools/solfuzzer" --quiet --input-files
+echo ./*.sol | xargs -P 4 -n 50 "${SOLIDITY_BUILD_DIR}/test/tools/solfuzzer" --without-optimizer --quiet --input-files
+
 rm -r "$SOLTMPDIR"
--- a/test/cmdlineTests/~standard_input/test.sh
+++ b/test/cmdlineTests/~standard_input/test.sh
@ -6,26 +6,24 @@ source "${REPO_ROOT}/scripts/common.sh"

 printTask "Testing standard input..."
 SOLTMPDIR=$(mktemp -d)
-(
-    set +e
-    output=$("$SOLC" --bin 2>&1)
-    result=$?
-    set -e
+set +e
+output=$("$SOLC" --bin 2>&1)
+result=$?
+set -e

-    # This should fail
-    if [[ ! ("$output" =~ "No input files given") || ($result == 0) ]]
-    then
-        fail "Incorrect response to empty input arg list: $output"
-    fi
+# This should fail
+if [[ ! ("$output" =~ "No input files given") || ($result == 0) ]]
+then
+    fail "Incorrect response to empty input arg list: $output"
+fi

-    # The contract should be compiled
-    if ! echo 'contract C {}' | msg_on_error --no-stderr "$SOLC" - --bin | grep -q "<stdin>:C"
-    then
-        fail "Failed to compile a simple contract from standard input"
-    fi
+# The contract should be compiled
+if ! echo 'contract C {}' | msg_on_error --no-stderr "$SOLC" - --bin | grep -q "<stdin>:C"
+then
+    fail "Failed to compile a simple contract from standard input"
+fi

-    # This should not fail
-    echo '' | msg_on_error --silent --msg "Incorrect response to --ast-compact-json option with empty stdin" \
-        "$SOLC" --ast-compact-json -
-)
+# This should not fail
+echo '' | msg_on_error --silent --msg "Incorrect response to --ast-compact-json option with empty stdin" \
+    "$SOLC" --ast-compact-json -
 rm -r "$SOLTMPDIR"
--- a/test/cmdlineTests/~unknown_options/test.sh
+++ b/test/cmdlineTests/~unknown_options/test.sh
@ -5,16 +5,14 @@ set -euo pipefail
 source "${REPO_ROOT}/scripts/common.sh"

 printTask "Testing unknown options..."
-(
-    set +e
-    output=$("$SOLC" --allow=test 2>&1)
-    failed=$?
-    set -e
+set +e
+output=$("$SOLC" --allow=test 2>&1)
+failed=$?
+set -e

-    if [ "$output" == "unrecognised option '--allow=test'" ] && [ $failed -ne 0 ]
-    then
-        echo "Passed"
-    else
-        fail "Incorrect response to unknown options: $output"
-    fi
-)
+if [ "$output" == "unrecognised option '--allow=test'" ] && [ $failed -ne 0 ]
+then
+    echo "Passed"
+else
+    fail "Incorrect response to unknown options: $output"
+fi
--- a/test/cmdlineTests/~update_bugs_by_version/test.sh
+++ b/test/cmdlineTests/~update_bugs_by_version/test.sh
@ -6,8 +6,11 @@ source "${REPO_ROOT}/scripts/common.sh"

 SOLTMPDIR=$(mktemp -d)
 printTask "Checking that the bug list is up to date..."
+
 cp "${REPO_ROOT}/docs/bugs_by_version.json" "${SOLTMPDIR}/original_bugs_by_version.json"
 "${REPO_ROOT}/scripts/update_bugs_by_version.py"
+
 diff --unified "${SOLTMPDIR}/original_bugs_by_version.json" "${REPO_ROOT}/docs/bugs_by_version.json" || \
    fail "The bug list in bugs_by_version.json was out of date and has been updated. Please investigate and submit a bugfix if necessary."
+
 rm -r "$SOLTMPDIR"
--- a/test/cmdlineTests/~via_ir_equivalence/test.sh
+++ b/test/cmdlineTests/~via_ir_equivalence/test.sh
@ -66,33 +66,31 @@ function test_via_ir_equivalence()
 }

 printTask "Testing the eqivalence of --via-ir and a two-stage compilation..."
-(
-    externalContracts=(
-        externalTests/solc-js/DAO/TokenCreation.sol
-        libsolidity/semanticTests/externalContracts/_prbmath/PRBMathSD59x18.sol
-        libsolidity/semanticTests/externalContracts/_prbmath/PRBMathUD60x18.sol
-        libsolidity/semanticTests/externalContracts/_stringutils/stringutils.sol
-        libsolidity/semanticTests/externalContracts/deposit_contract.sol
-        libsolidity/semanticTests/externalContracts/FixedFeeRegistrar.sol
-        libsolidity/semanticTests/externalContracts/snark.sol
-    )
-
-    requiresOptimizer=(
-        externalTests/solc-js/DAO/TokenCreation.sol
-        libsolidity/semanticTests/externalContracts/deposit_contract.sol
-        libsolidity/semanticTests/externalContracts/FixedFeeRegistrar.sol
-        libsolidity/semanticTests/externalContracts/snark.sol
-    )
-
-    for contractFile in "${externalContracts[@]}"
-    do
-        if ! [[ "${requiresOptimizer[*]}" =~ $contractFile ]]
-        then
-            printTask " - ${contractFile}"
-            test_via_ir_equivalence "${REPO_ROOT}/test/${contractFile}"
-        fi
-
-        printTask " - ${contractFile} (optimized)"
-        test_via_ir_equivalence "${REPO_ROOT}/test/${contractFile}" --optimize
-    done
+externalContracts=(
+    externalTests/solc-js/DAO/TokenCreation.sol
+    libsolidity/semanticTests/externalContracts/_prbmath/PRBMathSD59x18.sol
+    libsolidity/semanticTests/externalContracts/_prbmath/PRBMathUD60x18.sol
+    libsolidity/semanticTests/externalContracts/_stringutils/stringutils.sol
+    libsolidity/semanticTests/externalContracts/deposit_contract.sol
+    libsolidity/semanticTests/externalContracts/FixedFeeRegistrar.sol
+    libsolidity/semanticTests/externalContracts/snark.sol
 )
+
+requiresOptimizer=(
+    externalTests/solc-js/DAO/TokenCreation.sol
+    libsolidity/semanticTests/externalContracts/deposit_contract.sol
+    libsolidity/semanticTests/externalContracts/FixedFeeRegistrar.sol
+    libsolidity/semanticTests/externalContracts/snark.sol
+)
+
+for contractFile in "${externalContracts[@]}"
+do
+    if ! [[ "${requiresOptimizer[*]}" =~ $contractFile ]]
+    then
+        printTask " - ${contractFile}"
+        test_via_ir_equivalence "${REPO_ROOT}/test/${contractFile}"
+    fi
+
+    printTask " - ${contractFile} (optimized)"
+    test_via_ir_equivalence "${REPO_ROOT}/test/${contractFile}" --optimize
+done