From 6c951c43c76b287a281d59a9d2bdb70bac1bdac9 Mon Sep 17 00:00:00 2001 From: Siying Dong Date: Mon, 27 Feb 2017 11:04:27 -0800 Subject: [PATCH] Run fewer tests in OSX Summary: Travis is short of OSX resource. Try to move platform independent test suites out of OSX Closes https://github.com/facebook/rocksdb/pull/1922 Differential Revision: D4616070 Pulled By: siying fbshipit-source-id: 786342c --- .travis.yml | 21 ++++++++++++++------- Makefile | 32 ++++++++++++++++---------------- 2 files changed, 30 insertions(+), 23 deletions(-) diff --git a/.travis.yml b/.travis.yml index e8fbeba9c..25bbfb7a0 100644 --- a/.travis.yml +++ b/.travis.yml @@ -18,12 +18,11 @@ addons: sources: ['ubuntu-toolchain-r-test', 'llvm-toolchain-precise-3.6'] packages: ['clang-3.6' , 'g++-6', 'zlib1g-dev', 'libbz2-dev', 'libsnappy-dev', 'curl', 'libgflags-dev'] env: - # Run all tests before db_block_cache_test (db_test, db_test2) - - JOB_NAME=unittests ROCKSDBTESTS_END=db_block_cache_test - # Run all tests starting from db_block_cache_test (db_block_cache_test, ..., plain_table_db_test) - - JOB_NAME=unittests ROCKSDBTESTS_START=db_block_cache_test ROCKSDBTESTS_END=comparator_db_test - # Run all tests starting from db_block_cache_test (comparator_db_test, ...) - - JOB_NAME=unittests ROCKSDBTESTS_START=comparator_db_test + - TEST_GROUP=platform_dependent1 + - TEST_GROUP=platform_dependent2 + - TEST_GROUP=platform_dependent3 + - TEST_GROUP=1 + - TEST_GROUP=2 # Run java tests - JOB_NAME=java_test # Build ROCKSDB_LITE @@ -33,6 +32,10 @@ matrix: exclude: - os: osx compiler: gcc + - os: osx + env: TEST_GROUP=1 + - os: osx + env: TEST_GROUP=2 before_script: - if [[ "${TRAVIS_OS_NAME}" == 'linux' && "${CXX}" == 'clang++' ]]; then CXX=clang++-3.6; fi @@ -43,7 +46,11 @@ before_script: script: - ${CXX} --version - - if [[ "${JOB_NAME}" == 'unittests' ]]; then OPT=-DTRAVIS V=1 make -j4 check_some; fi + - if [[ "${TEST_GROUP}" == 'platform_dependent1' ]]; then OPT=-DTRAVIS V=1 ROCKSDBTESTS_END=external_sst_file_test make -j4 check_some; fi + - if [[ "${TEST_GROUP}" == 'platform_dependent2' ]]; then OPT=-DTRAVIS V=1 ROCKSDBTESTS_START=external_sst_file_test ROCKSDBTESTS_END=checkpoint_test make -j4 check_some; fi + - if [[ "${TEST_GROUP}" == 'platform_dependent3' ]]; then OPT=-DTRAVIS V=1 ROCKSDBTESTS_START=checkpoint_test ROCKSDBTESTS_END=db_block_cache_test make -j4 check_some; fi + - if [[ "${TEST_GROUP}" == '1' ]]; then OPT=-DTRAVIS V=1 ROCKSDBTESTS_START=db_block_cache_test ROCKSDBTESTS_END=comparator_db_test make -j4 check_some; fi + - if [[ "${TEST_GROUP}" == '2' ]]; then OPT=-DTRAVIS V=1 ROCKSDBTESTS_START=comparator_db_test make -j4 check_some; fi - if [[ "${JOB_NAME}" == 'java_test' ]]; then OPT=-DTRAVIS V=1 make clean jclean rocksdbjava jtest; fi - if [[ "${JOB_NAME}" == 'lite_build' ]]; then OPT="-DTRAVIS -DROCKSDB_LITE" V=1 make -j4 static_lib; fi notifications: diff --git a/Makefile b/Makefile index bc8376995..a3f884781 100644 --- a/Makefile +++ b/Makefile @@ -301,6 +301,22 @@ EXPOBJECTS = $(EXP_LIB_SOURCES:.cc=.o) $(LIBOBJECTS) $(TESTUTIL) TESTS = \ db_test \ db_test2 \ + external_sst_file_test \ + auto_roll_logger_test \ + bloom_test \ + dynamic_bloom_test \ + c_test \ + checkpoint_test \ + crc32c_test \ + coding_test \ + inlineskiplist_test \ + env_basic_test \ + env_test \ + thread_local_test \ + rate_limiter_test \ + perf_context_test \ + iostats_context_test \ + db_wal_test \ db_block_cache_test \ db_bloom_filter_test \ db_iter_test \ @@ -316,10 +332,8 @@ TESTS = \ db_options_test \ db_range_del_test \ db_sst_test \ - external_sst_file_test \ db_tailing_iter_test \ db_universal_compaction_test \ - db_wal_test \ db_io_failure_test \ db_properties_test \ db_table_properties_test \ @@ -328,20 +342,11 @@ TESTS = \ column_family_test \ table_properties_collector_test \ arena_test \ - auto_roll_logger_test \ block_test \ - bloom_test \ - dynamic_bloom_test \ - c_test \ cache_test \ - checkpoint_test \ - coding_test \ corruption_test \ - crc32c_test \ slice_transform_test \ dbformat_test \ - env_basic_test \ - env_test \ fault_injection_test \ filelock_test \ filename_test \ @@ -350,7 +355,6 @@ TESTS = \ full_filter_block_test \ hash_table_test \ histogram_test \ - inlineskiplist_test \ log_test \ manual_compaction_test \ mock_env_test \ @@ -386,9 +390,7 @@ TESTS = \ write_controller_test\ deletefile_test \ table_test \ - thread_local_test \ geodb_test \ - rate_limiter_test \ delete_scheduler_test \ options_test \ options_settable_test \ @@ -406,7 +408,6 @@ TESTS = \ sst_dump_test \ column_aware_encoding_test \ compact_files_test \ - perf_context_test \ optimistic_transaction_test \ write_callback_test \ heap_test \ @@ -415,7 +416,6 @@ TESTS = \ option_change_migration_test \ transaction_test \ ldb_cmd_test \ - iostats_context_test \ persistent_cache_test \ statistics_test \ lua_test \