From 9ed1b49a24cba1a96287c25fa1203d9565b32bd3 Mon Sep 17 00:00:00 2001 From: Torrie Fischer Date: Thu, 4 Sep 2014 09:14:44 -0700 Subject: [PATCH 1/3] Build unity build on make check --- Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Makefile b/Makefile index 260a51d1a..d1e60445a 100644 --- a/Makefile +++ b/Makefile @@ -220,7 +220,7 @@ coverage: # Delete intermediate files find . -type f -regex ".*\.\(\(gcda\)\|\(gcno\)\)" -exec rm {} \; -check: $(TESTS) ldb +check: $(TESTS) ldb unity for t in $(TESTS); do echo "***** Running $$t"; ./$$t || exit 1; done python tools/ldb_test.py From 6f0964e37c90bbe81a197f48133bbb2a1b9ca973 Mon Sep 17 00:00:00 2001 From: Torrie Fischer Date: Thu, 18 Sep 2014 09:53:13 -0700 Subject: [PATCH 2/3] Only run make unity on travis instead of make check --- .travis.yml | 2 +- Makefile | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.travis.yml b/.travis.yml index bcb852cf0..8f1bcb0ae 100644 --- a/.travis.yml +++ b/.travis.yml @@ -14,6 +14,6 @@ before_install: - sudo dpkg -i libgflags-dev_2.0-1_amd64.deb # Lousy hack to disable use and testing of fallocate, which doesn't behave quite # as EnvPosixTest::AllocateTest expects within the Travis OpenVZ environment. -script: OPT=-DTRAVIS make check -j8 +script: OPT=-DTRAVIS make unity && OPT=-DTRAVIS make check -j8 notifications: email: false diff --git a/Makefile b/Makefile index d1e60445a..260a51d1a 100644 --- a/Makefile +++ b/Makefile @@ -220,7 +220,7 @@ coverage: # Delete intermediate files find . -type f -regex ".*\.\(\(gcda\)\|\(gcno\)\)" -exec rm {} \; -check: $(TESTS) ldb unity +check: $(TESTS) ldb for t in $(TESTS); do echo "***** Running $$t"; ./$$t || exit 1; done python tools/ldb_test.py From ed9a2df8cc44e10bbee8ff7861aba8fcbc9ec500 Mon Sep 17 00:00:00 2001 From: Torrie Fischer Date: Fri, 19 Sep 2014 15:43:51 -0700 Subject: [PATCH 3/3] fix unity build --- utilities/write_batch_with_index/write_batch_with_index.cc | 2 -- 1 file changed, 2 deletions(-) diff --git a/utilities/write_batch_with_index/write_batch_with_index.cc b/utilities/write_batch_with_index/write_batch_with_index.cc index 68b3d3970..917460694 100644 --- a/utilities/write_batch_with_index/write_batch_with_index.cc +++ b/utilities/write_batch_with_index/write_batch_with_index.cc @@ -10,7 +10,6 @@ #include "util/arena.h" namespace rocksdb { -namespace { class ReadableWriteBatch : public WriteBatch { public: explicit ReadableWriteBatch(size_t reserved_bytes = 0) @@ -20,7 +19,6 @@ class ReadableWriteBatch : public WriteBatch { Status GetEntryFromDataOffset(size_t data_offset, WriteType* type, Slice* Key, Slice* value, Slice* blob) const; }; -} // namespace // Key used by skip list, as the binary searchable index of WriteBatchWithIndex. struct WriteBatchIndexEntry {