Change SELinuxHostTest to new sepolicy-analyze args.
As part of the refactoring of sepolicy-analyze
in Change-Id: I45fa07d776cf1bec7d60dba0c03ee05142b86c19, we changed
the command-line arguments expected. Update the testAllEnforcing()
and testNeverallowRules SELinux CTS tests to reflect this change.
Cherry-pick of commit: eb23950e7839c40a3f59aad42de4cb659abcdde2
Change-Id: I5f5d47eb7e818b90716eecfaadf3fc8fb15c96cd
diff --git a/hostsidetests/security/src/android/cts/security/SELinuxHostTest.java b/hostsidetests/security/src/android/cts/security/SELinuxHostTest.java
index 18d6a176..1a88ea0 100644
--- a/hostsidetests/security/src/android/cts/security/SELinuxHostTest.java
+++ b/hostsidetests/security/src/android/cts/security/SELinuxHostTest.java
@@ -89,8 +89,8 @@
public void testAllEnforcing() throws Exception {
/* run sepolicy-analyze permissive check on policy file */
- ProcessBuilder pb = new ProcessBuilder(sepolicyAnalyze.getAbsolutePath(), "-p", "-P",
- devicePolicyFile.getAbsolutePath());
+ ProcessBuilder pb = new ProcessBuilder(sepolicyAnalyze.getAbsolutePath(),
+ devicePolicyFile.getAbsolutePath(), "permissive");
pb.redirectOutput(ProcessBuilder.Redirect.PIPE);
pb.redirectErrorStream(true);
Process p = pb.start();
@@ -117,8 +117,8 @@
/* run sepolicy-analyze neverallow check on policy file using given neverallow rules */
ProcessBuilder pb = new ProcessBuilder(sepolicyAnalyze.getAbsolutePath(),
- "-n", neverallowRules.getAbsolutePath(), "-P",
- devicePolicyFile.getAbsolutePath());
+ devicePolicyFile.getAbsolutePath(), "neverallow", "-f",
+ neverallowRules.getAbsolutePath());
pb.redirectOutput(ProcessBuilder.Redirect.PIPE);
pb.redirectErrorStream(true);
Process p = pb.start();
