[v21.6] Fix test config for vmaf

script/dldt-gst-tests.cmake

@@ -6,6 +6,7 @@ foreach(test ${tests})
     elseif(("${image}" MATCHES "vcaca") AND NOT (${name} MATCHES "vcaca"))
     #Do not add non-vcaca video analytics test to vcaca
     elseif("${image}" MATCHES "dev" AND ${name} MATCHES "video_analytics")
+    #Do not add analytics test case with 264 in dev images
     else()
     add_test(test_${image}_${name} "${CMAKE_CURRENT_SOURCE_DIR}/shell.sh" "/mnt/${name}.sh" "${image}")
     endif()

script/ffmpeg-tests.cmake

@@ -5,8 +5,10 @@ foreach(test ${tests})
     #Do not add svt test for VCACA DEV image
     elseif(${image} MATCHES "analytics" AND ${name} STREQUAL "ffmpeg_vmaf")
     #Do not add vmaf test for analytics image
+    elseif(NOT ${image} MATCHES "vmaf" AND ${name} STREQUAL "ffmpeg_vmaf")
+    #Do not add vmaf test to non vmaf images
     elseif(${image} MATCHES "dev" AND ${name} MATCHES "(1dns|x265|x264?)")
-    #Do not add vmaf test for analytics image
+    #Do not add GPL component tests for dev image
     else()
     add_test(test_${image}_${name} "${CMAKE_CURRENT_SOURCE_DIR}/shell.sh" "/mnt/${name}.sh" "${image}")
     endif()

script/gst-tests.cmake

@@ -6,7 +6,7 @@ foreach(test ${tests})
     elseif(${image} MATCHES "vcaca" AND ${name} MATCHES "(svt|hevc|av1?)")
     #Do not add svt test for VCACA DEV image
     elseif(${image} MATCHES "dev" AND ${name} MATCHES "(x264|x265?)")
-    #Do not add svt test for VCACA DEV image
+    #Do not add GPL component test for DEV images
     else()
     add_test(test_${image}_${name} "${CMAKE_CURRENT_SOURCE_DIR}/shell.sh" "/mnt/${name}.sh" "${image}")
     endif()