Merge pull request #9359 from ethereum/doNotRunAllTests

Do not run tests that do not need options multiple times.
This commit is contained in:
chriseth 2020-07-08 22:19:46 +02:00 committed by GitHub
commit f3e100a000
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
26 changed files with 26 additions and 26 deletions

View File

@ -54,7 +54,7 @@ get_logfile_basename() {
echo -ne "${filename}" echo -ne "${filename}"
} }
BOOST_TEST_ARGS="--color_output=no --show_progress=yes --logger=JUNIT,error,test_results/`get_logfile_basename`.xml" BOOST_TEST_ARGS="--color_output=no --show_progress=yes --logger=JUNIT,error,test_results/`get_logfile_basename`.xml ${BOOST_TEST_ARGS}"
SOLTEST_ARGS="--evm-version=$EVM $SOLTEST_FLAGS" SOLTEST_ARGS="--evm-version=$EVM $SOLTEST_FLAGS"
test "${OPTIMIZE}" = "1" && SOLTEST_ARGS="${SOLTEST_ARGS} --optimize" test "${OPTIMIZE}" = "1" && SOLTEST_ARGS="${SOLTEST_ARGS} --optimize"
test "${ABI_ENCODER_V2}" = "1" && SOLTEST_ARGS="${SOLTEST_ARGS} --abiencoderv2" test "${ABI_ENCODER_V2}" = "1" && SOLTEST_ARGS="${SOLTEST_ARGS} --abiencoderv2"

View File

@ -30,7 +30,7 @@ REPODIR="$(realpath $(dirname $0)/..)"
for OPTIMIZE in 0 1; do for OPTIMIZE in 0 1; do
for EVM in homestead byzantium constantinople petersburg istanbul; do for EVM in homestead byzantium constantinople petersburg istanbul; do
EVM=$EVM OPTIMIZE=$OPTIMIZE ${REPODIR}/.circleci/soltest.sh EVM=$EVM OPTIMIZE=$OPTIMIZE BOOST_TEST_ARGS="-t !@nooptions" ${REPODIR}/.circleci/soltest.sh
done done
done done

View File

