refactor gtests and add make test

nayutaco · Aug 17, 2018 · df84537 · df84537
1 parent e0e717d
commit df84537
Show file tree

Hide file tree

Showing 36 changed files with 53 additions and 7 deletions.
diff --git a/.gitignore b/.gitignore
@@ -12,6 +12,7 @@ routing/routing
 
 .Depend
 *.o
+*.a
 *.log
 GPATH
 GRTAGS

diff --git a/.travis.yml b/.travis.yml
@@ -34,3 +34,5 @@ addons:
 
 script:
   - make full
+  - make test
+
diff --git a/Makefile b/Makefile
@@ -42,3 +42,8 @@ lib_clean:
 
 git_subs:
 	git submodule update --init --recursive
+
+test:
+	$(MAKE) -C gtest
+	$(MAKE) -C ptarm test
+
diff --git a/ptarm/gtests/gtest/Makefile → gtest/Makefile b/ptarm/gtests/gtest/Makefile → gtest/Makefile
diff --git a/ptarm/gtests/gtest/gtest-all.cc → gtest/gtest-all.cc b/ptarm/gtests/gtest/gtest-all.cc → gtest/gtest-all.cc
diff --git a/ptarm/gtests/gtest/gtest-main.cc → gtest/gtest-main.cc b/ptarm/gtests/gtest/gtest-main.cc → gtest/gtest-main.cc
@@ -1,4 +1,4 @@
-#include "gtest.h"
+#include "gtest/gtest.h"
 
 int main(int argc, char **argv) {
   ::testing::InitGoogleTest(&argc, argv);

diff --git a/ptarm/gtests/gtest/gtest.h → gtest/gtest.h b/ptarm/gtests/gtest/gtest.h → gtest/gtest.h
diff --git a/ptarm/Makefile b/ptarm/Makefile
@@ -213,6 +213,11 @@ cppcheck:
 
 clean:
 	$(RM) $(OBJECT_DIRECTORY) $(OUTPUT_BINARY_DIRECTORY)/$(OUTPUT_FILENAME) .Depend
+	$(MAKE) -C tests clean
+
+test:
+	$(MAKE) -C tests
+	$(MAKE) -C tests exec
 
 ################################
 

diff --git a/ptarm/ptarm.h b/ptarm/ptarm.h
@@ -1424,6 +1424,8 @@ void ptarm_print_extendedkey(const ptarm_ekey_t *pEKey);
  * @return  malloc残数
  */
 int ptarm_dbg_malloc_cnt(void);
+
+void ptarm_dbg_malloc_cnt_reset(void);
 #endif  //PTARM_DEBUG_MEM
 
 #ifdef __cplusplus

diff --git a/ptarm/ptarm_util.c b/ptarm/ptarm_util.c
@@ -399,6 +399,10 @@ int ptarm_dbg_malloc_cnt(void)
     return mcount;
 }
 
+void ptarm_dbg_malloc_cnt_reset(void)
+{
+    mcount = 0;
+}
 #endif  //PTARM_DEBUG_MEM
 
 

diff --git a/ptarm/gtests/Makefile → ptarm/tests/Makefile b/ptarm/gtests/Makefile → ptarm/tests/Makefile
@@ -1,4 +1,4 @@
-GTEST_DIR = ./gtest
+GTEST_DIR = ../../gtest
 OBJECT_DIRECTORY = _ggtest
 
 CXX=g++
@@ -15,7 +15,7 @@ TEST_TARGET_SRC += test_ptarm.cpp
 # Flags passed to the preprocessor.
 # Set Google Test's header directory as a system directory, such that
 # the compiler doesn't generate warnings in Google Test headers.
-CPPFLAGS += -isystem -I$(GTEST_DIR) -DUNITTEST -D_GLIBCXX_USE_CXX11_ABI=1
+CPPFLAGS += -isystem $(GTEST_DIR)/.. -DUNITTEST -D_GLIBCXX_USE_CXX11_ABI=1
 CPPFLAGS += -DNDEBUG
 CPPFLAGS += -DPTARM_DEBUG
 CPPFLAGS += -DPTARM_DEBUG_MEM
@@ -44,7 +44,7 @@ vpath %.cpp $(TEST_PATHS)
 
 all: .Depend unittest
 
-unittest : $(OBJECT_DIRECTORY) $(GTEST_DIR)/gtest_main.a $(TEST_OBJECTS)
+unittest: $(OBJECT_DIRECTORY) $(GTEST_DIR)/gtest_main.a $(TEST_OBJECTS)
 	$(CXX) $(CPPFLAGS) $(CXXFLAGS) $(TEST_OBJECTS) $(GTEST_DIR)/gtest_main.a -o $(OBJECT_DIRECTORY)/$@ $(LDFLAGS)
 
 $(OBJECT_DIRECTORY):
