[ostree: 32/70] test-abi: use G_TEST_SRCDIR, G_TEST_BUILDDIR
- From: Colin Walters <walters src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [ostree: 32/70] test-abi: use G_TEST_SRCDIR, G_TEST_BUILDDIR
- Date: Fri, 15 Apr 2016 21:03:56 +0000 (UTC)
commit 839628b3fa9e7d6bec0955b973e519a8988e264c
Author: Simon McVittie <smcv debian org>
Date: Thu Mar 31 18:30:52 2016 +0100
test-abi: use G_TEST_SRCDIR, G_TEST_BUILDDIR
There's no need to invent new variables for these.
Signed-off-by: Simon McVittie <smcv debian org>
Closes: #234
Approved by: cgwalters
Makefile-tests.am | 2 --
tests/test-abi.sh | 4 ++--
2 files changed, 2 insertions(+), 4 deletions(-)
---
diff --git a/Makefile-tests.am b/Makefile-tests.am
index 6016d03..1bc1bc9 100644
--- a/Makefile-tests.am
+++ b/Makefile-tests.am
@@ -23,8 +23,6 @@ include $(top_srcdir)/buildutil/glib-tap.mk
# include the builddir in $PATH so we find our just-built ostree
# binary.
TESTS_ENVIRONMENT += OT_TESTS_DEBUG=1 \
- SRCDIR=$$(cd $(top_srcdir) && pwd) \
- BUILDDIR=$$(cd $(top_builddir) && pwd) \
GI_TYPELIB_PATH=$$(cd $(top_builddir) && pwd) \
LD_LIBRARY_PATH=$$(cd $(top_builddir)/.libs && pwd) \
PATH=$$(cd $(top_builddir) && pwd):$${PATH} \
diff --git a/tests/test-abi.sh b/tests/test-abi.sh
index a49f8d4..62af365 100755
--- a/tests/test-abi.sh
+++ b/tests/test-abi.sh
@@ -21,8 +21,8 @@ set -euo pipefail
echo '1..1'
-grep ' ostree_[A-Za-z0-9_]*;' ${SRCDIR}/src/libostree/libostree.sym | sed -e 's,^ *\([A-Za-z0-9_]*\);,\1,' |
sort -u > expected-symbols.txt
-eu-readelf -a ${BUILDDIR}/.libs/libostree-1.so | grep 'FUNC.*GLOBAL.*DEFAULT.*@@LIBOSTREE_' | sed -e 's,^.*
\(ostree_[A-Za-z0-9_]*\)@@LIBOSTREE_[0-9_.]*,\1,' |sort -u > found-symbols.txt
+grep ' ostree_[A-Za-z0-9_]*;' ${G_TEST_SRCDIR}/src/libostree/libostree.sym | sed -e 's,^
*\([A-Za-z0-9_]*\);,\1,' | sort -u > expected-symbols.txt
+eu-readelf -a ${G_TEST_BUILDDIR}/.libs/libostree-1.so | grep 'FUNC.*GLOBAL.*DEFAULT.*@@LIBOSTREE_' | sed -e
's,^.* \(ostree_[A-Za-z0-9_]*\)@@LIBOSTREE_[0-9_.]*,\1,' |sort -u > found-symbols.txt
diff -u expected-symbols.txt found-symbols.txt
echo 'ok'
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]