@ -29,7 +29,7 @@ using namespace std;
namespace solidity::util::test namespace solidity::util::test
{ {
BOOST_AUTO_TEST_SUITE(IpfsHash) BOOST_AUTO_TEST_SUITE(IpfsHash, *boost::unit_test::label("nooptions"))
BOOST_AUTO_TEST_CASE(test_small) BOOST_AUTO_TEST_CASE(test_small)
{ {

View File

@ -29,7 +29,7 @@ using namespace std;
namespace solidity::util::test namespace solidity::util::test
{ {
BOOST_AUTO_TEST_SUITE(IterateReplacing) BOOST_AUTO_TEST_SUITE(IterateReplacing, *boost::unit_test::label("nooptions"))
BOOST_AUTO_TEST_CASE(no_replacement) BOOST_AUTO_TEST_CASE(no_replacement)
{ {

View File

@ -30,7 +30,7 @@ using namespace std;
namespace solidity::util::test namespace solidity::util::test
{ {
BOOST_AUTO_TEST_SUITE(JsonTest) BOOST_AUTO_TEST_SUITE(JsonTest, *boost::unit_test::label("nooptions"))
BOOST_AUTO_TEST_CASE(json_pretty_print) BOOST_AUTO_TEST_CASE(json_pretty_print)
{ {

View File

@ -26,7 +26,7 @@ using namespace std;
namespace solidity::util::test namespace solidity::util::test
{ {
BOOST_AUTO_TEST_SUITE(Keccak256) BOOST_AUTO_TEST_SUITE(Keccak256, *boost::unit_test::label("nooptions"))
BOOST_AUTO_TEST_CASE(empty) BOOST_AUTO_TEST_CASE(empty)
{ {

View File

@ -59,7 +59,7 @@ T valueOf(LazyInit<T> _lazyInit)
} }
BOOST_AUTO_TEST_SUITE(LazyInitTests) BOOST_AUTO_TEST_SUITE(LazyInitTests, *boost::unit_test::label("nooptions"))
BOOST_AUTO_TEST_CASE(default_constructed_is_empty) BOOST_AUTO_TEST_CASE(default_constructed_is_empty)
{ {

View File

@ -33,7 +33,7 @@ using namespace std;
namespace solidity::util::test namespace solidity::util::test
{ {
BOOST_AUTO_TEST_SUITE(StringUtils) BOOST_AUTO_TEST_SUITE(StringUtils, *boost::unit_test::label("nooptions"))
BOOST_AUTO_TEST_CASE(test_similarity) BOOST_AUTO_TEST_CASE(test_similarity)
{ {

View File

@ -31,7 +31,7 @@ using namespace std;
namespace solidity::util::test namespace solidity::util::test
{ {
BOOST_AUTO_TEST_SUITE(SwarmHash) BOOST_AUTO_TEST_SUITE(SwarmHash, *boost::unit_test::label("nooptions"))
string bzzr0HashHex(string const& _input) string bzzr0HashHex(string const& _input)
{ {

View File

@ -30,7 +30,7 @@ using namespace std;
namespace solidity::util::test namespace solidity::util::test
{ {
BOOST_AUTO_TEST_SUITE(UTF8) BOOST_AUTO_TEST_SUITE(UTF8, *boost::unit_test::label("nooptions"))
namespace { namespace {

View File

@ -29,7 +29,7 @@ using namespace std;
namespace solidity::util::test namespace solidity::util::test
{ {
BOOST_AUTO_TEST_SUITE(WhiskersTest) BOOST_AUTO_TEST_SUITE(WhiskersTest, *boost::unit_test::label("nooptions"))
BOOST_AUTO_TEST_CASE(no_templates) BOOST_AUTO_TEST_CASE(no_templates)
{ {

View File

@ -43,7 +43,7 @@ string assemble(string const& _input)
} }
} }
BOOST_AUTO_TEST_SUITE(StackReuseCodegen) BOOST_AUTO_TEST_SUITE(StackReuseCodegen, *boost::unit_test::label("nooptions"))
BOOST_AUTO_TEST_CASE(smoke_test) BOOST_AUTO_TEST_CASE(smoke_test)
{ {

View File

@ -121,7 +121,7 @@ protected:
RandomisingAlgorithm m_algorithm; RandomisingAlgorithm m_algorithm;
}; };
BOOST_AUTO_TEST_SUITE(Phaser) BOOST_AUTO_TEST_SUITE(Phaser, *boost::unit_test::label("nooptions"))
BOOST_AUTO_TEST_SUITE(AlgorithmRunnerTest) BOOST_AUTO_TEST_SUITE(AlgorithmRunnerTest)
BOOST_FIXTURE_TEST_CASE(run_should_call_runNextRound_once_per_round, AlgorithmRunnerFixture) BOOST_FIXTURE_TEST_CASE(run_should_call_runNextRound_once_per_round, AlgorithmRunnerFixture)

View File

@ -46,7 +46,7 @@ using namespace solidity::util;
namespace solidity::phaser::test namespace solidity::phaser::test
{ {
BOOST_AUTO_TEST_SUITE(Phaser) BOOST_AUTO_TEST_SUITE(Phaser, *boost::unit_test::label("nooptions"))
BOOST_AUTO_TEST_SUITE(ChromosomeTest) BOOST_AUTO_TEST_SUITE(ChromosomeTest)
BOOST_AUTO_TEST_CASE(constructor_should_convert_from_string_to_optimisation_steps) BOOST_AUTO_TEST_CASE(constructor_should_convert_from_string_to_optimisation_steps)

View File

@ -66,7 +66,7 @@ map<string, TestEnum> const StringToTestEnumMap = invertMap(TestEnumToStringMap)
} }
BOOST_AUTO_TEST_SUITE(Phaser) BOOST_AUTO_TEST_SUITE(Phaser, *boost::unit_test::label("nooptions"))
BOOST_AUTO_TEST_SUITE(CommonTest) BOOST_AUTO_TEST_SUITE(CommonTest)
BOOST_FIXTURE_TEST_CASE(readLinesFromFile_should_return_all_lines_from_a_text_file_as_strings_without_newlines, ReadLinesFromFileFixture) BOOST_FIXTURE_TEST_CASE(readLinesFromFile_should_return_all_lines_from_a_text_file_as_strings_without_newlines, ReadLinesFromFileFixture)

View File

@ -95,7 +95,7 @@ protected:
}; };
}; };
BOOST_AUTO_TEST_SUITE(Phaser) BOOST_AUTO_TEST_SUITE(Phaser, *boost::unit_test::label("nooptions"))
BOOST_AUTO_TEST_SUITE(FitnessMetricsTest) BOOST_AUTO_TEST_SUITE(FitnessMetricsTest)
BOOST_AUTO_TEST_SUITE(ProgramBasedMetricTest) BOOST_AUTO_TEST_SUITE(ProgramBasedMetricTest)

View File

@ -56,7 +56,7 @@ protected:
}; };
}; };
BOOST_AUTO_TEST_SUITE(Phaser) BOOST_AUTO_TEST_SUITE(Phaser, *boost::unit_test::label("nooptions"))
BOOST_AUTO_TEST_SUITE(GeneticAlgorithmsTest) BOOST_AUTO_TEST_SUITE(GeneticAlgorithmsTest)
BOOST_AUTO_TEST_SUITE(RandomAlgorithmTest) BOOST_AUTO_TEST_SUITE(RandomAlgorithmTest)

View File

@ -33,7 +33,7 @@ using namespace solidity::util;
namespace solidity::phaser::test namespace solidity::phaser::test
{ {
BOOST_AUTO_TEST_SUITE(Phaser) BOOST_AUTO_TEST_SUITE(Phaser, *boost::unit_test::label("nooptions"))
BOOST_AUTO_TEST_SUITE(MutationsTest) BOOST_AUTO_TEST_SUITE(MutationsTest)
BOOST_AUTO_TEST_SUITE(GeneRandomisationTest) BOOST_AUTO_TEST_SUITE(GeneRandomisationTest)

View File

@ -31,7 +31,7 @@ using namespace std;
namespace solidity::phaser::test namespace solidity::phaser::test
{ {
BOOST_AUTO_TEST_SUITE(Phaser) BOOST_AUTO_TEST_SUITE(Phaser, *boost::unit_test::label("nooptions"))
BOOST_AUTO_TEST_SUITE(PairSelectionsTest) BOOST_AUTO_TEST_SUITE(PairSelectionsTest)
BOOST_AUTO_TEST_SUITE(RandomPairSelectionTest) BOOST_AUTO_TEST_SUITE(RandomPairSelectionTest)

View File

@ -103,7 +103,7 @@ protected:
}; };
}; };
BOOST_AUTO_TEST_SUITE(Phaser) BOOST_AUTO_TEST_SUITE(Phaser, *boost::unit_test::label("nooptions"))
BOOST_AUTO_TEST_SUITE(PhaserTest) BOOST_AUTO_TEST_SUITE(PhaserTest)
BOOST_AUTO_TEST_SUITE(GeneticAlgorithmFactoryTest) BOOST_AUTO_TEST_SUITE(GeneticAlgorithmFactoryTest)

View File

@ -59,7 +59,7 @@ protected:
shared_ptr<FitnessMetric> m_fitnessMetric = make_shared<ChromosomeLengthMetric>(); shared_ptr<FitnessMetric> m_fitnessMetric = make_shared<ChromosomeLengthMetric>();
}; };
BOOST_AUTO_TEST_SUITE(Phaser) BOOST_AUTO_TEST_SUITE(Phaser, *boost::unit_test::label("nooptions"))
BOOST_AUTO_TEST_SUITE(PopulationTest) BOOST_AUTO_TEST_SUITE(PopulationTest)
BOOST_AUTO_TEST_CASE(isFitter_should_use_fitness_as_the_main_criterion) BOOST_AUTO_TEST_CASE(isFitter_should_use_fitness_as_the_main_criterion)

View File

@ -57,7 +57,7 @@ namespace
namespace solidity::phaser::test namespace solidity::phaser::test
{ {
BOOST_AUTO_TEST_SUITE(Phaser) BOOST_AUTO_TEST_SUITE(Phaser, *boost::unit_test::label("nooptions"))
BOOST_AUTO_TEST_SUITE(ProgramTest) BOOST_AUTO_TEST_SUITE(ProgramTest)
BOOST_AUTO_TEST_CASE(copy_constructor_should_make_deep_copy_of_ast) BOOST_AUTO_TEST_CASE(copy_constructor_should_make_deep_copy_of_ast)

View File

@ -70,7 +70,7 @@ protected:
ProgramCache m_programCache{m_program}; ProgramCache m_programCache{m_program};
}; };
BOOST_AUTO_TEST_SUITE(Phaser) BOOST_AUTO_TEST_SUITE(Phaser, *boost::unit_test::label("nooptions"))
BOOST_AUTO_TEST_SUITE(ProgramCacheTest) BOOST_AUTO_TEST_SUITE(ProgramCacheTest)
BOOST_AUTO_TEST_CASE(CacheStats_operator_plus_should_add_stats_together) BOOST_AUTO_TEST_CASE(CacheStats_operator_plus_should_add_stats_together)

View File

@ -34,7 +34,7 @@ using namespace solidity::util;
namespace solidity::phaser::test namespace solidity::phaser::test
{ {
BOOST_AUTO_TEST_SUITE(Phaser) BOOST_AUTO_TEST_SUITE(Phaser, *boost::unit_test::label("nooptions"))
BOOST_AUTO_TEST_SUITE(SelectionsTest) BOOST_AUTO_TEST_SUITE(SelectionsTest)
BOOST_AUTO_TEST_SUITE(RangeSelectionTest) BOOST_AUTO_TEST_SUITE(RangeSelectionTest)

View File

@ -28,7 +28,7 @@ using namespace std;
namespace solidity::phaser::test namespace solidity::phaser::test
{ {
BOOST_AUTO_TEST_SUITE(Phaser) BOOST_AUTO_TEST_SUITE(Phaser, *boost::unit_test::label("nooptions"))
BOOST_AUTO_TEST_SUITE(RandomTest) BOOST_AUTO_TEST_SUITE(RandomTest)
BOOST_AUTO_TEST_CASE(bernoulliTrial_should_produce_samples_with_right_expected_value_and_variance) BOOST_AUTO_TEST_CASE(bernoulliTrial_should_produce_samples_with_right_expected_value_and_variance)

View File

@ -34,7 +34,7 @@ namespace fs = boost::filesystem;
namespace solidity::phaser::test namespace solidity::phaser::test
{ {
BOOST_AUTO_TEST_SUITE(Phaser) BOOST_AUTO_TEST_SUITE(Phaser, *boost::unit_test::label("nooptions"))
BOOST_AUTO_TEST_SUITE(TestHelpersTest) BOOST_AUTO_TEST_SUITE(TestHelpersTest)
BOOST_AUTO_TEST_CASE(ChromosomeLengthMetric_evaluate_should_return_chromosome_length) BOOST_AUTO_TEST_CASE(ChromosomeLengthMetric_evaluate_should_return_chromosome_length)