@@ -62,15 +62,17 @@ $(GTEST_DIR)/gtest_main.a:
 	make -C $(GTEST_DIR)
 
 .Depend:
+ifneq ($(MAKECMDGOALS),clean)
 	$(foreach SRC,$(TEST_TARGET_SRC),$(CXX) $(CPPFLAGS) $(CXXFLAGS) -MM -MT $(OBJECT_DIRECTORY)/$(SRC:.cpp=.o) $(SRC) >> .Depend;)
+endif
 
-rmlcov :
+rmlcov:
 	$(RM) $(OBJECT_DIRECTORY)/*.gcda
 
-clean :
+clean:
 	@$(RM) $(OBJECT_DIRECTORY) .Depend
 
-clobber : clean
+clobber: clean
 	make -C $(GTEST_DIR) clean
 
 exec: rmlcov

diff --git a/ptarm/gtests/_testinc_template.cpp → ptarm/tests/_testinc_template.cpp b/ptarm/gtests/_testinc_template.cpp → ptarm/tests/_testinc_template.cpp
@@ -9,6 +9,7 @@ class xxx: public testing::Test {
 protected:
     virtual void SetUp() {
         //RESET_FAKE(external_function)
+        ptarm_dbg_malloc_cnt_reset();
         ptarm_init(PTARM_TESTNET, false);
     }
 

diff --git a/ptarm/gtests/fakeinc.cpp → ptarm/tests/fakeinc.cpp b/ptarm/gtests/fakeinc.cpp → ptarm/tests/fakeinc.cpp
diff --git a/ptarm/gtests/fff.h → ptarm/tests/fff.h b/ptarm/gtests/fff.h → ptarm/tests/fff.h
diff --git a/ptarm/gtests/test_ptarm.cpp → ptarm/tests/test_ptarm.cpp b/ptarm/gtests/test_ptarm.cpp → ptarm/tests/test_ptarm.cpp
@@ -50,6 +50,7 @@ TEST_F(ptarm, first)
 
 TEST_F(ptarm, ptarm_setnet_testnet_false)
 {
+    ptarm_dbg_malloc_cnt_reset();
     bool ret = ptarm_init(PTARM_TESTNET, false);
     ASSERT_TRUE(ret);
     ASSERT_EQ(2, mPref[PTARM_PREF]);
@@ -63,6 +64,7 @@ TEST_F(ptarm, ptarm_setnet_testnet_false)
 
 TEST_F(ptarm, ptarm_setnet_testnet_true)
 {
+    ptarm_dbg_malloc_cnt_reset();
     bool ret = ptarm_init(PTARM_TESTNET, true);
     ASSERT_TRUE(ret);
     ASSERT_EQ(2, mPref[PTARM_PREF]);
@@ -76,6 +78,7 @@ TEST_F(ptarm, ptarm_setnet_testnet_true)
 
 TEST_F(ptarm, ptarm_setnet_mainnet)
 {
+    ptarm_dbg_malloc_cnt_reset();
     bool ret = ptarm_init(PTARM_MAINNET, false);
     ASSERT_TRUE(ret);
     ASSERT_EQ(1, mPref[PTARM_PREF]);

diff --git a/ptarm/gtests/testinc_bech32.cpp → ptarm/tests/testinc_bech32.cpp b/ptarm/gtests/testinc_bech32.cpp → ptarm/tests/testinc_bech32.cpp
@@ -9,6 +9,7 @@ class bech32: public testing::Test {
 protected:
     virtual void SetUp() {
         //RESET_FAKE(external_function)
+        ptarm_dbg_malloc_cnt_reset();
         ptarm_init(PTARM_TESTNET, false);
     }
 

diff --git a/ptarm/gtests/testinc_buf.cpp → ptarm/tests/testinc_buf.cpp b/ptarm/gtests/testinc_buf.cpp → ptarm/tests/testinc_buf.cpp
@@ -9,6 +9,7 @@ class buf: public testing::Test {
 protected:
     virtual void SetUp() {
         //RESET_FAKE(external_function)
+        ptarm_dbg_malloc_cnt_reset();
         ptarm_init(PTARM_TESTNET, false);
     }
 

diff --git a/ptarm/gtests/testinc_ekey.cpp → ptarm/tests/testinc_ekey.cpp b/ptarm/gtests/testinc_ekey.cpp → ptarm/tests/testinc_ekey.cpp
@@ -9,6 +9,7 @@ class extendedkey: public testing::Test {
 protected:
     virtual void SetUp() {
         //RESET_FAKE(external_function)
+        ptarm_dbg_malloc_cnt_reset();
         ptarm_init(PTARM_MAINNET, false);
     }
 
@@ -501,6 +502,7 @@ TEST_F(extendedkey, chain_m_master2)
 
 TEST_F(extendedkey, chain_testnet)
 {
+    ptarm_dbg_malloc_cnt_reset();
     ptarm_init(PTARM_TESTNET, false);
 
     uint8_t buf_ekey[PTARM_SZ_EKEY];

diff --git a/ptarm/gtests/testinc_hash.cpp → ptarm/tests/testinc_hash.cpp b/ptarm/gtests/testinc_hash.cpp → ptarm/tests/testinc_hash.cpp
diff --git a/ptarm/gtests/testinc_keys.cpp → ptarm/tests/testinc_keys.cpp b/ptarm/gtests/testinc_keys.cpp → ptarm/tests/testinc_keys.cpp
@@ -9,6 +9,7 @@ class keys: public testing::Test {
 protected:
     virtual void SetUp() {
         //RESET_FAKE(external_function)
+        ptarm_dbg_malloc_cnt_reset();
         ptarm_init(PTARM_TESTNET, false);
     }
 

diff --git a/ptarm/gtests/testinc_keys_native.cpp → ptarm/tests/testinc_keys_native.cpp b/ptarm/gtests/testinc_keys_native.cpp → ptarm/tests/testinc_keys_native.cpp
@@ -9,6 +9,7 @@ class keys_native: public testing::Test {
 protected:
     virtual void SetUp() {
         //RESET_FAKE(external_function)
+        ptarm_dbg_malloc_cnt_reset();
         ptarm_init(PTARM_TESTNET, true);
     }
 

diff --git a/ptarm/gtests/testinc_ln.cpp → ptarm/tests/testinc_ln.cpp b/ptarm/gtests/testinc_ln.cpp → ptarm/tests/testinc_ln.cpp
@@ -9,6 +9,7 @@ class ln: public testing::Test {
 protected:
     virtual void SetUp() {
         //RESET_FAKE(external_function)
+        ptarm_dbg_malloc_cnt_reset();
         ptarm_init(PTARM_TESTNET, true);
     }
 

diff --git a/ptarm/gtests/testinc_ln_bolt3_b.cpp → ptarm/tests/testinc_ln_bolt3_b.cpp b/ptarm/gtests/testinc_ln_bolt3_b.cpp → ptarm/tests/testinc_ln_bolt3_b.cpp
@@ -42,6 +42,7 @@ ptarm_util_keys_t    ln_bolt3_b::keys;
 
 TEST_F(ln_bolt3_b, fuding1)
 {
+    ptarm_dbg_malloc_cnt_reset();
     ptarm_init(PTARM_TESTNET, true);
 
 

diff --git a/ptarm/gtests/testinc_ln_bolt3_c.cpp → ptarm/tests/testinc_ln_bolt3_c.cpp b/ptarm/gtests/testinc_ln_bolt3_c.cpp → ptarm/tests/testinc_ln_bolt3_c.cpp
@@ -264,6 +264,7 @@ ln_htlcinfo_t** ln_bolt3_c::pp_htlcinfos;
 
 TEST_F(ln_bolt3_c, start)
 {
+    ptarm_dbg_malloc_cnt_reset();
     ptarm_init(PTARM_TESTNET, true);
 }
 

diff --git a/ptarm/gtests/testinc_ln_bolt3_d.cpp → ptarm/tests/testinc_ln_bolt3_d.cpp b/ptarm/gtests/testinc_ln_bolt3_d.cpp → ptarm/tests/testinc_ln_bolt3_d.cpp
@@ -14,6 +14,7 @@ class ln_bolt3_d: public testing::Test {
 protected:
     virtual void SetUp() {
         //RESET_FAKE(external_function)
+        ptarm_dbg_malloc_cnt_reset();
         ptarm_init(PTARM_TESTNET, true);
     }
 

diff --git a/ptarm/gtests/testinc_ln_bolt3_e.cpp → ptarm/tests/testinc_ln_bolt3_e.cpp b/ptarm/gtests/testinc_ln_bolt3_e.cpp → ptarm/tests/testinc_ln_bolt3_e.cpp
@@ -9,6 +9,7 @@ class ln_derkey: public testing::Test {
 protected:
     virtual void SetUp() {
         //RESET_FAKE(external_function)
+        ptarm_dbg_malloc_cnt_reset();
         ptarm_init(PTARM_TESTNET, true);
     }
 

diff --git a/ptarm/gtests/testinc_ln_bolt4.cpp → ptarm/tests/testinc_ln_bolt4.cpp b/ptarm/gtests/testinc_ln_bolt4.cpp → ptarm/tests/testinc_ln_bolt4.cpp
@@ -17,6 +17,7 @@ class onion: public testing::Test {
 protected:
     virtual void SetUp() {
         //RESET_FAKE(external_function)
+        ptarm_dbg_malloc_cnt_reset();
         ptarm_init(PTARM_TESTNET, true);
         ptarm_buf_init(&sOnionBuffer);
         spEphPubkey = NULL;

diff --git a/ptarm/gtests/testinc_ln_bolt8.cpp → ptarm/tests/testinc_ln_bolt8.cpp b/ptarm/gtests/testinc_ln_bolt8.cpp → ptarm/tests/testinc_ln_bolt8.cpp
@@ -9,6 +9,7 @@ class bolt8test: public testing::Test {
 protected:
     virtual void SetUp() {
         //RESET_FAKE(external_function)
+        ptarm_dbg_malloc_cnt_reset();
         ptarm_init(PTARM_TESTNET, true);
     }
 

diff --git a/ptarm/gtests/testinc_ln_misc.cpp → ptarm/tests/testinc_ln_misc.cpp b/ptarm/gtests/testinc_ln_misc.cpp → ptarm/tests/testinc_ln_misc.cpp
@@ -9,6 +9,7 @@ class misc: public testing::Test {
 protected:
     virtual void SetUp() {
         //RESET_FAKE(external_function)
+        ptarm_dbg_malloc_cnt_reset();
         ptarm_init(PTARM_TESTNET, false);
     }
 

diff --git a/ptarm/gtests/testinc_push.cpp → ptarm/tests/testinc_push.cpp b/ptarm/gtests/testinc_push.cpp → ptarm/tests/testinc_push.cpp
@@ -9,6 +9,7 @@ class push: public testing::Test {
 protected:
     virtual void SetUp() {
         //RESET_FAKE(external_function)
+        ptarm_dbg_malloc_cnt_reset();
         ptarm_init(PTARM_TESTNET, false);
     }
 

diff --git a/ptarm/gtests/testinc_recoverpub.cpp → ptarm/tests/testinc_recoverpub.cpp b/ptarm/gtests/testinc_recoverpub.cpp → ptarm/tests/testinc_recoverpub.cpp
@@ -9,6 +9,7 @@ class recoverpub: public testing::Test {
 protected:
     virtual void SetUp() {
         //RESET_FAKE(external_function)
+        ptarm_dbg_malloc_cnt_reset();
         ptarm_init(PTARM_TESTNET, false);
     }
 

diff --git a/ptarm/gtests/testinc_segwit.cpp → ptarm/tests/testinc_segwit.cpp b/ptarm/gtests/testinc_segwit.cpp → ptarm/tests/testinc_segwit.cpp
@@ -9,6 +9,7 @@ class sw: public testing::Test {
 protected:
     virtual void SetUp() {
         //RESET_FAKE(external_function)
+        ptarm_dbg_malloc_cnt_reset();
         ptarm_init(PTARM_TESTNET, false);
     }
 

diff --git a/ptarm/gtests/testinc_send.cpp → ptarm/tests/testinc_send.cpp b/ptarm/gtests/testinc_send.cpp → ptarm/tests/testinc_send.cpp
@@ -9,6 +9,7 @@ class send: public testing::Test {
 protected:
     virtual void SetUp() {
         //RESET_FAKE(external_function)
+        ptarm_dbg_malloc_cnt_reset();
         ptarm_init(PTARM_TESTNET, false);
     }
 

diff --git a/ptarm/gtests/testinc_sw_native.cpp → ptarm/tests/testinc_sw_native.cpp b/ptarm/gtests/testinc_sw_native.cpp → ptarm/tests/testinc_sw_native.cpp
@@ -9,6 +9,7 @@ class sw_native: public testing::Test {
 protected:
     virtual void SetUp() {
         //RESET_FAKE(external_function)
+        ptarm_dbg_malloc_cnt_reset();
         ptarm_init(PTARM_TESTNET, true);
     }
 

diff --git a/ptarm/gtests/testinc_tx.cpp → ptarm/tests/testinc_tx.cpp b/ptarm/gtests/testinc_tx.cpp → ptarm/tests/testinc_tx.cpp
@@ -9,6 +9,7 @@ class tx: public testing::Test {
 protected:
     virtual void SetUp() {
         //RESET_FAKE(external_function)
+        ptarm_dbg_malloc_cnt_reset();
         ptarm_init(PTARM_TESTNET, false);
     }
 

diff --git a/ptarm/gtests/testinc_tx_native.cpp → ptarm/tests/testinc_tx_native.cpp b/ptarm/gtests/testinc_tx_native.cpp → ptarm/tests/testinc_tx_native.cpp
@@ -9,6 +9,7 @@ class tx_native: public testing::Test {
 protected:
     virtual void SetUp() {
         //RESET_FAKE(external_function)
+        ptarm_dbg_malloc_cnt_reset();
         ptarm_init(PTARM_TESTNET, true);
     }