From 5f0dc143fcbe8889a1f975f6930f9eb5ec1a9616 Mon Sep 17 00:00:00 2001 From: Christian Boltz Date: Tue, 6 Nov 2018 17:33:49 +0000 Subject: [PATCH] Merge branch 'cboltz-fixed-todos' into 'master' Remove TODO notes from no-longer-failing tests See merge request apparmor/apparmor!180 Acked-by: John Johansen Acked-by: intrigeri (cherry picked from commit c98d8570eee26469d0541fefbcbfb74a36337caa) d15bdaba Remove TODO notes from no-longer-failing tests --- parser/tst/simple_tests/vars/vars_profile_name_14.sd | 1 - parser/tst/simple_tests/vars/vars_profile_name_25.sd | 1 - parser/tst/simple_tests/vars/vars_profile_name_26.sd | 1 - parser/tst/simple_tests/xtrans/minimize-x-conflict.sd | 1 - parser/tst/simple_tests/xtrans/x-conflict.sd | 1 - 5 files changed, 5 deletions(-) diff --git a/parser/tst/simple_tests/vars/vars_profile_name_14.sd b/parser/tst/simple_tests/vars/vars_profile_name_14.sd index feffe8139..d2b94c9fc 100644 --- a/parser/tst/simple_tests/vars/vars_profile_name_14.sd +++ b/parser/tst/simple_tests/vars/vars_profile_name_14.sd @@ -1,6 +1,5 @@ #=DESCRIPTION reference variables in rules that also have alternations #=EXRESULT PASS -#=TODO # This test needs check on @{FOO} attachment having leading / post var expansion @{FOO}=/bar /baz diff --git a/parser/tst/simple_tests/vars/vars_profile_name_25.sd b/parser/tst/simple_tests/vars/vars_profile_name_25.sd index 56ce8bae7..bba4ceecb 100644 --- a/parser/tst/simple_tests/vars/vars_profile_name_25.sd +++ b/parser/tst/simple_tests/vars/vars_profile_name_25.sd @@ -1,6 +1,5 @@ #=DESCRIPTION reference variables is null #=EXRESULT FAIL -#=TODO #needs post var expansion check that variable contained a value @{FOO}= diff --git a/parser/tst/simple_tests/vars/vars_profile_name_26.sd b/parser/tst/simple_tests/vars/vars_profile_name_26.sd index e81acb944..850de8653 100644 --- a/parser/tst/simple_tests/vars/vars_profile_name_26.sd +++ b/parser/tst/simple_tests/vars/vars_profile_name_26.sd @@ -1,6 +1,5 @@ #=DESCRIPTION reference variables is null #=EXRESULT FAIL -#=TODO #needs post var expansion check that variable contained a value @{FOO}= diff --git a/parser/tst/simple_tests/xtrans/minimize-x-conflict.sd b/parser/tst/simple_tests/xtrans/minimize-x-conflict.sd index 429795602..33524fd0c 100644 --- a/parser/tst/simple_tests/xtrans/minimize-x-conflict.sd +++ b/parser/tst/simple_tests/xtrans/minimize-x-conflict.sd @@ -1,7 +1,6 @@ # #=DESCRIPTION test for conflict resolution in minimization phase of dfa gen #=EXRESULT PASS -#=TODO # /usr/bin/foo { diff --git a/parser/tst/simple_tests/xtrans/x-conflict.sd b/parser/tst/simple_tests/xtrans/x-conflict.sd index 92215f9fe..7b19b8747 100644 --- a/parser/tst/simple_tests/xtrans/x-conflict.sd +++ b/parser/tst/simple_tests/xtrans/x-conflict.sd @@ -1,7 +1,6 @@ # #=DESCRIPTION test for conflict resolution in minimization phase of dfa gen #=EXRESULT FAIL -#=TODO # /usr/bin/foo { /b* px,