[TMP] Change the workaround used for replacing global solc

Author: cameel

test/externalTests/colony.sh

@@ -28,12 +28,6 @@ verify_input "$@"
 BINARY_TYPE="$1"
 BINARY_PATH="$2"
 
-# Truffle can only be configured to use the global `solc` native binary.
-# Replace it with a function that runs our custom binary.
-function solc { "$(realpath "$__SOLC_BINARY_PATH")" "$@"; }
-export -f solc
-export __SOLC_BINARY_PATH="$BINARY_PATH"
-
 function compile_fn { yarn run provision:token:contracts; }
 function test_fn { yarn run test:contracts; }
 
@@ -51,6 +45,7 @@ function colony_test
 
     setup_solc "$DIR" "$BINARY_TYPE" "$BINARY_PATH"
     download_project "$repo" "$branch" "$DIR"
+    [[ $BINARY_TYPE == native ]] && replace_global_solc "$BINARY_PATH"
 
     neutralize_package_json_hooks
     force_truffle_compiler_settings "$config_file" "$BINARY_TYPE" "${DIR}/solc" "$min_optimizer_level"

test/externalTests/common.sh

@@ -256,6 +256,18 @@ function optimizer_settings_for_level
     esac
 }
 
+function replace_global_solc
+{
+    local solc_path="$1"
+
+    [[ ! -e solc ]] || fail "A file named 'solc' already exists in '${PWD}'."
+
+    echo "#!/usr/bin/env bash" >> solc
+    echo "$(realpath "$solc_path") \"\$@\"" >> solc
+    chmod +x solc
+    export PATH="$PWD:$PATH"
+}
+
 function truffle_compiler_settings
 {
     local solc_path="$1"

test/externalTests/ens.sh

@@ -28,12 +28,6 @@ verify_input "$@"
 BINARY_TYPE="$1"
 BINARY_PATH="$2"
 
-# Truffle can only be configured to use the global `solc` native binary.
-# Replace it with a function that runs our custom binary.
-function solc { "$(realpath "$__SOLC_BINARY_PATH")" "$@"; }
-export -f solc
-export __SOLC_BINARY_PATH="$BINARY_PATH"
-
 function compile_fn { npx truffle compile; }
 function test_fn { npm run test; }
 
@@ -51,6 +45,7 @@ function ens_test
 
     setup_solc "$DIR" "$BINARY_TYPE" "$BINARY_PATH"
     download_project "$repo" "$branch" "$DIR"
+    [[ $BINARY_TYPE == native ]] && replace_global_solc "$BINARY_PATH"
 
     # Use latest Truffle. Older versions crash on the output from 0.8.0.
     force_truffle_version ^5.1.55

test/externalTests/gnosis-v2.sh

@@ -28,12 +28,6 @@ verify_input "$@"
 BINARY_TYPE="$1"
 BINARY_PATH="$2"
 
-# Truffle can only be configured to use the global `solc` native binary.
-# Replace it with a function that runs our custom binary.
-function solc { "$(realpath "$__SOLC_BINARY_PATH")" "$@"; }
-export -f solc
-export __SOLC_BINARY_PATH="$BINARY_PATH"
-
 function compile_fn { npx truffle compile; }
 function test_fn { npm test; }
 
@@ -51,6 +45,7 @@ function gnosis_safe_test
 
     setup_solc "$DIR" "$BINARY_TYPE" "$BINARY_PATH"
     download_project "$repo" "$branch" "$DIR"
+    [[ $BINARY_TYPE == native ]] && replace_global_solc "$BINARY_PATH"
 
     sed -i 's|github:gnosis/mock-contract#sol_0_5_0|github:solidity-external-tests/mock-contract#master_080|g' package.json
     sed -i -E 's|"@gnosis.pm/util-contracts": "[^"]+"|"@gnosis.pm/util-contracts": "github:solidity-external-tests/util-contracts#solc-7_080"|g' package.json

test/externalTests/gnosis.sh

@@ -28,12 +28,6 @@ verify_input "$@"
 BINARY_TYPE="$1"
 BINARY_PATH="$2"
 
-# Truffle can only be configured to use the global `solc` native binary.
-# Replace it with a function that runs our custom binary.
-function solc { "$(realpath "$__SOLC_BINARY_PATH")" "$@"; }
-export -f solc
-export __SOLC_BINARY_PATH="$BINARY_PATH"
-
 function compile_fn { npx truffle compile; }
 function test_fn { npm test; }
 
@@ -51,6 +45,7 @@ function gnosis_safe_test
 
     setup_solc "$DIR" "$BINARY_TYPE" "$BINARY_PATH"
     download_project "$repo" "$branch" "$DIR"
+    [[ $BINARY_TYPE == native ]] && replace_global_solc "$BINARY_PATH"
 
     sed -i 's|github:gnosis/mock-contract#sol_0_5_0|github:solidity-external-tests/mock-contract#master_080|g' package.json