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
main
Siying Dong 8 years ago committed by Facebook Github Bot
parent f7997f1341
commit 6c951c43c7
  1. 21
      .travis.yml
  2. 32
      Makefile

@ -18,12 +18,11 @@ addons:
sources: ['ubuntu-toolchain-r-test', 'llvm-toolchain-precise-3.6'] 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'] packages: ['clang-3.6' , 'g++-6', 'zlib1g-dev', 'libbz2-dev', 'libsnappy-dev', 'curl', 'libgflags-dev']
env: env:
# Run all tests before db_block_cache_test (db_test, db_test2) - TEST_GROUP=platform_dependent1
- JOB_NAME=unittests ROCKSDBTESTS_END=db_block_cache_test - TEST_GROUP=platform_dependent2
# Run all tests starting from db_block_cache_test (db_block_cache_test, ..., plain_table_db_test) - TEST_GROUP=platform_dependent3
- JOB_NAME=unittests ROCKSDBTESTS_START=db_block_cache_test ROCKSDBTESTS_END=comparator_db_test - TEST_GROUP=1
# Run all tests starting from db_block_cache_test (comparator_db_test, ...) - TEST_GROUP=2
- JOB_NAME=unittests ROCKSDBTESTS_START=comparator_db_test
# Run java tests # Run java tests
- JOB_NAME=java_test - JOB_NAME=java_test
# Build ROCKSDB_LITE # Build ROCKSDB_LITE
@ -33,6 +32,10 @@ matrix:
exclude: exclude:
- os: osx - os: osx
compiler: gcc compiler: gcc
- os: osx
env: TEST_GROUP=1
- os: osx
env: TEST_GROUP=2
before_script: before_script:
- if [[ "${TRAVIS_OS_NAME}" == 'linux' && "${CXX}" == 'clang++' ]]; then CXX=clang++-3.6; fi - if [[ "${TRAVIS_OS_NAME}" == 'linux' && "${CXX}" == 'clang++' ]]; then CXX=clang++-3.6; fi
@ -43,7 +46,11 @@ before_script:
script: script:
- ${CXX} --version - ${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}" == '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 - if [[ "${JOB_NAME}" == 'lite_build' ]]; then OPT="-DTRAVIS -DROCKSDB_LITE" V=1 make -j4 static_lib; fi
notifications: notifications:

@ -301,6 +301,22 @@ EXPOBJECTS = $(EXP_LIB_SOURCES:.cc=.o) $(LIBOBJECTS) $(TESTUTIL)
TESTS = \ TESTS = \
db_test \ db_test \
db_test2 \ 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_block_cache_test \
db_bloom_filter_test \ db_bloom_filter_test \
db_iter_test \ db_iter_test \
@ -316,10 +332,8 @@ TESTS = \
db_options_test \ db_options_test \
db_range_del_test \ db_range_del_test \
db_sst_test \ db_sst_test \
external_sst_file_test \
db_tailing_iter_test \ db_tailing_iter_test \
db_universal_compaction_test \ db_universal_compaction_test \
db_wal_test \
db_io_failure_test \ db_io_failure_test \
db_properties_test \ db_properties_test \
db_table_properties_test \ db_table_properties_test \
@ -328,20 +342,11 @@ TESTS = \
column_family_test \ column_family_test \
table_properties_collector_test \ table_properties_collector_test \
arena_test \ arena_test \
auto_roll_logger_test \
block_test \ block_test \
bloom_test \
dynamic_bloom_test \
c_test \
cache_test \ cache_test \
checkpoint_test \
coding_test \
corruption_test \ corruption_test \
crc32c_test \
slice_transform_test \ slice_transform_test \
dbformat_test \ dbformat_test \
env_basic_test \
env_test \
fault_injection_test \ fault_injection_test \
filelock_test \ filelock_test \
filename_test \ filename_test \
@ -350,7 +355,6 @@ TESTS = \
full_filter_block_test \ full_filter_block_test \
hash_table_test \ hash_table_test \
histogram_test \ histogram_test \
inlineskiplist_test \
log_test \ log_test \
manual_compaction_test \ manual_compaction_test \
mock_env_test \ mock_env_test \
@ -386,9 +390,7 @@ TESTS = \
write_controller_test\ write_controller_test\
deletefile_test \ deletefile_test \
table_test \ table_test \
thread_local_test \
geodb_test \ geodb_test \
rate_limiter_test \
delete_scheduler_test \ delete_scheduler_test \
options_test \ options_test \
options_settable_test \ options_settable_test \
@ -406,7 +408,6 @@ TESTS = \
sst_dump_test \ sst_dump_test \
column_aware_encoding_test \ column_aware_encoding_test \
compact_files_test \ compact_files_test \
perf_context_test \
optimistic_transaction_test \ optimistic_transaction_test \
write_callback_test \ write_callback_test \
heap_test \ heap_test \
@ -415,7 +416,6 @@ TESTS = \
option_change_migration_test \ option_change_migration_test \
transaction_test \ transaction_test \
ldb_cmd_test \ ldb_cmd_test \
iostats_context_test \
persistent_cache_test \ persistent_cache_test \
statistics_test \ statistics_test \
lua_test \ lua_test \

Loading…
Cancel
Save