packaging
/
ostree
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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
This commit is contained in:
Philip Withnall 2017-06-20 17:38:15 +01:00 committed by Atomic Bot
parent 82410f0e59
commit fd50c97322
2 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
configure.ac
View File

@ -464,6 +464,7 @@ AM_COND_IF([BUILDOPT_IS_DEVEL_BUILD],
AC_DEFINE([BUILDOPT_IS_DEVEL_BUILD], [1], [Define if doing a development build]) AC_DEFINE([BUILDOPT_IS_DEVEL_BUILD], [1], [Define if doing a development build])
release_build_type=devel, release_build_type=devel,
release_build_type=release) release_build_type=release)
OSTREE_FEATURES="$OSTREE_FEATURES $release_build_type"
AC_CONFIG_FILES([ AC_CONFIG_FILES([
Makefile Makefile

2
tests/test-symbols.sh
View File

@ -22,7 +22,7 @@ set -xeuo pipefail
echo '1..3' echo '1..3'
released_syms=${G_TEST_SRCDIR}/src/libostree/libostree-released.sym 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 devel_syms=${G_TEST_SRCDIR}/src/libostree/libostree-devel.sym
else else
devel_syms= devel_syms=