From 3666bd9a99b1453aaba021741ddaf9798a5cee64 Mon Sep 17 00:00:00 2001 From: Nicolas Iooss Date: Sat, 27 Aug 2016 11:21:48 +0200 Subject: [PATCH] libsepol: tests: fix g_b_role_2 test Even though g_b_role_2 is used both in tests/policies/test-linker/small-base.conf and tests/policies/test-linker/module1.conf, it seems to only exists in the scope of the base policy. This fixes the following failure of "make -C libsepol test": ./libsepol-tests CUnit - A unit testing framework for C - Version 2.1-3 http://cunit.sourceforge.net/ Suite: cond Test: cond_expr_equal ...passed Suite: linker Test: linker_indexes ...passed Test: linker_types ...passed Test: linker_roles ...sym g_b_role_2 has 1 decls, 2 expected FAILED 1. test-common.c:43 - scope->decl_ids_len == len 2. test-common.c:52 - found == 1 Test: linker_cond ...passed Suite: expander Test: expander_indexes ...passed Test: expander_attr_mapping ...passed Test: expander_role_mapping ...passed Test: expander_user_mapping ...passed Test: expander_alias ...passed Suite: deps Test: deps_modreq_global ...passed Test: deps_modreq_opt ...passed Suite: downgrade Test: downgrade ...passed Run Summary: Type Total Ran Passed Failed Inactive suites 5 5 n/a 0 0 tests 13 13 12 1 0 asserts 1274 1274 1272 2 n/a Signed-off-by: Nicolas Iooss --- libsepol/tests/test-linker-roles.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/libsepol/tests/test-linker-roles.c b/libsepol/tests/test-linker-roles.c index 2c4a8047..569e2ccf 100644 --- a/libsepol/tests/test-linker-roles.c +++ b/libsepol/tests/test-linker-roles.c @@ -132,8 +132,7 @@ void module_role_tests(policydb_t * base) /**** test for type added to base role in module 1 (global) ****/ decls[0] = (test_find_decl_by_sym(base, SYM_TYPES, "tag_g_b"))->decl_id; - decls[1] = (test_find_decl_by_sym(base, SYM_TYPES, "tag_g_m1"))->decl_id; - test_sym_presence(base, "g_b_role_2", SYM_ROLES, SCOPE_DECL, decls, 2); + test_sym_presence(base, "g_b_role_2", SYM_ROLES, SCOPE_DECL, decls, 1); /* make sure it has the correct type set (g_m1_type_1, no negset, no flags) */ types[0] = "g_b_type_2"; /* added in base when declared */ types[1] = "g_m1_type_1"; /* added in module */