Re: [PATCH weston] ivi: Use build dir instead of libexec dir in generated test ini file

2015-06-18 Thread Pekka Paalanen
On Tue, 16 Jun 2015 13:30:35 -0500
Derek Foreman der...@osg.samsung.com wrote:

 We don't want to use installed binaries when running tests.
 
 Signed-off-by: Derek Foreman der...@osg.samsung.com
 ---
  Makefile.am | 2 +-
  1 file changed, 1 insertion(+), 1 deletion(-)
 
 diff --git a/Makefile.am b/Makefile.am
 index 261798c..a75f6c5 100644
 --- a/Makefile.am
 +++ b/Makefile.am
 @@ -33,7 +33,7 @@ tests/weston-ivi.ini : $(srcdir)/ivi-shell/weston.ini.in
   -e 's|@bindir[@]|$(bindir)|g' \
   -e 's|@abs_top_builddir[@]|$(abs_top_builddir)|g' \
   -e 's|@abs_top_srcdir[@]|$(abs_top_srcdir)|g' \
 - -e 's|@libexecdir[@]|$(libexecdir)|g' \
 + -e 's|@libexecdir[@]|$(abs_builddir)|g' \
   -e 's|@plugin_prefix[@]|$(abs_top_builddir)/.libs/|g' \
   $  $@
  

R-b me.
Pushed:
   665b025..bbdd9bc  master - master


Thanks,
pq
___
wayland-devel mailing list
wayland-devel@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/wayland-devel


[PATCH weston] ivi: Use build dir instead of libexec dir in generated test ini file

2015-06-16 Thread Derek Foreman
We don't want to use installed binaries when running tests.

Signed-off-by: Derek Foreman der...@osg.samsung.com
---
 Makefile.am | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Makefile.am b/Makefile.am
index 261798c..a75f6c5 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -33,7 +33,7 @@ tests/weston-ivi.ini : $(srcdir)/ivi-shell/weston.ini.in
-e 's|@bindir[@]|$(bindir)|g' \
-e 's|@abs_top_builddir[@]|$(abs_top_builddir)|g' \
-e 's|@abs_top_srcdir[@]|$(abs_top_srcdir)|g' \
-   -e 's|@libexecdir[@]|$(libexecdir)|g' \
+   -e 's|@libexecdir[@]|$(abs_builddir)|g' \
-e 's|@plugin_prefix[@]|$(abs_top_builddir)/.libs/|g' \
$  $@
 
-- 
2.1.4

___
wayland-devel mailing list
wayland-devel@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/wayland-devel