commit 62503e1c22b4fadab960cde308f5c77f5b5df699
author Yifan Hong <elsk@google.com> Mon Aug 26 12:47:41 2019 -0700
committer Yifan Hong <elsk@google.com> Tue Aug 27 11:16:22 2019 -0700
tree 6f91aa3f4c0964381fc11fece791d38d8d2ce636
parent 0729285dd9bae86746f299cdb7cb201686aa3858

checkvintf: standardize output

Test: test_check_target_files_vintf
Bug: 139300422
Change-Id: I60692112cd1cd16110ac7d998869e9dcee5fc645

check_vintf.cpp

diff --git a/check_vintf.cpp b/check_vintf.cpp
index e2fdb58..1c9f92e 100644
--- a/check_vintf.cpp
+++ b/check_vintf.cpp
@@ -15,6 +15,7 @@
  */
 
 #include <getopt.h>
+#include <sysexits.h>
 #include <unistd.h>
 
 #include <iostream>
@@ -327,7 +328,7 @@
         << "            --property ro.boot.product.hardware.sku=`adb shell getprop "
            "ro.boot.product.hardware.sku`"
         << std::endl;
-    return 1;
+    return EX_USAGE;
 }
 
 int checkAllFiles(const Dirmap& dirmap, const Properties& props,
@@ -406,11 +407,16 @@
     }
 
     int compat = checkAllFiles(dirmap, properties, runtimeInfo, &error);
-    std::cerr << "Debug: "
-              << (compat == COMPATIBLE
-                      ? "files are compatible"
-                      : compat == INCOMPATIBLE ? "files are incompatible"
-                                               : ("Encountered an error: " + error))
-              << std::endl;
-    return compat;
+
+    if (compat == COMPATIBLE) {
+        std::cout << "COMPATIBLE" << std::endl;
+        return EX_OK;
+    }
+    if (compat == INCOMPATIBLE) {
+        std::cerr << "Error: files are incompatible: " << error << std::endl;
+        std::cout << "INCOMPATIBLE" << std::endl;
+        return EX_DATAERR;
+    }
+    std::cerr << "Error: " << strerror(-compat) << ": " << error << std::endl;
+    return EX_SOFTWARE;
 }