build: Add ‘devel’ or ‘release’ to OSTREE_FEATURES for test-symbols.sh

test-symbols.sh was looking for the DevelBuild string, which is actually
part of the output from `ostree --version`, not $OSTREE_FEATURES.

Signed-off-by: Philip Withnall <withnall@endlessm.com>
Closes: #948
Approved by: cgwalters

Origin: upstream, 2017.8, commit:fd50c9732231895b18cd8158726e7f77bc8dcae6

Gbp-Pq: Name build-Add-devel-or-release-to-OSTREE_FEATURES-for-test-sy.patch

diff --git a/configure.ac b/configure.ac
index 58795a7809ac2ef92ffb70ea7b327b3e7399a6d6..65a354cc6bf476210e9a56794f61e5e0105f2ffe 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -464,6 +464,7 @@ AM_COND_IF([BUILDOPT_IS_DEVEL_BUILD],
             AC_DEFINE([BUILDOPT_IS_DEVEL_BUILD], [1], [Define if doing a development build])
             release_build_type=devel,
             release_build_type=release)
+OSTREE_FEATURES="$OSTREE_FEATURES $release_build_type"
 
 AC_CONFIG_FILES([
 Makefile

diff --git a/tests/test-symbols.sh b/tests/test-symbols.sh
index 3f6273042b32c97041476b375e767b138897f0c7..4a11183e2f1b76189ff419320515c56f954ce846 100755 (executable)
--- a/tests/test-symbols.sh
+++ b/tests/test-symbols.sh
@@ -22,7 +22,7 @@ set -xeuo pipefail
 echo '1..3'
 
 released_syms=${G_TEST_SRCDIR}/src/libostree/libostree-released.sym
-if echo "$OSTREE_FEATURES" | grep --quiet --no-messages "DevelBuild"; then
+if echo "$OSTREE_FEATURES" | grep --quiet --no-messages "devel"; then
     devel_syms=${G_TEST_SRCDIR}/src/libostree/libostree-devel.sym
 else
     devel_syms=