Turn off the related utests H265 option. v6.0.85 (#3811)

Turn off related unit tests when the H265 option is also turned off. --------- Co-authored-by: john <hondaxiao@tencent.com>
ossrs · Sep 26, 2023 · ca155a5 · ca155a5
1 parent 42bd4a9
commit ca155a5
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 2 deletions.
diff --git a/trunk/doc/CHANGELOG.md b/trunk/doc/CHANGELOG.md
@@ -7,6 +7,7 @@ The changelog for SRS.
 <a name="v6-changes"></a>
 
 ## SRS 6.0 Changelog
+* v6.0, 2023-09-26, Merge [#3811](https://github.com/ossrs/srs/pull/3811): Turn off the related utests H265 option. v6.0.85 (#3811)
 * v6.0, 2023-09-25, Merge [#3810](https://github.com/ossrs/srs/pull/3810): Change dev code for John. v6.0.84 (#3810)
 * v6.0, 2023-09-22, Merge [#3777](https://github.com/ossrs/srs/pull/3777): Compile: Add a __GLIBC__ definition for the pthread_setname_np. v6.0.83 (#3777)
 * v6.0, 2023-09-21, Merge [#3806](https://github.com/ossrs/srs/pull/3806): Build: Support sys-ssl for srt. v6.0.82 (#3806)

diff --git a/trunk/src/core/srs_core_version6.hpp b/trunk/src/core/srs_core_version6.hpp
@@ -9,6 +9,6 @@
 
 #define VERSION_MAJOR       6
 #define VERSION_MINOR       0
-#define VERSION_REVISION    84
+#define VERSION_REVISION    85
 
 #endif
diff --git a/trunk/src/utest/srs_utest_kernel2.cpp b/trunk/src/utest/srs_utest_kernel2.cpp
@@ -426,7 +426,8 @@ VOID TEST(KernelRTMPExtTest, ExtRTMPTest)
         EXPECT_EQ(SrsVideoAvcFrameTraitNALU, f.video->avc_packet_type);
         EXPECT_EQ(0x12, f.video->cts);
     }
-
+
+#ifdef SRS_H265
     // For new RTMP enhanced specification, with ext tag header.
     if (true) {
         SrsFormat f;
@@ -480,6 +481,7 @@ VOID TEST(KernelRTMPExtTest, ExtRTMPTest)
         HELPER_ASSERT_SUCCESS(f.initialize());
         HELPER_EXPECT_FAILED(f.on_video(0, (char*) "\x93mvc1", 5));
     }
+#endif
 }
 
 VOID TEST(KernelCodecTest, VideoFormatSepcialMProtect_DJI_M30)