From 26ab2d4c0640794366679b20d743c8ae76318720 Mon Sep 17 00:00:00 2001
From: Erik Kundt <erik@ethereum.org>
Date: Thu, 21 Nov 2019 00:00:27 +0100
Subject: [PATCH 1/2] Splits out compilation only phase for external tests.

---
 .circleci/config.yml         | 64 ++++++++++++++++++++++++++++++++----
 test/externalTests/common.sh |  9 +++--
 2 files changed, 65 insertions(+), 8 deletions(-)

diff --git a/.circleci/config.yml b/.circleci/config.yml
index cdd6edeab..9904ec70a 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -597,7 +597,22 @@ jobs:
             npm --version
             test/solcjsTests.sh /tmp/workspace/soljson.js $(cat /tmp/workspace/version.txt)
 
-  t_ems_external_gnosis:
+  t_ems_compile_ext_gnosis:
+    docker:
+      - image: circleci/node:10
+    environment:
+      TERM: xterm
+    steps:
+      - checkout
+      - attach_workspace:
+          at: /tmp/workspace
+      - run:
+          name: External GnosisSafe compilation
+          command: |
+            export COMPILE_ONLY=1
+            test/externalTests/gnosis.sh /tmp/workspace/soljson.js || test/externalTests/gnosis.sh /tmp/workspace/soljson.js
+
+  t_ems_test_ext_gnosis:
     docker:
       - image: circleci/node:10
     environment:
@@ -613,7 +628,22 @@ jobs:
       - run: *gitter_notify_failure
       - run: *gitter_notify_success
 
-  t_ems_external_zeppelin:
+  t_ems_compile_ext_zeppelin:
+    docker:
+      - image: circleci/node:10
+    environment:
+      TERM: xterm
+    steps:
+      - checkout
+      - attach_workspace:
+          at: /tmp/workspace
+      - run:
+          name: External Zeppelin compilation
+          command: |
+            export COMPILE_ONLY=1
+            test/externalTests/zeppelin.sh /tmp/workspace/soljson.js || test/externalTests/zeppelin.sh /tmp/workspace/soljson.js
+
+  t_ems_test_ext_zeppelin:
     docker:
       - image: circleci/node:10
     environment:
@@ -629,7 +659,26 @@ jobs:
       - run: *gitter_notify_failure
       - run: *gitter_notify_success
 
-  t_ems_external_colony:
+  t_ems_compile_ext_colony:
+    docker:
+      - image: circleci/node:10
+    environment:
+      TERM: xterm
+    steps:
+      - checkout
+      - attach_workspace:
+          at: /tmp/workspace
+      - run:
+          name: Install test dependencies
+          command: |
+            sudo apt-get -qy install lsof
+      - run:
+          name: External ColonyNetworks compilation
+          command: |
+            export COMPILE_ONLY=1
+            test/externalTests/colony.sh /tmp/workspace/soljson.js || test/externalTests/colony.sh /tmp/workspace/soljson.js
+
+  t_ems_test_ext_colony:
     docker:
       - image: circleci/node:10
     environment:
@@ -693,6 +742,9 @@ workflows:
       # Emscripten build and selected tests
       - b_ems: *workflow_trigger_on_tags
       - t_ems_solcjs: *workflow_emscripten
+      - t_ems_compile_ext_colony: *workflow_emscripten
+      - t_ems_compile_ext_gnosis: *workflow_emscripten
+      - t_ems_compile_ext_zeppelin: *workflow_emscripten
 
   nightly:
 
@@ -708,9 +760,9 @@ workflows:
     jobs:
       # Emscripten builds and external tests
       - b_ems: *workflow_trigger_on_tags
-      - t_ems_external_zeppelin: *workflow_emscripten
-      - t_ems_external_gnosis: *workflow_emscripten
-      - t_ems_external_colony: *workflow_emscripten
+      - t_ems_test_ext_zeppelin: *workflow_emscripten
+      - t_ems_test_ext_gnosis: *workflow_emscripten
+      - t_ems_test_ext_colony: *workflow_emscripten
 
       # OSSFUZZ builds and (regression) tests
       - b_ubu_ossfuzz: *workflow_trigger_on_tags
diff --git a/test/externalTests/common.sh b/test/externalTests/common.sh
index a94b62dc4..dd9aa77aa 100644
--- a/test/externalTests/common.sh
+++ b/test/externalTests/common.sh
@@ -216,8 +216,13 @@ function run_test
         printLog "Running compile function..."
         $compile_fn
         verify_compiler_version "$SOLCVERSION"
-        printLog "Running test function..."
-        $test_fn
+
+        if [[ "$COMPILE_ONLY" == 1 ]]; then
+            printLog "Skipping test function..."
+        else
+            printLog "Running test function..."
+            $test_fn
+        fi
     done
 }
 

From bf1c07cef02fcbe43292c6e5187be27201fdb5b2 Mon Sep 17 00:00:00 2001
From: Erik Kundt <erik@ethereum.org>
Date: Mon, 25 Nov 2019 16:24:39 +0100
Subject: [PATCH 2/2] Removes ext. tests from nightly CircleCI runs,

---
 .circleci/config.yml | 6 ------
 1 file changed, 6 deletions(-)

diff --git a/.circleci/config.yml b/.circleci/config.yml
index 9904ec70a..1c97b0e43 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -758,12 +758,6 @@ workflows:
                 - develop_060
 
     jobs:
-      # Emscripten builds and external tests
-      - b_ems: *workflow_trigger_on_tags
-      - t_ems_test_ext_zeppelin: *workflow_emscripten
-      - t_ems_test_ext_gnosis: *workflow_emscripten
-      - t_ems_test_ext_colony: *workflow_emscripten
-
       # OSSFUZZ builds and (regression) tests
       - b_ubu_ossfuzz: *workflow_trigger_on_tags
       - t_ubu_ossfuzz: *workflow_ubuntu1904_ossfuzz