[apparmor] [PATCH] generated test cleanups

Kees Cook kees at ubuntu.com
Mon May 2 20:03:29 UTC 2011


Description: Improve generate test readability and build-time cleanup.
Author: Kees Cook <kees at debian.org>

Index: apparmor-debian/parser/tst/Makefile
===================================================================
--- apparmor-debian.orig/parser/tst/Makefile	2011-05-01 19:21:58.040888986 -0700
+++ apparmor-debian/parser/tst/Makefile	2011-05-01 19:22:20.471201158 -0700
@@ -39,6 +39,7 @@
 	make -C $(PARSER_DIR) $(PARSER_BIN)
 
 clean:
-	rm -f simple_tests/generated_x/*
-	rm -f simple_tests/generated_perms_leading/*
-	rm -f simple_tests/generated_perms_safe/*
+	find simple_tests/generated_x/ \
+	     simple_tests/generated_perms_leading/ \
+	     simple_tests/generated_perms_safe/ \
+		-type f | xargs rm -f
Index: apparmor-debian/parser/tst/gen-xtrans.pl
===================================================================
--- apparmor-debian.orig/parser/tst/gen-xtrans.pl	2011-05-01 19:22:17.091154117 -0700
+++ apparmor-debian/parser/tst/gen-xtrans.pl	2011-05-01 19:22:20.491201437 -0700
@@ -118,7 +118,7 @@
     print $file "/usr/bin/foo {\n";
     print_rule($file, $leading1, $qual1, $rule1, $perm1, $target1);
     print_rule($file, $leading2, $qual2, $rule2, $perm2, $target2);
-    print $file "}";
+    print $file "}\n";
     close($file);
 
     $count++;

-- 
Kees Cook
Ubuntu Security Team



More information about the AppArmor mailing list