summaryrefslogtreecommitdiffstats
path: root/test
diff options
context:
space:
mode:
authorJeremy Kerr <jk@ozlabs.org>2014-08-04 09:46:00 +0800
committerJeremy Kerr <jk@ozlabs.org>2014-08-05 10:31:28 +0800
commit76591d5e727b35295ea238322f73515c8cc93945 (patch)
treecf443f56765a5e74e3f34a87229d9649a05bc38e /test
parentd1f814a1e310b5c1e6b32d5bdbf7b7450c221325 (diff)
downloadtalos-petitboot-76591d5e727b35295ea238322f73515c8cc93945.zip
talos-petitboot-76591d5e727b35295ea238322f73515c8cc93945.tar.gz
discover/grub2: distinguish parser.h from grub2/parser.h
'make distcheck' will do a 'make all' srcdir == objdir, then later a 'make check' sith srcdir != objdir. Since gcc's cpp always assumes that a source file's directory is first in the include paths, we may see discover/parser.h included when we wanted the generated discover/grub2/parser.h. This change renames the grub2 lexer and parser files, to work-around this behaviour, and fix 'make distcheck'. Signed-off-by: Jeremy Kerr <jk@ozlabs.org>
Diffstat (limited to 'test')
-rw-r--r--test/parser/Makefile.am1
1 files changed, 1 insertions, 0 deletions
diff --git a/test/parser/Makefile.am b/test/parser/Makefile.am
index 7541149..95ee002 100644
--- a/test/parser/Makefile.am
+++ b/test/parser/Makefile.am
@@ -106,6 +106,7 @@ test_parser_libtest_ro_CPPFLAGS = \
$(AM_CPPFLAGS) \
-I$(top_srcdir)/discover \
-I$(top_srcdir)/discover/grub2 \
+ -I$(top_builddir)/discover/grub2 \
-DPETITBOOT_TEST \
-DLOCAL_STATE_DIR='"$(localstatedir)"' \
-DTEST_CONF_BASE='"$(top_srcdir)/test/parser/data"'
OpenPOWER on IntegriCloud