From 40b58adcdb4f5d14b10557742128721d7aabc545 Mon Sep 17 00:00:00 2001
From: Erik Kundt <erik@ethereum.org>
Date: Thu, 28 Nov 2019 22:12:42 +0100
Subject: [PATCH] Fixes solc path override in Truffle config.

---
 test/externalTests/colony.sh   | 4 ++--
 test/externalTests/common.sh   | 5 ++++-
 test/externalTests/gnosis.sh   | 3 ++-
 test/externalTests/zeppelin.sh | 4 ++--
 4 files changed, 10 insertions(+), 6 deletions(-)

diff --git a/test/externalTests/colony.sh b/test/externalTests/colony.sh
index 7d90ac79d..66231eb99 100755
--- a/test/externalTests/colony.sh
+++ b/test/externalTests/colony.sh
@@ -32,11 +32,11 @@ function colony_test
 {
     OPTIMIZER_LEVEL=3
     FORCE_ABIv2=false
+    CONFIG="truffle.js"
+
     truffle_setup https://github.com/erak/colonyNetwork.git develop_060
     run_install install_fn
 
-    CONFIG=$(find_truffle_config)
-
     cd lib
     rm -Rf dappsys
     git clone https://github.com/erak/dappsys-monolithic.git -b master_060 dappsys
diff --git a/test/externalTests/common.sh b/test/externalTests/common.sh
index c719cb92d..f3085e27f 100644
--- a/test/externalTests/common.sh
+++ b/test/externalTests/common.sh
@@ -202,6 +202,10 @@ function run_install
 {
     local init_fn="$1"
     printLog "Running install function..."
+
+    replace_version_pragmas
+    force_solc "$CONFIG" "$DIR" "$SOLJSON"
+
     $init_fn
 }
 
@@ -225,7 +229,6 @@ function truffle_run_test
     local test_fn="$2"
 
     replace_version_pragmas
-
     force_solc "$CONFIG" "$DIR" "$SOLJSON"
 
     printLog "Checking optimizer level..."
diff --git a/test/externalTests/gnosis.sh b/test/externalTests/gnosis.sh
index 8c4f88d87..d5d8cae58 100755
--- a/test/externalTests/gnosis.sh
+++ b/test/externalTests/gnosis.sh
@@ -31,10 +31,11 @@ function test_fn { npm test; }
 function gnosis_safe_test
 {
     OPTIMIZER_LEVEL=1
+    CONFIG="truffle.js"
+
     truffle_setup https://github.com/erak/safe-contracts.git development_060
     run_install install_fn
 
-    CONFIG=$(find_truffle_config)
     replace_libsolc_call
 
     truffle_run_test compile_fn test_fn
diff --git a/test/externalTests/zeppelin.sh b/test/externalTests/zeppelin.sh
index 8eadf68e8..7c932786e 100755
--- a/test/externalTests/zeppelin.sh
+++ b/test/externalTests/zeppelin.sh
@@ -31,11 +31,11 @@ function test_fn { npm run test; }
 function zeppelin_test
 {
     OPTIMIZER_LEVEL=1
+    CONFIG="truffle-config.js"
+
     truffle_setup https://github.com/erak/openzeppelin-contracts.git master_060
     run_install install_fn
 
-    CONFIG="truffle-config.js"
-    replace_libsolc_call
 
     truffle_run_test compile_fn test_fn
 }