diff options
| author | Stefan Kost <ensonic@users.sf.net> | 2010-09-06 14:32:00 +0300 |
|---|---|---|
| committer | Stefan Kost <ensonic@users.sf.net> | 2010-09-06 14:35:26 +0300 |
| commit | 56a6094b7587b80f790e589aad110596b8573990 (patch) | |
| tree | dfeb423e0980bf367861c7e943b7490cfdf1b8fe | |
| parent | c5888dc6cf686bd150bd3b835a7abb256b371147 (diff) | |
tests: tune skipping checks if we have disabled subsystems
Skip ABI tests if some subsystems are off. Remove DISABLE_GST_DEBUG from
skipping export checks as this is safe now.
| -rw-r--r-- | Makefile.am | 2 | ||||
| -rw-r--r-- | tests/check/Makefile.am | 13 |
2 files changed, 12 insertions, 3 deletions
diff --git a/Makefile.am b/Makefile.am index 6f20a2400..e82c7e214 100644 --- a/Makefile.am +++ b/Makefile.am @@ -142,7 +142,6 @@ include $(top_srcdir)/common/coverage/lcov.mak # Do not run the check-exports test in case any option which causes the API to # change has been used -if !GST_DISABLE_GST_DEBUG if !GST_DISABLE_LOADSAVE if !GST_DISABLE_REGISTRY if !GST_DISABLE_TRACE @@ -150,7 +149,6 @@ CHECK_EXPORTS = check-exports endif endif endif -endif check: $(CHECK_EXPORTS) check-enum-gettypes diff --git a/tests/check/Makefile.am b/tests/check/Makefile.am index db23384ca..535a2e5ab 100644 --- a/tests/check/Makefile.am +++ b/tests/check/Makefile.am @@ -33,6 +33,17 @@ else PARSE_CHECKS = pipelines/simple-launch-lines pipelines/cleanup pipelines/parse-launch endif +# Do not run the abi test in case any option which causes the API to change has +# been used +if !GST_DISABLE_LOADSAVE +if !GST_DISABLE_REGISTRY +if !GST_DISABLE_TRACE +ABI_CHECKS = gst/gstabi +endif +endif +endif + + # if it's calling gst_element_factory_make(), it will probably not work without # a registry if GST_DISABLE_REGISTRY @@ -73,7 +84,7 @@ REGISTRY_CHECKS = \ endif check_PROGRAMS = \ - gst/gstabi \ + $(ABI_CHECKS) \ gst/gstbuffer \ gst/gstbufferlist \ gst/gstbus \ |