On Mon, Mar 10, 2014 at 11:12:28PM -0700, Steve Beattie wrote: > I've not reviewed this yet, but make check fails without the following > additional patch chunk to the Makefile, due to common_optarg.c referring > to display_version() in parser_main.c, which is already filtered out of > the unit tests -- this is okay since there are currently no unit tests > that refer to anything in the newly created common_optarg.c (and it has > no unit tests itself). > > On Fri, Mar 07, 2014 at 09:31:42AM -0800, [email protected] wrote: > > --- 2.9-test.orig/parser/Makefile > > +++ 2.9-test/parser/Makefile > > @@ -80,9 +80,9 @@ > > parser_main.c parser_misc.c parser_merge.c parser_symtab.c \ > > parser_yacc.c parser_regex.c parser_variable.c parser_policy.c \ > > parser_alias.c mount.c dbus.c lib.c profile.cc rule.c signal.c \ > > - ptrace.c > > + ptrace.c common_optarg.c > > HDRS = parser.h parser_include.h immunix.h mount.h dbus.h lib.h profile.h \ > > - rule.h signal.h ptrace.h > > + rule.h signal.h ptrace.h common_optarg.h > > TOOLS = apparmor_parser > > > > OBJECTS = $(SRCS:.c=.o) > > @@ -118,6 +118,7 @@ TEST_CFLAGS = $(EXTRA_CFLAGS) -DUNIT_TES > TEST_OBJECTS = $(filter-out \ > parser_lex.o \ > parser_yacc.o \ > + common_optarg.o \ > parser_main.o, ${OBJECTS}) \ > $(AAREOBJECTS) > TEST_LDFLAGS = $(AARE_LDFLAGS)
Tested and confirmed that compilation succeeds with this snippet! Thanks! Acked-by: Seth Arnold <[email protected]> > > > @@ -235,6 +235,9 @@ > > mount.o: mount.c mount.h parser.h immunix.h rule.h > > $(CXX) $(EXTRA_CFLAGS) -c -o $@ $< > > > > +common_optarg.o: common_optarg.c common_optarg.h parser.h > > libapparmor_re/apparmor_re.h > > + $(CXX) $(EXTRA_CFLAGS) -c -o $@ $< > > + > > lib.o: lib.c lib.h parser.h > > $(CXX) $(EXTRA_CFLAGS) -c -o $@ $< > > >
signature.asc
Description: Digital signature
-- AppArmor mailing list [email protected] Modify settings or unsubscribe at: https://lists.ubuntu.com/mailman/listinfo/apparmor
