[apparmor] [patch 05/10] libapparmor - c tests, only print epoch and audit subid if identified

[Tyler Hicks]

On 2013-09-05 01:37:00, Steve Beattie wrote:
> The test program didn't make use of the existing print_long() macro for
> printing long values, which meant that they were always emitted for
> every testcase. This patch makes them consistent with all the other
> emitted fields and fixes up the expected output where they shouldn't be
> emitted.
> 
> Signed-off-by: Steve Beattie <steve at nxnw.org>

Acked-by: Tyler Hicks <tyhicks at canonical.com>

> ---
>  libraries/libapparmor/testsuite/test_multi.c                              |    4 ++--
>  libraries/libapparmor/testsuite/test_multi/avc_audit_invalid_audit_id.out |    2 --
>  libraries/libapparmor/testsuite/test_multi/syslog_other_01.out            |    2 --
>  libraries/libapparmor/testsuite/test_multi/syslog_other_02.out            |    2 --
>  libraries/libapparmor/testsuite/test_multi/syslog_other_03.out            |    2 --
>  libraries/libapparmor/testsuite/test_multi/syslog_other_04.out            |    2 --
>  libraries/libapparmor/testsuite/test_multi/testcase_dbus_01.out           |    2 --
>  libraries/libapparmor/testsuite/test_multi/testcase_dbus_02.out           |    2 --
>  libraries/libapparmor/testsuite/test_multi/testcase_dbus_03.out           |    2 --
>  9 files changed, 2 insertions(+), 18 deletions(-)
> 
> Index: b/libraries/libapparmor/testsuite/test_multi.c
> ===================================================================
> --- a/libraries/libapparmor/testsuite/test_multi.c
> +++ b/libraries/libapparmor/testsuite/test_multi.c
> @@ -218,7 +218,7 @@ int print_results(aa_log_record *record)
>  		print_string("DBus interface", record->dbus_interface);
>  		print_string("DBus member", record->dbus_member);
>  
> -		printf("Epoch: %lu\n", record->epoch);
> -		printf("Audit subid: %u\n", record->audit_sub_id);
> +		print_long("Epoch", record->epoch, 0);
> +		print_long("Audit subid", (long) record->audit_sub_id, 0);
>  	return(0);
>  }
> Index: b/libraries/libapparmor/testsuite/test_multi/avc_audit_invalid_audit_id.out
> ===================================================================
> --- a/libraries/libapparmor/testsuite/test_multi/avc_audit_invalid_audit_id.out
> +++ b/libraries/libapparmor/testsuite/test_multi/avc_audit_invalid_audit_id.out
> @@ -1,5 +1,3 @@
>  START
>  File: test_multi/avc_audit_invalid_audit_id.in
>  Event type: AA_RECORD_INVALID
> -Epoch: 0
> -Audit subid: 0
> Index: b/libraries/libapparmor/testsuite/test_multi/testcase_dbus_01.out
> ===================================================================
> --- a/libraries/libapparmor/testsuite/test_multi/testcase_dbus_01.out
> +++ b/libraries/libapparmor/testsuite/test_multi/testcase_dbus_01.out
> @@ -11,5 +11,3 @@ DBus bus: session
>  DBus path: /org/freedesktop/DBus
>  DBus interface: org.freedesktop.DBus
>  DBus member: Hello
> -Epoch: 0
> -Audit subid: 0
> Index: b/libraries/libapparmor/testsuite/test_multi/testcase_dbus_03.out
> ===================================================================
> --- a/libraries/libapparmor/testsuite/test_multi/testcase_dbus_03.out
> +++ b/libraries/libapparmor/testsuite/test_multi/testcase_dbus_03.out
> @@ -12,5 +12,3 @@ DBus bus: session
>  DBus path: /com/apparmor/Test
>  DBus interface: com.apparmor.Test
>  DBus member: Signal
> -Epoch: 0
> -Audit subid: 0
> Index: b/libraries/libapparmor/testsuite/test_multi/syslog_other_01.out
> ===================================================================
> --- a/libraries/libapparmor/testsuite/test_multi/syslog_other_01.out
> +++ b/libraries/libapparmor/testsuite/test_multi/syslog_other_01.out
> @@ -1,5 +1,3 @@
>  START
>  File: test_multi/syslog_other_01.in
>  Event type: AA_RECORD_INVALID
> -Epoch: 0
> -Audit subid: 0
> Index: b/libraries/libapparmor/testsuite/test_multi/syslog_other_02.out
> ===================================================================
> --- a/libraries/libapparmor/testsuite/test_multi/syslog_other_02.out
> +++ b/libraries/libapparmor/testsuite/test_multi/syslog_other_02.out
> @@ -1,5 +1,3 @@
>  START
>  File: test_multi/syslog_other_02.in
>  Event type: AA_RECORD_INVALID
> -Epoch: 0
> -Audit subid: 0
> Index: b/libraries/libapparmor/testsuite/test_multi/syslog_other_03.out
> ===================================================================
> --- a/libraries/libapparmor/testsuite/test_multi/syslog_other_03.out
> +++ b/libraries/libapparmor/testsuite/test_multi/syslog_other_03.out
> @@ -1,5 +1,3 @@
>  START
>  File: test_multi/syslog_other_03.in
>  Event type: AA_RECORD_INVALID
> -Epoch: 0
> -Audit subid: 0
> Index: b/libraries/libapparmor/testsuite/test_multi/syslog_other_04.out
> ===================================================================
> --- a/libraries/libapparmor/testsuite/test_multi/syslog_other_04.out
> +++ b/libraries/libapparmor/testsuite/test_multi/syslog_other_04.out
> @@ -1,5 +1,3 @@
>  START
>  File: test_multi/syslog_other_04.in
>  Event type: AA_RECORD_INVALID
> -Epoch: 0
> -Audit subid: 0
> Index: b/libraries/libapparmor/testsuite/test_multi/testcase_dbus_02.out
> ===================================================================
> --- a/libraries/libapparmor/testsuite/test_multi/testcase_dbus_02.out
> +++ b/libraries/libapparmor/testsuite/test_multi/testcase_dbus_02.out
> @@ -7,5 +7,3 @@ Profile: /tmp/apparmor-2.8.0/tests/regre
>  Name: com.apparmor.Test
>  PID: 2940
>  DBus bus: session
> -Epoch: 0
> -Audit subid: 0
> 
> 
> -- 
> AppArmor mailing list
> AppArmor at lists.ubuntu.com
> Modify settings or unsubscribe at: https://lists.ubuntu.com/mailman/listinfo/apparmor
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 836 bytes
Desc: Digital signature
URL: <https://lists.ubuntu.com/archives/apparmor/attachments/20130906/882a1092/attachment-0001.pgp>