Skip to content

Commit 5c30e6c

Browse files
zhichao-caofacebook-github-bot
authored andcommitted
Separate timestamp related test from db_basic_test (facebook#6516)
Summary: In some of the test, db_basic_test may cause time out due to its long running time. Separate the timestamp related test from db_basic_test to avoid the potential issue. Pull Request resolved: facebook#6516 Test Plan: pass make asan_check Differential Revision: D20423922 Pulled By: zhichao-cao fbshipit-source-id: d6306f89a8de55b07bf57233e4554c09ef1fe23a
1 parent 674cf41 commit 5c30e6c

File tree

8 files changed

+826
-772
lines changed

8 files changed

+826
-772
lines changed

.gitignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -34,6 +34,7 @@ manifest_dump
3434
sst_dump
3535
blob_dump
3636
block_cache_trace_analyzer
37+
db_with_timestamp_basic_test
3738
tools/block_cache_analyzer/*.pyc
3839
column_aware_encoding_exp
3940
util/build_version.cc

CMakeLists.txt

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -953,6 +953,8 @@ if(WITH_TESTS)
953953
db/corruption_test.cc
954954
db/cuckoo_table_db_test.cc
955955
db/db_basic_test.cc
956+
db/db_with_timestamp_basic_test.cc
957+
db/db_blob_index_test.cc
956958
db/db_block_cache_test.cc
957959
db/db_bloom_filter_test.cc
958960
db/db_compaction_filter_test.cc

Makefile

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -446,6 +446,7 @@ EXPOBJECTS = $(LIBOBJECTS) $(TESTUTIL)
446446

447447
TESTS = \
448448
db_basic_test \
449+
db_with_timestamp_basic_test \
449450
db_encryption_test \
450451
db_test2 \
451452
external_sst_file_basic_test \
@@ -1307,6 +1308,9 @@ slice_transform_test: util/slice_transform_test.o $(LIBOBJECTS) $(TESTHARNESS)
13071308
db_basic_test: db/db_basic_test.o db/db_test_util.o $(LIBOBJECTS) $(TESTHARNESS)
13081309
$(AM_LINK)
13091310

1311+
db_with_timestamp_basic_test: db/db_with_timestamp_basic_test.o db/db_test_util.o $(LIBOBJECTS) $(TESTHARNESS)
1312+
$(AM_LINK)
1313+
13101314
db_encryption_test: db/db_encryption_test.o db/db_test_util.o $(LIBOBJECTS) $(TESTHARNESS)
13111315
$(AM_LINK)
13121316

TARGETS

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -919,6 +919,13 @@ ROCKS_TESTS = [
919919
[],
920920
[],
921921
],
922+
[
923+
"db_with_timestamp_basic_test",
924+
"db/db_with_timestamp_basic_test.cc",
925+
"serial",
926+
[],
927+
[],
928+
],
922929
[
923930
"db_write_test",
924931
"db/db_write_test.cc",

appveyor.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -68,7 +68,7 @@ build:
6868
test:
6969

7070
test_script:
71-
- ps: build_tools\run_ci_db_test.ps1 -SuiteRun db_basic_test,db_test2,db_test,env_basic_test,env_test,db_merge_operand_test -Concurrency 8
71+
- ps: build_tools\run_ci_db_test.ps1 -SuiteRun db_basic_test,db_with_timestamp_basic_test,db_test2,db_test,env_basic_test,env_test,db_merge_operand_test -Concurrency 8
7272

7373
on_failure:
7474
- cmd: 7z a build-failed.zip %APPVEYOR_BUILD_FOLDER%\build\ && appveyor PushArtifact build-failed.zip

0 commit comments

Comments
 (0)