packaging
/
ostree
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

tests: Skip libarchive/selinux tests if in container without SELinux 

I'm doing builds and `make check` inside a Docker container, with
selinux on as a build-time option, but no policy in the container.
This currently aborts.  Let's not do that.

(This type of thing is why installed tests are a better model)

Closes: #546
Approved by: jlebon
This commit is contained in:
Colin Walters 2016-10-25 10:40:45 -04:00 committed by Atomic Bot
parent 27f37b55bc
commit 82a4f56593
1 changed files with 2 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
tests/test-libarchive-import.c
View File

@ -501,12 +501,10 @@ test_libarchive_selinux (gconstpointer data)
{ {
glnx_unref_object GFile *root = g_file_new_for_path ("/"); glnx_unref_object GFile *root = g_file_new_for_path ("/");
/* creation should always succeed */ sepol = ostree_sepolicy_new (root, NULL, NULL);
sepol = ostree_sepolicy_new (root, NULL, &error);
g_assert (sepol != NULL);
} }
if (ostree_sepolicy_get_name (sepol) == NULL) if (sepol == NULL || ostree_sepolicy_get_name (sepol) == NULL)
{ {
g_test_skip ("SELinux disabled"); g_test_skip ("SELinux disabled");
goto out; goto out;