[apparmor] [patch] modify regression tests to use USE_SYSTEM to select parser

[Steve Beattie]

On Mon, Mar 03, 2014 at 03:32:20PM -0800, Seth Arnold wrote:
> On Mon, Mar 03, 2014 at 12:27:20PM -0800, Seth Arnold wrote:
> > > cp not mv, I'd like this to be able to be used make than once
> 
> Here's a corrected version; this also includes a typo fix for a typo
> introduced in rev 2405.

Oh argh, that (the typo) shouldn't have leaked in at all. I was trying to play
around with making the uservars.inc targets occur inside the existing
USE_SYSTEM #ifdef, and these were test targets. It should just be backed
out, like so:

=== modified file 'tests/regression/apparmor/Makefile'
--- tests/regression/apparmor/Makefile	2014-03-01 23:46:42 +0000
+++ tests/regression/apparmor/Makefile	2014-03-03 23:53:16 +0000
@@ -20,9 +20,6 @@
   endif # LIBAPPARMOR not set
   LDLIBS += $(LIBAPPARMOR)
 
-uservars.out: uservars.inc
-	cat uservars.inc > uservars.out
-
 else # !USE_SYSTEM
   # use in-tree versions
   LIBAPPARMOR_SRC := ../../../libraries/libapparmor/
@@ -37,9 +34,6 @@
 
   CFLAGS += -L$(LIBAPPARMOR_PATH) -I$(LIBAPPARMOR_INCLUDE)
   LDLIBS += -Wl,-Bstatic -lapparmor -Wl,-Bdynamic -lpthread
-
-uservars.out:
-	echo uservars.inc > uservars.out
 endif # USE_SYSTEM
 
 CFLAGS += -Wall -Wstrict-prototypes

Sorry about that.

-- 
Steve Beattie
<sbeattie at ubuntu.com>
http://NxNW.org/~steve/
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 819 bytes
Desc: Digital signature
URL: <https://lists.ubuntu.com/archives/apparmor/attachments/20140303/9e0be935/attachment.pgp>