From: Philip Withnall <withnall@endlessm.com>
Date: Tue, 20 Jun 2017 16:38:15 +0000 (+0100)
Subject: build: Add ‘devel’ or ‘release’ to OSTREE_FEATURES for test-symbols.sh
X-Git-Tag: archive/raspbian/2022.1-3+rpi1~1^2~4^2~35^2~78
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=fd50c9732231895b18cd8158726e7f77bc8dcae6;p=ostree.git

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
---

diff --git a/configure.ac b/configure.ac
index c10d2100..9973c80a 100644
--- 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 3f627304..4a11183e 100755
--- 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=