From 8c9857ff6f8bae4b91de29ce9209fa3a0531f7a0 Mon Sep 17 00:00:00 2001 From: winlin Date: Sun, 3 Feb 2019 12:38:07 +0800 Subject: [PATCH] CI: Remove macros for utest --- trunk/src/utest/srs_utest.hpp | 27 -------------------------- trunk/src/utest/srs_utest_config.cpp | 4 ---- trunk/src/utest/srs_utest_core.cpp | 4 ---- trunk/src/utest/srs_utest_kernel.cpp | 4 ---- trunk/src/utest/srs_utest_protocol.cpp | 4 ---- trunk/src/utest/srs_utest_reload.cpp | 4 ---- 6 files changed, 47 deletions(-) diff --git a/trunk/src/utest/srs_utest.hpp b/trunk/src/utest/srs_utest.hpp index 05c87996a..711fb1af6 100644 --- a/trunk/src/utest/srs_utest.hpp +++ b/trunk/src/utest/srs_utest.hpp @@ -33,33 +33,6 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. #include -#define SRS_UTEST_DEV -#undef SRS_UTEST_DEV - -// enable all utest. -#ifndef SRS_UTEST_DEV - #define ENABLE_UTEST_AMF0 - #define ENABLE_UTEST_CONFIG - #define ENABLE_UTEST_CORE - #define ENABLE_UTEST_KERNEL - #define ENABLE_UTEST_PROTOCOL - #define ENABLE_UTEST_RELOAD -#endif - -// disable some for fast dev, compile and startup. -#ifdef SRS_UTEST_DEV - #undef ENABLE_UTEST_AMF0 - #undef ENABLE_UTEST_CONFIG - #undef ENABLE_UTEST_CORE - #undef ENABLE_UTEST_KERNEL - #undef ENABLE_UTEST_PROTOCOL - #undef ENABLE_UTEST_RELOAD -#endif - -#ifdef SRS_UTEST_DEV - #define ENABLE_UTEST_RELOAD -#endif - // we add an empty macro for upp to show the smart tips. #define VOID diff --git a/trunk/src/utest/srs_utest_config.cpp b/trunk/src/utest/srs_utest_config.cpp index 1cd03ce49..f04614345 100644 --- a/trunk/src/utest/srs_utest_config.cpp +++ b/trunk/src/utest/srs_utest_config.cpp @@ -84,8 +84,6 @@ srs_error_t MockSrsConfig::parse(string buf) return err; } -#ifdef ENABLE_UTEST_CONFIG - VOID TEST(ConfigTest, CheckMacros) { #ifndef SRS_CONSTS_LOCALHOST @@ -1806,5 +1804,3 @@ VOID TEST(ConfigMainTest, CheckConf_vhost_ingest_id) EXPECT_TRUE(ERROR_SUCCESS != conf.parse(_MIN_OK_CONF"vhost v{ingest{} ingest{}}")); } -#endif - diff --git a/trunk/src/utest/srs_utest_core.cpp b/trunk/src/utest/srs_utest_core.cpp index 47939081e..0f8b44bb1 100644 --- a/trunk/src/utest/srs_utest_core.cpp +++ b/trunk/src/utest/srs_utest_core.cpp @@ -22,8 +22,6 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ #include -#ifdef ENABLE_UTEST_CORE - using namespace std; #include @@ -66,5 +64,3 @@ VOID TEST(CoreMacroseTest, Check) #endif } -#endif - diff --git a/trunk/src/utest/srs_utest_kernel.cpp b/trunk/src/utest/srs_utest_kernel.cpp index 9ac6641a1..7a9a086ce 100644 --- a/trunk/src/utest/srs_utest_kernel.cpp +++ b/trunk/src/utest/srs_utest_kernel.cpp @@ -220,8 +220,6 @@ srs_error_t MockSrsCodec::decode(SrsBuffer* /*buf*/) return srs_success; } -#ifdef ENABLE_UTEST_KERNEL - VOID TEST(KernelBufferTest, DefaultObject) { SrsSimpleStream b; @@ -2167,5 +2165,3 @@ VOID TEST(KernelUtility, RTMPUtils2) } } -#endif - diff --git a/trunk/src/utest/srs_utest_protocol.cpp b/trunk/src/utest/srs_utest_protocol.cpp index 694ecbaf4..3bc35fd6b 100644 --- a/trunk/src/utest/srs_utest_protocol.cpp +++ b/trunk/src/utest/srs_utest_protocol.cpp @@ -275,8 +275,6 @@ MockWallClock* MockWallClock::set_clock(int64_t ms) return this; } -#ifdef ENABLE_UTEST_PROTOCOL - // verify the sha256 VOID TEST(ProtocolHandshakeTest, OpensslSha256) { @@ -6004,5 +6002,3 @@ VOID TEST(ProtocolKbpsTest, RAWStatistic) } } -#endif - diff --git a/trunk/src/utest/srs_utest_reload.cpp b/trunk/src/utest/srs_utest_reload.cpp index 3cbdd42c2..4897b48a0 100644 --- a/trunk/src/utest/srs_utest_reload.cpp +++ b/trunk/src/utest/srs_utest_reload.cpp @@ -299,8 +299,6 @@ srs_error_t MockSrsReloadConfig::do_reload(string buf) return err; } -#ifdef ENABLE_UTEST_RELOAD - VOID TEST(ConfigReloadTest, ReloadEmpty) { MockReloadHandler handler; @@ -920,5 +918,3 @@ VOID TEST(ConfigReloadTest, ReloadVhostIngestUpdated) handler.reset(); } -#endif -