diff --git a/libraries/libapparmor/testsuite/test_multi/testcase10.err b/libraries/libapparmor/testsuite/test_multi/old_style_log_01.err similarity index 100% rename from libraries/libapparmor/testsuite/test_multi/testcase10.err rename to libraries/libapparmor/testsuite/test_multi/old_style_log_01.err diff --git a/libraries/libapparmor/testsuite/test_multi/testcase18.in b/libraries/libapparmor/testsuite/test_multi/old_style_log_01.in similarity index 100% rename from libraries/libapparmor/testsuite/test_multi/testcase18.in rename to libraries/libapparmor/testsuite/test_multi/old_style_log_01.in diff --git a/libraries/libapparmor/testsuite/test_multi/testcase18.out b/libraries/libapparmor/testsuite/test_multi/old_style_log_01.out similarity index 85% rename from libraries/libapparmor/testsuite/test_multi/testcase18.out rename to libraries/libapparmor/testsuite/test_multi/old_style_log_01.out index 5772f14be..cf0006b0e 100644 --- a/libraries/libapparmor/testsuite/test_multi/testcase18.out +++ b/libraries/libapparmor/testsuite/test_multi/old_style_log_01.out @@ -1,5 +1,5 @@ START -File: test_multi/testcase18.in +File: test_multi/old_style_log_01.in Event type: AA_RECORD_DENIED Audit ID: 1157215966.604:46 Operation: access diff --git a/libraries/libapparmor/testsuite/test_multi/testcase11.err b/libraries/libapparmor/testsuite/test_multi/old_style_log_02.err similarity index 100% rename from libraries/libapparmor/testsuite/test_multi/testcase11.err rename to libraries/libapparmor/testsuite/test_multi/old_style_log_02.err diff --git a/libraries/libapparmor/testsuite/test_multi/testcase20.in b/libraries/libapparmor/testsuite/test_multi/old_style_log_02.in similarity index 100% rename from libraries/libapparmor/testsuite/test_multi/testcase20.in rename to libraries/libapparmor/testsuite/test_multi/old_style_log_02.in diff --git a/libraries/libapparmor/testsuite/test_multi/testcase20.out b/libraries/libapparmor/testsuite/test_multi/old_style_log_02.out similarity index 85% rename from libraries/libapparmor/testsuite/test_multi/testcase20.out rename to libraries/libapparmor/testsuite/test_multi/old_style_log_02.out index 4bd044c1b..9a2aed1dd 100644 --- a/libraries/libapparmor/testsuite/test_multi/testcase20.out +++ b/libraries/libapparmor/testsuite/test_multi/old_style_log_02.out @@ -1,5 +1,5 @@ START -File: test_multi/testcase20.in +File: test_multi/old_style_log_02.in Event type: AA_RECORD_DENIED Audit ID: 1167188680.127:54 Operation: access diff --git a/libraries/libapparmor/testsuite/test_multi/testcase18.err b/libraries/libapparmor/testsuite/test_multi/old_style_log_03.err similarity index 100% rename from libraries/libapparmor/testsuite/test_multi/testcase18.err rename to libraries/libapparmor/testsuite/test_multi/old_style_log_03.err diff --git a/libraries/libapparmor/testsuite/test_multi/testcase28.in b/libraries/libapparmor/testsuite/test_multi/old_style_log_03.in similarity index 100% rename from libraries/libapparmor/testsuite/test_multi/testcase28.in rename to libraries/libapparmor/testsuite/test_multi/old_style_log_03.in diff --git a/libraries/libapparmor/testsuite/test_multi/testcase28.out b/libraries/libapparmor/testsuite/test_multi/old_style_log_03.out similarity index 89% rename from libraries/libapparmor/testsuite/test_multi/testcase28.out rename to libraries/libapparmor/testsuite/test_multi/old_style_log_03.out index 5249bfe88..c02ad681a 100644 --- a/libraries/libapparmor/testsuite/test_multi/testcase28.out +++ b/libraries/libapparmor/testsuite/test_multi/old_style_log_03.out @@ -1,5 +1,5 @@ START -File: test_multi/testcase28.in +File: test_multi/old_style_log_03.in Event type: AA_RECORD_DENIED Audit ID: 1173790298.651:1662 Operation: syscall diff --git a/libraries/libapparmor/testsuite/test_multi/testcase19.err b/libraries/libapparmor/testsuite/test_multi/old_style_log_04.err similarity index 100% rename from libraries/libapparmor/testsuite/test_multi/testcase19.err rename to libraries/libapparmor/testsuite/test_multi/old_style_log_04.err diff --git a/libraries/libapparmor/testsuite/test_multi/testcase30.in b/libraries/libapparmor/testsuite/test_multi/old_style_log_04.in similarity index 100% rename from libraries/libapparmor/testsuite/test_multi/testcase30.in rename to libraries/libapparmor/testsuite/test_multi/old_style_log_04.in diff --git a/libraries/libapparmor/testsuite/test_multi/testcase30.out b/libraries/libapparmor/testsuite/test_multi/old_style_log_04.out similarity index 90% rename from libraries/libapparmor/testsuite/test_multi/testcase30.out rename to libraries/libapparmor/testsuite/test_multi/old_style_log_04.out index f40fbb749..bad60cb8d 100644 --- a/libraries/libapparmor/testsuite/test_multi/testcase30.out +++ b/libraries/libapparmor/testsuite/test_multi/old_style_log_04.out @@ -1,5 +1,5 @@ START -File: test_multi/testcase30.in +File: test_multi/old_style_log_04.in Event type: AA_RECORD_DENIED Audit ID: 1177962395.525:1837 Mask: l diff --git a/libraries/libapparmor/testsuite/test_multi/testcase2.err b/libraries/libapparmor/testsuite/test_multi/old_style_log_05.err similarity index 100% rename from libraries/libapparmor/testsuite/test_multi/testcase2.err rename to libraries/libapparmor/testsuite/test_multi/old_style_log_05.err diff --git a/libraries/libapparmor/testsuite/test_multi/testcase4.in b/libraries/libapparmor/testsuite/test_multi/old_style_log_05.in similarity index 100% rename from libraries/libapparmor/testsuite/test_multi/testcase4.in rename to libraries/libapparmor/testsuite/test_multi/old_style_log_05.in diff --git a/libraries/libapparmor/testsuite/test_multi/testcase4.out b/libraries/libapparmor/testsuite/test_multi/old_style_log_05.out similarity index 85% rename from libraries/libapparmor/testsuite/test_multi/testcase4.out rename to libraries/libapparmor/testsuite/test_multi/old_style_log_05.out index 945199e4e..f30447bbb 100644 --- a/libraries/libapparmor/testsuite/test_multi/testcase4.out +++ b/libraries/libapparmor/testsuite/test_multi/old_style_log_05.out @@ -1,5 +1,5 @@ START -File: test_multi/testcase4.in +File: test_multi/old_style_log_05.in Event type: AA_RECORD_DENIED Audit ID: 1167188680.127:54 Operation: access diff --git a/libraries/libapparmor/testsuite/test_multi/testcase20.err b/libraries/libapparmor/testsuite/test_multi/old_style_log_06.err similarity index 100% rename from libraries/libapparmor/testsuite/test_multi/testcase20.err rename to libraries/libapparmor/testsuite/test_multi/old_style_log_06.err diff --git a/libraries/libapparmor/testsuite/test_multi/testcase5.in b/libraries/libapparmor/testsuite/test_multi/old_style_log_06.in similarity index 100% rename from libraries/libapparmor/testsuite/test_multi/testcase5.in rename to libraries/libapparmor/testsuite/test_multi/old_style_log_06.in diff --git a/libraries/libapparmor/testsuite/test_multi/testcase5.out b/libraries/libapparmor/testsuite/test_multi/old_style_log_06.out similarity index 85% rename from libraries/libapparmor/testsuite/test_multi/testcase5.out rename to libraries/libapparmor/testsuite/test_multi/old_style_log_06.out index 92d41027a..6a077bc61 100644 --- a/libraries/libapparmor/testsuite/test_multi/testcase5.out +++ b/libraries/libapparmor/testsuite/test_multi/old_style_log_06.out @@ -1,5 +1,5 @@ START -File: test_multi/testcase5.in +File: test_multi/old_style_log_06.in Event type: AA_RECORD_DENIED Audit ID: 1167188680.127:54 Operation: mkdir diff --git a/libraries/libapparmor/testsuite/test_multi/testcase27.err b/libraries/libapparmor/testsuite/test_multi/old_style_log_07.err similarity index 100% rename from libraries/libapparmor/testsuite/test_multi/testcase27.err rename to libraries/libapparmor/testsuite/test_multi/old_style_log_07.err diff --git a/libraries/libapparmor/testsuite/test_multi/testcase7.in b/libraries/libapparmor/testsuite/test_multi/old_style_log_07.in similarity index 100% rename from libraries/libapparmor/testsuite/test_multi/testcase7.in rename to libraries/libapparmor/testsuite/test_multi/old_style_log_07.in diff --git a/libraries/libapparmor/testsuite/test_multi/testcase7.out b/libraries/libapparmor/testsuite/test_multi/old_style_log_07.out similarity index 86% rename from libraries/libapparmor/testsuite/test_multi/testcase7.out rename to libraries/libapparmor/testsuite/test_multi/old_style_log_07.out index c34d39856..376aef7b8 100644 --- a/libraries/libapparmor/testsuite/test_multi/testcase7.out +++ b/libraries/libapparmor/testsuite/test_multi/old_style_log_07.out @@ -1,5 +1,5 @@ START -File: test_multi/testcase7.in +File: test_multi/old_style_log_07.in Event type: AA_RECORD_DENIED Audit ID: 1167188680.127:54 Operation: xattr diff --git a/libraries/libapparmor/testsuite/test_multi/testcase28.err b/libraries/libapparmor/testsuite/test_multi/old_style_log_08.err similarity index 100% rename from libraries/libapparmor/testsuite/test_multi/testcase28.err rename to libraries/libapparmor/testsuite/test_multi/old_style_log_08.err diff --git a/libraries/libapparmor/testsuite/test_multi/testcase2.in b/libraries/libapparmor/testsuite/test_multi/old_style_log_08.in similarity index 100% rename from libraries/libapparmor/testsuite/test_multi/testcase2.in rename to libraries/libapparmor/testsuite/test_multi/old_style_log_08.in diff --git a/libraries/libapparmor/testsuite/test_multi/testcase2.out b/libraries/libapparmor/testsuite/test_multi/old_style_log_08.out similarity index 88% rename from libraries/libapparmor/testsuite/test_multi/testcase2.out rename to libraries/libapparmor/testsuite/test_multi/old_style_log_08.out index f98ff6133..a59b87a75 100644 --- a/libraries/libapparmor/testsuite/test_multi/testcase2.out +++ b/libraries/libapparmor/testsuite/test_multi/old_style_log_08.out @@ -1,5 +1,5 @@ START -File: test_multi/testcase2.in +File: test_multi/old_style_log_08.in Event type: AA_RECORD_ALLOWED Audit ID: 1168662182.495:58 Operation: access diff --git a/libraries/libapparmor/testsuite/test_multi/testcase29.err b/libraries/libapparmor/testsuite/test_multi/old_style_log_09.err similarity index 100% rename from libraries/libapparmor/testsuite/test_multi/testcase29.err rename to libraries/libapparmor/testsuite/test_multi/old_style_log_09.err diff --git a/libraries/libapparmor/testsuite/test_multi/testcase6.in b/libraries/libapparmor/testsuite/test_multi/old_style_log_09.in similarity index 100% rename from libraries/libapparmor/testsuite/test_multi/testcase6.in rename to libraries/libapparmor/testsuite/test_multi/old_style_log_09.in diff --git a/libraries/libapparmor/testsuite/test_multi/testcase6.out b/libraries/libapparmor/testsuite/test_multi/old_style_log_09.out similarity index 85% rename from libraries/libapparmor/testsuite/test_multi/testcase6.out rename to libraries/libapparmor/testsuite/test_multi/old_style_log_09.out index a1bc2d19e..e92dcf6bf 100644 --- a/libraries/libapparmor/testsuite/test_multi/testcase6.out +++ b/libraries/libapparmor/testsuite/test_multi/old_style_log_09.out @@ -1,5 +1,5 @@ START -File: test_multi/testcase6.in +File: test_multi/old_style_log_09.in Event type: AA_RECORD_ALLOWED Audit ID: 1167188680.127:54 Operation: rmdir diff --git a/libraries/libapparmor/testsuite/test_multi/testcase3.err b/libraries/libapparmor/testsuite/test_multi/old_style_log_10.err similarity index 100% rename from libraries/libapparmor/testsuite/test_multi/testcase3.err rename to libraries/libapparmor/testsuite/test_multi/old_style_log_10.err diff --git a/libraries/libapparmor/testsuite/test_multi/testcase8.in b/libraries/libapparmor/testsuite/test_multi/old_style_log_10.in similarity index 100% rename from libraries/libapparmor/testsuite/test_multi/testcase8.in rename to libraries/libapparmor/testsuite/test_multi/old_style_log_10.in diff --git a/libraries/libapparmor/testsuite/test_multi/testcase8.out b/libraries/libapparmor/testsuite/test_multi/old_style_log_10.out similarity index 86% rename from libraries/libapparmor/testsuite/test_multi/testcase8.out rename to libraries/libapparmor/testsuite/test_multi/old_style_log_10.out index 44966208f..74d05f3c4 100644 --- a/libraries/libapparmor/testsuite/test_multi/testcase8.out +++ b/libraries/libapparmor/testsuite/test_multi/old_style_log_10.out @@ -1,5 +1,5 @@ START -File: test_multi/testcase8.in +File: test_multi/old_style_log_10.in Event type: AA_RECORD_ALLOWED Audit ID: 1167188680.127:54 Operation: setattr diff --git a/libraries/libapparmor/testsuite/test_multi/testcase30.err b/libraries/libapparmor/testsuite/test_multi/old_style_log_11.err similarity index 100% rename from libraries/libapparmor/testsuite/test_multi/testcase30.err rename to libraries/libapparmor/testsuite/test_multi/old_style_log_11.err diff --git a/libraries/libapparmor/testsuite/test_multi/testcase9.in b/libraries/libapparmor/testsuite/test_multi/old_style_log_11.in similarity index 100% rename from libraries/libapparmor/testsuite/test_multi/testcase9.in rename to libraries/libapparmor/testsuite/test_multi/old_style_log_11.in diff --git a/libraries/libapparmor/testsuite/test_multi/testcase9.out b/libraries/libapparmor/testsuite/test_multi/old_style_log_11.out similarity index 84% rename from libraries/libapparmor/testsuite/test_multi/testcase9.out rename to libraries/libapparmor/testsuite/test_multi/old_style_log_11.out index 61c38abd9..45f0b9d08 100644 --- a/libraries/libapparmor/testsuite/test_multi/testcase9.out +++ b/libraries/libapparmor/testsuite/test_multi/old_style_log_11.out @@ -1,5 +1,5 @@ START -File: test_multi/testcase9.in +File: test_multi/old_style_log_11.in Event type: AA_RECORD_ALLOWED Audit ID: 1167188680.127:54 Operation: capability diff --git a/libraries/libapparmor/testsuite/test_multi/testcase34.err b/libraries/libapparmor/testsuite/test_multi/old_style_log_12.err similarity index 100% rename from libraries/libapparmor/testsuite/test_multi/testcase34.err rename to libraries/libapparmor/testsuite/test_multi/old_style_log_12.err diff --git a/libraries/libapparmor/testsuite/test_multi/testcase34.in b/libraries/libapparmor/testsuite/test_multi/old_style_log_12.in similarity index 100% rename from libraries/libapparmor/testsuite/test_multi/testcase34.in rename to libraries/libapparmor/testsuite/test_multi/old_style_log_12.in diff --git a/libraries/libapparmor/testsuite/test_multi/testcase34.out b/libraries/libapparmor/testsuite/test_multi/old_style_log_12.out similarity index 88% rename from libraries/libapparmor/testsuite/test_multi/testcase34.out rename to libraries/libapparmor/testsuite/test_multi/old_style_log_12.out index ef987f459..707ae6893 100644 --- a/libraries/libapparmor/testsuite/test_multi/testcase34.out +++ b/libraries/libapparmor/testsuite/test_multi/old_style_log_12.out @@ -1,5 +1,5 @@ START -File: test_multi/testcase34.in +File: test_multi/old_style_log_12.in Event type: AA_RECORD_ALLOWED Audit ID: 1201615421.935:4837 Mask: l diff --git a/libraries/libapparmor/testsuite/test_multi/testcase4.err b/libraries/libapparmor/testsuite/test_multi/old_style_log_13.err similarity index 100% rename from libraries/libapparmor/testsuite/test_multi/testcase4.err rename to libraries/libapparmor/testsuite/test_multi/old_style_log_13.err diff --git a/libraries/libapparmor/testsuite/test_multi/testcase29.in b/libraries/libapparmor/testsuite/test_multi/old_style_log_13.in similarity index 100% rename from libraries/libapparmor/testsuite/test_multi/testcase29.in rename to libraries/libapparmor/testsuite/test_multi/old_style_log_13.in diff --git a/libraries/libapparmor/testsuite/test_multi/testcase29.out b/libraries/libapparmor/testsuite/test_multi/old_style_log_13.out similarity index 90% rename from libraries/libapparmor/testsuite/test_multi/testcase29.out rename to libraries/libapparmor/testsuite/test_multi/old_style_log_13.out index 80083a536..57a96145b 100644 --- a/libraries/libapparmor/testsuite/test_multi/testcase29.out +++ b/libraries/libapparmor/testsuite/test_multi/old_style_log_13.out @@ -1,5 +1,5 @@ START -File: test_multi/testcase29.in +File: test_multi/old_style_log_13.in Event type: AA_RECORD_DENIED Audit ID: 1173790298.983:1669 Operation: syscall diff --git a/libraries/libapparmor/testsuite/test_multi/testcase5.err b/libraries/libapparmor/testsuite/test_multi/old_style_log_14.err similarity index 100% rename from libraries/libapparmor/testsuite/test_multi/testcase5.err rename to libraries/libapparmor/testsuite/test_multi/old_style_log_14.err diff --git a/libraries/libapparmor/testsuite/test_multi/testcase27.in b/libraries/libapparmor/testsuite/test_multi/old_style_log_14.in similarity index 100% rename from libraries/libapparmor/testsuite/test_multi/testcase27.in rename to libraries/libapparmor/testsuite/test_multi/old_style_log_14.in diff --git a/libraries/libapparmor/testsuite/test_multi/testcase27.out b/libraries/libapparmor/testsuite/test_multi/old_style_log_14.out similarity index 87% rename from libraries/libapparmor/testsuite/test_multi/testcase27.out rename to libraries/libapparmor/testsuite/test_multi/old_style_log_14.out index 3a732565d..09cd86fbd 100644 --- a/libraries/libapparmor/testsuite/test_multi/testcase27.out +++ b/libraries/libapparmor/testsuite/test_multi/old_style_log_14.out @@ -1,5 +1,5 @@ START -File: test_multi/testcase27.in +File: test_multi/old_style_log_14.in Event type: AA_RECORD_AUDIT Audit ID: 1177962426.395:2107 Operation: access diff --git a/libraries/libapparmor/testsuite/test_multi/testcase6.err b/libraries/libapparmor/testsuite/test_multi/old_style_log_15.err similarity index 100% rename from libraries/libapparmor/testsuite/test_multi/testcase6.err rename to libraries/libapparmor/testsuite/test_multi/old_style_log_15.err diff --git a/libraries/libapparmor/testsuite/test_multi/testcase10.in b/libraries/libapparmor/testsuite/test_multi/old_style_log_15.in similarity index 100% rename from libraries/libapparmor/testsuite/test_multi/testcase10.in rename to libraries/libapparmor/testsuite/test_multi/old_style_log_15.in diff --git a/libraries/libapparmor/testsuite/test_multi/testcase10.out b/libraries/libapparmor/testsuite/test_multi/old_style_log_15.out similarity index 86% rename from libraries/libapparmor/testsuite/test_multi/testcase10.out rename to libraries/libapparmor/testsuite/test_multi/old_style_log_15.out index cc766ca0f..66c046a52 100644 --- a/libraries/libapparmor/testsuite/test_multi/testcase10.out +++ b/libraries/libapparmor/testsuite/test_multi/old_style_log_15.out @@ -1,5 +1,5 @@ START -File: test_multi/testcase10.in +File: test_multi/old_style_log_15.in Event type: AA_RECORD_HINT Audit ID: 1168661976.062:55 Operation: clone diff --git a/libraries/libapparmor/testsuite/test_multi/testcase7.err b/libraries/libapparmor/testsuite/test_multi/old_style_log_16.err similarity index 100% rename from libraries/libapparmor/testsuite/test_multi/testcase7.err rename to libraries/libapparmor/testsuite/test_multi/old_style_log_16.err diff --git a/libraries/libapparmor/testsuite/test_multi/testcase11.in b/libraries/libapparmor/testsuite/test_multi/old_style_log_16.in similarity index 100% rename from libraries/libapparmor/testsuite/test_multi/testcase11.in rename to libraries/libapparmor/testsuite/test_multi/old_style_log_16.in diff --git a/libraries/libapparmor/testsuite/test_multi/testcase11.out b/libraries/libapparmor/testsuite/test_multi/old_style_log_16.out similarity index 78% rename from libraries/libapparmor/testsuite/test_multi/testcase11.out rename to libraries/libapparmor/testsuite/test_multi/old_style_log_16.out index c7936a20e..ce1757410 100644 --- a/libraries/libapparmor/testsuite/test_multi/testcase11.out +++ b/libraries/libapparmor/testsuite/test_multi/old_style_log_16.out @@ -1,5 +1,5 @@ START -File: test_multi/testcase11.in +File: test_multi/old_style_log_16.in Event type: AA_RECORD_HINT Audit ID: 1168661976.062:55 Operation: clone diff --git a/libraries/libapparmor/testsuite/test_multi/testcase8.err b/libraries/libapparmor/testsuite/test_multi/old_style_log_17.err similarity index 100% rename from libraries/libapparmor/testsuite/test_multi/testcase8.err rename to libraries/libapparmor/testsuite/test_multi/old_style_log_17.err diff --git a/libraries/libapparmor/testsuite/test_multi/testcase19.in b/libraries/libapparmor/testsuite/test_multi/old_style_log_17.in similarity index 100% rename from libraries/libapparmor/testsuite/test_multi/testcase19.in rename to libraries/libapparmor/testsuite/test_multi/old_style_log_17.in diff --git a/libraries/libapparmor/testsuite/test_multi/testcase19.out b/libraries/libapparmor/testsuite/test_multi/old_style_log_17.out similarity index 78% rename from libraries/libapparmor/testsuite/test_multi/testcase19.out rename to libraries/libapparmor/testsuite/test_multi/old_style_log_17.out index 0a12a3db9..4a3329100 100644 --- a/libraries/libapparmor/testsuite/test_multi/testcase19.out +++ b/libraries/libapparmor/testsuite/test_multi/old_style_log_17.out @@ -1,5 +1,5 @@ START -File: test_multi/testcase19.in +File: test_multi/old_style_log_17.in Event type: AA_RECORD_HINT Audit ID: 1164007073.953:518 Profile: null-complain-profile diff --git a/libraries/libapparmor/testsuite/test_multi/testcase9.err b/libraries/libapparmor/testsuite/test_multi/old_style_log_18.err similarity index 100% rename from libraries/libapparmor/testsuite/test_multi/testcase9.err rename to libraries/libapparmor/testsuite/test_multi/old_style_log_18.err diff --git a/libraries/libapparmor/testsuite/test_multi/testcase3.in b/libraries/libapparmor/testsuite/test_multi/old_style_log_18.in similarity index 100% rename from libraries/libapparmor/testsuite/test_multi/testcase3.in rename to libraries/libapparmor/testsuite/test_multi/old_style_log_18.in diff --git a/libraries/libapparmor/testsuite/test_multi/testcase3.out b/libraries/libapparmor/testsuite/test_multi/old_style_log_18.out similarity index 87% rename from libraries/libapparmor/testsuite/test_multi/testcase3.out rename to libraries/libapparmor/testsuite/test_multi/old_style_log_18.out index 86bd6318c..9f0e88bb3 100644 --- a/libraries/libapparmor/testsuite/test_multi/testcase3.out +++ b/libraries/libapparmor/testsuite/test_multi/old_style_log_18.out @@ -1,5 +1,5 @@ START -File: test_multi/testcase3.in +File: test_multi/old_style_log_18.in Event type: AA_RECORD_HINT Audit ID: 1168661976.062:55 Operation: change_hat