summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorEdward Hervey <bilboed@bilboed.com>2018-02-22 09:23:50 +0100
committerEdward Hervey <bilboed@bilboed.com>2018-02-22 09:23:50 +0100
commitf816f3f71f513b5cf36a5fb970e9e718f2dd71f5 (patch)
tree6bcedf5a8980e9998487253d00a8ffdc90070996
parent589c38b334a7e5ac960e24072e57ec75fcae3752 (diff)
ci-build: Build and check gst-python
-rwxr-xr-xci-build.sh16
1 files changed, 9 insertions, 7 deletions
diff --git a/ci-build.sh b/ci-build.sh
index 6395ae7..2fe8e36 100755
--- a/ci-build.sh
+++ b/ci-build.sh
@@ -60,19 +60,18 @@ case "$FLAVOR" in
validate)
MODULES="gst-plugins-good gst-plugins-ugly gst-libav gst-plugins-bad gst-rtsp-server";;
*)
- MODULES="gst-plugins-good gst-plugins-ugly gst-libav gst-plugins-bad gst-rtsp-server gst-editing-services";;
+ MODULES="gst-plugins-good gst-plugins-ugly gst-libav gst-plugins-bad gst-rtsp-server gst-editing-services gst-python";;
esac
-EXTRA_MODULES="gst-python"
# modules for which we run make check/distcheck
case "$FLAVOR" in
full)
# FIXME : distcheck fails for gst-libav
- CHECK_MODULES="orc gstreamer gst-plugins-base gst-plugins-good gst-plugins-ugly gst-plugins-bad gst-rtsp-server gst-editing-services";;
+ CHECK_MODULES="orc gstreamer gst-plugins-base gst-plugins-good gst-plugins-ugly gst-plugins-bad gst-rtsp-server gst-editing-services gst-python";;
validate)
CHECK_MODULES="";;
*)
- CHECK_MODULES="orc gstreamer gst-plugins-base gst-plugins-good gst-plugins-ugly gst-plugins-bad gst-libav gst-rtsp-server gst-editing-services";;
+ CHECK_MODULES="orc gstreamer gst-plugins-base gst-plugins-good gst-plugins-ugly gst-plugins-bad gst-libav gst-rtsp-server gst-editing-services gst-python";;
esac
# FIXME : Gradually add more modules
@@ -241,7 +240,7 @@ build()
validate)
echo "+ $1 : Skipping build-checks";;
*)
- if test $1 != "orc" -a $1 != "gst-devtools/validate"
+ if test $1 != "orc" -a $1 != "gst-devtools/validate" -a $1 != "gst-python"
then
echo "+ $1 : make build-checks"
logname=$LOGDIR/$1-build-checks.log
@@ -306,8 +305,11 @@ make_check()
then
echo "+ $1 : MAKE CHECK FAILURE"
cat $logname
- # We don't want to error out
- # exit $ERROR_RETURN
+ # We don't want to error out except for gst-python
+ if test $1 == "gst-python"
+ then
+ exit $ERROR_RETURN
+ fi
fi
fi
}