diff --git a/contrib/teamcity/builds/build-diff.sh b/contrib/teamcity/builds/build-diff.sh --- a/contrib/teamcity/builds/build-diff.sh +++ b/contrib/teamcity/builds/build-diff.sh @@ -12,7 +12,7 @@ # Unit tests run_test_bitcoin -run_test_bitcoin "with next upgrade activated" -phononactivationtime=1575158400 +run_test_bitcoin "with next upgrade activated" -axionactivationtime=1575158400 # Libs and tools tests # The leveldb tests need to run alone or they will sometimes fail with diff --git a/contrib/teamcity/builds/build-master.sh b/contrib/teamcity/builds/build-master.sh --- a/contrib/teamcity/builds/build-master.sh +++ b/contrib/teamcity/builds/build-master.sh @@ -12,7 +12,7 @@ # Unit tests run_test_bitcoin -run_test_bitcoin "with next upgrade activated" -phononactivationtime=1575158400 +run_test_bitcoin "with next upgrade activated" -axionactivationtime=1575158400 # Libs and tools tests # The leveldb tests need to run alone or they will sometimes fail with diff --git a/test/CMakeLists.txt b/test/CMakeLists.txt --- a/test/CMakeLists.txt +++ b/test/CMakeLists.txt @@ -83,7 +83,7 @@ add_functional_test_check(check-functional-upgrade-activated "Run the functional tests with the upgrade activated" - --with-phononactivation + --with-axionactivation -n "${TEST_SUITE_NAME_UPGRADE_ACTIVATED}" ) add_dependencies(check-upgrade-activated check-functional-upgrade-activated) @@ -91,7 +91,7 @@ add_functional_test_check(check-functional-upgrade-activated-extended "Run the extended functional tests with the upgrade activated" --extended - --with-phononactivation + --with-axionactivation -n "${TEST_SUITE_NAME_UPGRADE_ACTIVATED}" ) add_dependencies(check-upgrade-activated-extended check-functional-upgrade-activated-extended) diff --git a/test/functional/test_framework/test_framework.py b/test/functional/test_framework/test_framework.py --- a/test/functional/test_framework/test_framework.py +++ b/test/functional/test_framework/test_framework.py @@ -131,6 +131,8 @@ help="use bitcoin-cli instead of RPC for all commands") parser.add_argument("--with-phononactivation", dest="phononactivation", default=False, action="store_true", help="Activate phonon update on timestamp {}".format(TIMESTAMP_IN_THE_PAST)) + parser.add_argument("--with-axionactivation", dest="axionactivation", default=False, action="store_true", + help="Activate axion update on timestamp {}".format(TIMESTAMP_IN_THE_PAST)) self.add_options(parser) self.options = parser.parse_args() @@ -357,6 +359,9 @@ if self.options.phononactivation: self.nodes[i].extend_default_args( ["-phononactivationtime={}".format(TIMESTAMP_IN_THE_PAST)]) + if self.options.axionactivation: + self.nodes[i].extend_default_args( + ["-axionactivationtime={}".format(TIMESTAMP_IN_THE_PAST)]) def start_node(self, i, *args, **kwargs): """Start a bitcoind""" @@ -515,6 +520,9 @@ if self.options.phononactivation: self.nodes[CACHE_NODE_ID].extend_default_args( ["-phononactivationtime={}".format(TIMESTAMP_IN_THE_PAST)]) + if self.options.axionactivation: + self.nodes[CACHE_NODE_ID].extend_default_args( + ["-axionactivationtime={}".format(TIMESTAMP_IN_THE_PAST)]) self.start_node(CACHE_NODE_ID) cache_node = self.nodes[CACHE_NODE_ID]