Merge pull request #76 vpisarev/test_fixes_1

modules/highgui/test/test_framecount.cpp

@@ -109,6 +109,6 @@ void CV_FramecountTest::run(int)
         }
     }
 }
-#if BUILD_WITH_VIDEO_INPUT_SUPPORT
+#if BUILD_WITH_VIDEO_INPUT_SUPPORT && defined HAVE_FFMPEG
 TEST(Highgui_Video, framecount) {CV_FramecountTest test; test.safe_run();}
 #endif

modules/highgui/test/test_positioning.cpp

@@ -217,7 +217,7 @@ void CV_VideoRandomPositioningTest::run(int)
     run_test(RANDOM);
 }
 
-#if BUILD_WITH_VIDEO_INPUT_SUPPORT
+#if BUILD_WITH_VIDEO_INPUT_SUPPORT && defined HAVE_FFMPEG
 TEST (Highgui_Video, seek_progressive) { CV_VideoProgressivePositioningTest test; test.safe_run(); }
 TEST (Highgui_Video, seek_random) { CV_VideoRandomPositioningTest test; test.safe_run(); }
 #endif

modules/highgui/test/test_video_pos.cpp

@@ -173,6 +173,6 @@ public:
     Size framesize;
 };
 
-#if BUILD_WITH_VIDEO_INPUT_SUPPORT && BUILD_WITH_VIDEO_OUTPUT_SUPPORT
+#if BUILD_WITH_VIDEO_INPUT_SUPPORT && BUILD_WITH_VIDEO_OUTPUT_SUPPORT && defined HAVE_FFMPEG
 TEST(Highgui_Video, seek_random_synthetic) { CV_PositioningTest test; test.safe_run(); }
 #endif