From bff9a263aaa52bc501fcbeb885b6c034544f4547 Mon Sep 17 00:00:00 2001
From: Jason Carver <ut96caarrs@snkmail.com>
Date: Tue, 16 Mar 2021 11:27:14 -0700
Subject: [PATCH] Enable Berlin tests, except for modexp

---
 .circleci/config.yml | 1 +
 tox.ini              | 4 ++--
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/.circleci/config.yml b/.circleci/config.yml
index 0fd2310bc0..348ec7e62b 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -210,6 +210,7 @@ workflows:
   test:
     jobs:
       - py36-benchmark
+      - py36-native-blockchain-berlin
       - py36-native-blockchain-byzantium
       - py36-native-blockchain-constantinople
       - py36-native-blockchain-frontier
diff --git a/tox.ini b/tox.ini
index 5a5607cc0d..76ebf58d08 100644
--- a/tox.ini
+++ b/tox.ini
@@ -2,7 +2,7 @@
 envlist=
     py{36,37,38}-{core,database,transactions,vm}
     py36-benchmark
-    py36-native-blockchain-{frontier,homestead,tangerine_whistle,spurious_dragon,byzantium,constantinople,petersburg,istanbul,metropolis,transition}
+    py36-native-blockchain-{frontier,homestead,tangerine_whistle,spurious_dragon,byzantium,constantinople,petersburg,istanbul,berlin,metropolis,transition}
     py{36,37,38}-lint
     py36-docs
 
@@ -34,7 +34,7 @@ commands=
     native-blockchain-constantinople: pytest {posargs:tests/json-fixtures/blockchain/test_blockchain.py --fork Constantinople}
     native-blockchain-petersburg: pytest {posargs:tests/json-fixtures/blockchain/test_blockchain.py --fork ConstantinopleFix}
     native-blockchain-istanbul: pytest {posargs:tests/json-fixtures/blockchain/test_blockchain.py --fork Istanbul}
-    native-blockchain-berlin: pytest {posargs:tests/json-fixtures/blockchain/test_blockchain.py --fork Berlin}
+    native-blockchain-berlin: pytest {posargs:tests/json-fixtures/blockchain/test_blockchain.py -k "not modexp" --fork Berlin}
     native-blockchain-metropolis: pytest {posargs:tests/json-fixtures/blockchain/test_blockchain.py --fork Metropolis}
     native-blockchain-transition: pytest {posargs:tests/json-fixtures/blockchain/test_blockchain.py -k BlockchainTests/TransitionTests}
     lint: flake8 {toxinidir}/eth {toxinidir}/tests {toxinidir}/scripts