diff options
| author | Thiago Santos <thiago.sousa.santos@collabora.co.uk> | 2010-12-06 11:05:17 -0300 |
|---|---|---|
| committer | Thiago Santos <thiago.sousa.santos@collabora.co.uk> | 2010-12-08 15:38:30 -0300 |
| commit | f62e658c10fc011fba5ce5eede79ac09df6a74e2 (patch) | |
| tree | 1b72acdc1ac3f4638c46f92ecfba58929da681de | |
| parent | db72d691caa0d37409fb684aa5d291ab1977d34b (diff) | |
camerabin2: Only run tests if experimental is enabled
Only run camerabin2 tests and build examples if experimental
plugins are enabled
| -rw-r--r-- | tests/check/Makefile.am | 12 | ||||
| -rw-r--r-- | tests/examples/Makefile.am | 8 |
2 files changed, 15 insertions, 5 deletions
diff --git a/tests/check/Makefile.am b/tests/check/Makefile.am index e045129cb..d98aaecbc 100644 --- a/tests/check/Makefile.am +++ b/tests/check/Makefile.am @@ -127,6 +127,12 @@ VALGRIND_TO_FIX = \ VALGRIND_TESTS_DISABLE = \ $(VALGRIND_TO_FIX) +if BUILD_EXPERIMENTAL +EXPERIMENTAL_CHECKS=elements/camerabin2 \ + elements/imagecapturebin \ + elements/videorecordingbin +endif + # these tests don't even pass # neon: too flaky (almost always fails 'the first time') noinst_PROGRAMS = \ @@ -148,10 +154,8 @@ check_PROGRAMS = \ elements/autoconvert \ elements/asfmux \ elements/camerabin \ - elements/camerabin2 \ elements/dataurisrc \ elements/flacparse \ - elements/imagecapturebin \ elements/legacyresample \ $(check_jifmux) \ elements/jpegparse \ @@ -166,11 +170,11 @@ check_PROGRAMS = \ elements/rtpmux \ $(check_schro) \ elements/valve \ - elements/videorecordingbin \ $(check_vp8) \ $(check_zbar) \ $(check_orc) \ - pipelines/tagschecking + pipelines/tagschecking \ + $(EXPERIMENTAL_CHECKS) noinst_HEADERS = elements/mxfdemux.h diff --git a/tests/examples/Makefile.am b/tests/examples/Makefile.am index 218f2c622..dbd11934c 100644 --- a/tests/examples/Makefile.am +++ b/tests/examples/Makefile.am @@ -15,5 +15,11 @@ else DIRECTFB_DIR= endif +if BUILD_EXPERIMENTAL +CAMERABIN2=camerabin2 +else +CAMERABIN2= +endif + SUBDIRS= $(DIRECTFB_DIR) $(GTK_EXAMPLES) $(JACK_EXAMPLES) switch -DIST_SUBDIRS= camerabin camerabin2 directfb jack mxf scaletempo switch +DIST_SUBDIRS= camerabin $(CAMERABIN2) directfb jack mxf scaletempo switch |