Merge pull request #11121 from akallabeth/h264-notest

H264 notest

cmake/ConfigOptions.cmake

@@ -59,6 +59,9 @@ option(BUILD_TESTING "Build unit tests (compatible with packaging)" OFF)
 cmake_dependent_option(
   BUILD_TESTING_INTERNAL "Build unit tests (CI only, not for packaging!)" OFF "NOT BUILD_TESTING" OFF
 )
+cmake_dependent_option(
+    BUILD_TESTING_NO_H264 "Skip building h264 unit tests (no implementation during packaging)" OFF "BUILD_TESTING OR BUILD_TESTING_INTERNAL" OFF
+)
 cmake_dependent_option(TESTS_WTSAPI_EXTRA "Build extra WTSAPI tests (interactive)" OFF "BUILD_TESTING_INTERNAL" OFF)
 cmake_dependent_option(BUILD_COMM_TESTS "Build comm related tests (require comm port)" OFF "BUILD_TESTING_INTERNAL" OFF)
 

libfreerdp/codec/test/CMakeLists.txt

@@ -11,12 +11,17 @@ set(TESTS
     TestFreeRDPCodecPlanar.c
     TestFreeRDPCodecCopy.c
     TestFreeRDPCodecClear.c
-    TestFreeRDPCodecH264.c
     TestFreeRDPCodecInterleaved.c
     TestFreeRDPCodecProgressive.c
     TestFreeRDPCodecRemoteFX.c
 )
 
+if (NOT BUILD_TESTING_NO_H264)
+	list(APPEND TESTS
+		TestFreeRDPCodecH264.c
+	)
+endif()
+
 if(BUILD_TESTING_INTERNAL)
   list(APPEND TESTS TestFreeRDPCodecMppc.c TestFreeRDPCodecNCrush.c TestFreeRDPCodecXCrush.c)
 endif()

packaging/rpm/freerdp-nightly.spec

@@ -206,6 +206,7 @@ cp %{_topdir}/SOURCES/source_version freerdp-nightly-%{version}/.source_version
     -DWITH_SERVER=ON \
     -DWITH_CAIRO=ON \
     -DBUILD_TESTING=ON \
+    -DBUILD_TESTING_NO_H264=ON \
     -DCMAKE_CTEST_ARGUMENTS="-DExperimentalTest;--output-on-failure;--no-compress-output" \
     -DCMAKE_BUILD_TYPE=RelWithDebInfo \
     -DCMAKE_INSTALL_PREFIX=%{INSTALL_PREFIX} \