Libguestfs - Feb 2017 - [nbdkit PATCH] tests: Test in-tree rather than installed header

The previous commit broke the build during 'make check'; we want
to test the in-tree header, not some (potentially stale or missing)
installed header.

Signed-off-by: Eric Blake <eblake at redhat.com>
---
 tests/Makefile.am | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tests/Makefile.am b/tests/Makefile.am
index c2d473a..9076d6b 100644
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -103,7 +103,7 @@ check_PROGRAMS += \

 test_cxx_SOURCES = test-cxx.cpp
 test_cxx_CXXFLAGS = \
-        $(WARNINGS_CFLAGS)
+	-I ../include $(WARNINGS_CFLAGS)
 endif

 # In-depth tests need libguestfs, since that is a convenient way to
-- 
2.9.3

On Wed, Feb 01, 2017 at 09:49:46AM -0600, Eric Blake
wrote:
> The previous commit broke the build during 'make check'; we want
> to test the in-tree header, not some (potentially stale or missing)
> installed header.
> 
> Signed-off-by: Eric Blake <eblake at redhat.com>
> ---
>  tests/Makefile.am | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
> 
> diff --git a/tests/Makefile.am b/tests/Makefile.am
> index c2d473a..9076d6b 100644
> --- a/tests/Makefile.am
> +++ b/tests/Makefile.am
> @@ -103,7 +103,7 @@ check_PROGRAMS += \
> 
>  test_cxx_SOURCES = test-cxx.cpp
>  test_cxx_CXXFLAGS = \
> -        $(WARNINGS_CFLAGS)
> +	-I ../include $(WARNINGS_CFLAGS)
>  endif
> 
>  # In-depth tests need libguestfs, since that is a convenient way to
The "quick fix" I sent was broken in a number of ways.  I've
posted
what is hopefully a fix on the list:

https://www.redhat.com/archives/libguestfs/2017-February/msg00004.html

Unfortunately it's not very simple.

Rich.

-- 
Richard Jones, Virtualization Group, Red Hat http://people.redhat.com/~rjones
Read my programming and virtualization blog: http://rwmj.wordpress.com
virt-builder quickly builds VMs from scratch
http://libguestfs.org/virt-builder.1.html