Merge pull request #270 from tdfischer/check-with-unity

Build unity build on make check
main
Igor Canadi 10 years ago
commit 1a1b953471
  1. 2
      .travis.yml
  2. 1
      utilities/write_batch_with_index/write_batch_with_index.cc

@ -14,6 +14,6 @@ before_install:
- sudo dpkg -i libgflags-dev_2.0-1_amd64.deb - sudo dpkg -i libgflags-dev_2.0-1_amd64.deb
# Lousy hack to disable use and testing of fallocate, which doesn't behave quite # Lousy hack to disable use and testing of fallocate, which doesn't behave quite
# as EnvPosixTest::AllocateTest expects within the Travis OpenVZ environment. # 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: notifications:
email: false email: false

@ -10,7 +10,6 @@
#include "util/arena.h" #include "util/arena.h"
namespace rocksdb { namespace rocksdb {
namespace {
class ReadableWriteBatch : public WriteBatch { class ReadableWriteBatch : public WriteBatch {
public: public:
explicit ReadableWriteBatch(size_t reserved_bytes = 0) explicit ReadableWriteBatch(size_t reserved_bytes = 0)

Loading…
Cancel
Save