Source release 16.2.0

oemcrypto/test/oemcrypto_test_main.cpp

@@ -4,6 +4,7 @@
 #include "OEMCryptoCENC.h"
 #include "log.h"
 #include "oec_device_features.h"
+#include "test_sleep.h"
 
 static void acknowledge_cast() {
   std::cout
@@ -16,27 +17,34 @@ static void acknowledge_cast() {
 // because we need to initialize the list of features supported by the device.
 // Also, the test filter is updated based on the feature list.
 int main(int argc, char** argv) {
-  ::testing::InitGoogleTest(&argc, argv);
   bool is_cast_receiver = false;
-  bool force_load_test_keybox = false;
   bool filter_tests = true;
   int verbosity = 0;
-  for (int i = 0; i < argc; i++) {
+  // Skip the first element, which is the program name.
+  const std::vector<std::string> args(argv + 1, argv + argc);
+  for (const std::string& arg : args) {
     if (arg == "--verbose" || arg == "-v") {
       ++verbosity;
-    } else if (!strcmp(argv[i], "--cast")) {
+    } else if (arg == "--cast") {
       acknowledge_cast();
       is_cast_receiver = true;
     }
-    if (!strcmp(argv[i], "--force_load_test_keybox")) {
-      force_load_test_keybox = true;
+    if (arg == "--force_load_test_keybox") {
+      std::cerr << "The argument --force_load_test_keybox is obsolete.\n";
+      return 1;
     }
-    if (!strcmp(argv[i], "--no_filter")) {
+    if (arg == "--no_filter") {
       filter_tests = false;
     }
+    if (arg == "--fake_sleep") {
+      wvcdm::TestSleep::set_real_sleep(false);
+    }
   }
-  wvcdm::g_cutoff = static_cast<LogPriority>(verbosity);
-  wvoec::global_features.Initialize(is_cast_receiver, force_load_test_keybox);
+  wvcdm::g_cutoff = static_cast<wvcdm::LogPriority>(verbosity);
+  wvoec::global_features.Initialize();
+  wvoec::global_features.set_cast_receiver(is_cast_receiver);
+  // Init GTest after device properties has been initialized.
+  ::testing::InitGoogleTest(&argc, argv);
   // If the user requests --no_filter, we don't change the filter, otherwise, we
   // filter out features that are not supported.
   if (filter_tests) {