diff options
| author | Rico Tzschichholz <ricotz@ubuntu.com> | 2017-08-20 13:45:36 +0200 |
|---|---|---|
| committer | Rico Tzschichholz <ricotz@ubuntu.com> | 2017-08-20 13:45:36 +0200 |
| commit | 917d457e7d9d8be7af4160c094b2a26b9987bcff (patch) | |
| tree | 7f97ceba23d48992cf28d98c27a53f0e0beb3199 | |
| parent | b2f72e24a7704ef7f549dd921c51922e1a51a674 (diff) | |
| download | vala-917d457e7d9d8be7af4160c094b2a26b9987bcff.tar.gz | |
valadoc/tests: Add ./vala/.libs rather than ./gee/.libs to LD_LIBRARY_PATH
| -rwxr-xr-x | valadoc/tests/testrunner.sh | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/valadoc/tests/testrunner.sh b/valadoc/tests/testrunner.sh index 59302ffe7..842082d47 100755 --- a/valadoc/tests/testrunner.sh +++ b/valadoc/tests/testrunner.sh @@ -27,10 +27,10 @@ vapidir=$topsrcdir/vapi export G_DEBUG=fatal_warnings export PKG_CONFIG_PATH=$topbuilddir/libvaladoc -export LD_LIBRARY_PATH=$topbuilddir/gee/.libs:$topbuilddir/libvaladoc/.libs +export LD_LIBRARY_PATH=$topbuilddir/vala/.libs:$topbuilddir/libvaladoc/.libs VALAC=$topbuilddir/compiler/valac$EXEEXT -VALAFLAGS="-X -D -X TOP_SRC_DIR=\"$topsrcdir\" --vapidir $vapidir --pkg libgvc --vapidir $topsrcdir/vala --pkg libvala$PACKAGE_SUFFIX --vapidir $topsrcdir/libvaladoc --pkg valadoc$PACKAGE_SUFFIX --disable-warnings --main main --save-temps -X -g -X -O0 -X -pipe -X -lm -X -Werror=return-type -X -Werror=init-self -X -Werror=implicit -X -Werror=sequence-point -X -Werror=return-type -X -Werror=uninitialized -X -Werror=pointer-arith -X -Werror=int-to-pointer-cast -X -Werror=pointer-to-int-cast -X -Wformat -X -Werror=format-security -X -Werror=format-nonliteral -X -Werror=redundant-decls -X -Werror=int-conversion -X -L$topbuilddir/gee/.libs -X -lgee -X -L$topbuilddir/libvaladoc/.libs -X -lvaladoc$PACKAGE_SUFFIX -X -I$topsrcdir/gee -X -I$topsrcdir/libvaladoc $topsrcdir/valadoc/tests/libvaladoc/parser/generic-scanner.vala" +VALAFLAGS="-X -D -X TOP_SRC_DIR=\"$topsrcdir\" --vapidir $vapidir --pkg libgvc --vapidir $topsrcdir/vala --pkg libvala$PACKAGE_SUFFIX --vapidir $topsrcdir/libvaladoc --pkg valadoc$PACKAGE_SUFFIX --disable-warnings --main main --save-temps -X -g -X -O0 -X -pipe -X -lm -X -Werror=return-type -X -Werror=init-self -X -Werror=implicit -X -Werror=sequence-point -X -Werror=return-type -X -Werror=uninitialized -X -Werror=pointer-arith -X -Werror=int-to-pointer-cast -X -Werror=pointer-to-int-cast -X -Wformat -X -Werror=format-security -X -Werror=format-nonliteral -X -Werror=redundant-decls -X -Werror=int-conversion -X -L$topbuilddir/vala/.libs -X -lvala$PACKAGE_SUFFIX -X -L$topbuilddir/libvaladoc/.libs -X -lvaladoc$PACKAGE_SUFFIX -X -I$topsrcdir/gee -X -I$topsrcdir/vala -X -I$topsrcdir/libvaladoc $topsrcdir/valadoc/tests/libvaladoc/parser/generic-scanner.vala" # Incorporate the user's CFLAGS. Matters if the user decided to insert |