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

Makefile-tests.am: make check uses the built binaries 

The tests suite was failing locally as it was using the installed
version of rofiles-fuse, instead of the built one.  Create the needed
symlinks in tests/ as we are already doing for the "ostree" binary.

ostree-prepare-root and ostree-remount added for completeness.

Signed-off-by: Giuseppe Scrivano <gscrivan@redhat.com>

Closes: #395
Approved by: cgwalters
This commit is contained in:
Giuseppe Scrivano 2016-07-14 13:42:32 +02:00 committed by Atomic Bot
parent efa1fa6534
commit 307f4b2957
1 changed files with 13 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
Makefile-tests.am
View File

@ -33,7 +33,8 @@ TESTS_ENVIRONMENT += OT_TESTS_DEBUG=1 \
PATH=$$(cd $(top_builddir)/tests && pwd):$${PATH} \ PATH=$$(cd $(top_builddir)/tests && pwd):$${PATH} \
$(NULL) $(NULL)
uninstalled_test_data = tests/ostree-symlink-stamp uninstalled_test_data = tests/ostree-symlink-stamp tests/ostree-prepare-root-symlink-stamp \
tests/ostree-remount-symlink-stamp tests/rofiles-fuse-symlink-stamp
dist_uninstalled_test_scripts = tests/test-symbols.sh dist_uninstalled_test_scripts = tests/test-symbols.sh
@ -238,12 +239,19 @@ EXTRA_DIST += \
tests/libreaddir-rand.so: Makefile tests/libreaddir-rand.so: Makefile
$(AM_V_GEN) ln -fns ../.libs/libreaddir-rand.so tests $(AM_V_GEN) ln -fns ../.libs/libreaddir-rand.so tests
ALL_LOCAL_RULES += tests/libreaddir-rand.so ALL_LOCAL_RULES += tests/libreaddir-rand.so
CLEANFILES += tests/libreaddir-rand.so tests/ostree-symlink-stamp tests/ostree CLEANFILES += tests/libreaddir-rand.so tests/ostree-symlink-stamp \
tests/ostree-prepare-root-symlink-stamp tests/ostree-remount-symlink-stamp \
tests/rofiles-fuse-symlink-stamp tests/ostree
tests/ostree-symlink-stamp: Makefile tests/%-symlink-stamp: Makefile
@set -e; \ @set -e; \
real_bin=`cd $(top_builddir) && ./libtool --mode=execute echo ostree`; \ lt_bin=`cd $(top_builddir) && ./libtool --mode=execute echo $*`; \
ln -sf "$${real_bin}" tests/ostree; \ if test "$${lt_bin}" = "$*"; then \
real_bin=$(abs_top_builddir)/$*; \
else \
real_bin="$${lt_bin}"; \
fi; \
ln -sf "$${real_bin}" tests/$*; \
touch $@ touch $@
# Unfortunately the glib test data APIs don't actually handle # Unfortunately the glib test data APIs don't actually handle