MB-6141: Move mock/ directory into tests/ directory

Change-Id: I4d42dc1b85c4e744065d6d684351588f89a82cc0 Reviewed-on: http://review.couchbase.org/19804 Reviewed-by: Chiyoung Seo <chiyoung.seo@gmail.com> Tested-by: Chiyoung Seo <chiyoung.seo@gmail.com>
membase · Aug 18, 2012 · 9aaf525 · 9aaf525
1 parent 84bce5b
commit 9aaf525
Show file tree

Hide file tree

Showing 3 changed files with 2 additions and 2 deletions.
diff --git a/Makefile.am b/Makefile.am
@@ -251,14 +251,14 @@ TESTS=${check_PROGRAMS}
 EXTRA_TESTS =
 
 ep_testsuite_la_CPPFLAGS = -I$(top_srcdir)/src/sqlite-kvstore \
-                         $(AM_CPPFLAGS) ${NO_WERROR}
+                           -I$(top_srcdir)/tests $(AM_CPPFLAGS) ${NO_WERROR}
 ep_testsuite_la_SOURCES= tests/ep_testsuite.cc tests/ep_testsuite.h       \
                          src/atomic.cc locks.hh src/mutex.cc src/mutex.hh \
                          src/item.cc  src/testlogger_libify.cc            \
                          src/dispatcher.cc src/ep_time.c                  \
                          src/ep_time.h src/sqlite-kvstore/sqlite-pst.cc   \
                          tools/cJSON.c tools/cJSON.h                      \
-                         mock/mccouch.cc mock/mccouch.hh                  \
+                         tests/mock/mccouch.cc tests/mock/mccouch.hh      \
                          tests/ep_test_apis.cc tests/ep_test_apis.h
 ep_testsuite_la_LDFLAGS= -module -dynamic
 

diff --git a/mock/mccouch.cc → tests/mock/mccouch.cc b/mock/mccouch.cc → tests/mock/mccouch.cc
diff --git a/mock/mccouch.hh → tests/mock/mccouch.hh b/mock/mccouch.hh → tests/mock/mccouch.hh