Source release 15.2.0

cdm/test/cdm_test_main.cpp

@@ -24,12 +24,9 @@ int main(int argc, char** argv) {
   // Init gtest and let it consume arguments.
   ::testing::InitGoogleTest(&argc, argv);
 
-  if (!wvcdm::WvCdmTestBase::Initialize(argc, argv)) return 0;
-
-  // Set up a Host so that tests and initialize the library.  This makes these
-  // services available to the tests.  We would do this in the test suite
-  // itself, but the core & OEMCrypto tests don't know they depend on this
-  // for storage.
+  // Set up a Host and initialize the library.  This makes these services
+  // available to the tests.  We would do this in the test suite itself, but the
+  // core & OEMCrypto tests don't know they depend on this for storage.
   g_host = new TestHost();
   Cdm::ClientInfo client_info;
   // Set client info that denotes this as the test suite:
@@ -55,5 +52,9 @@ int main(int argc, char** argv) {
   (void)status;  // status is now used when assertions are turned off.
   assert(status == Cdm::kSuccess);
 
+  // This must take place after the call to Cdm::initialize() because it may
+  // make calls that are only valid after the library is initialized.
+  if (!wvcdm::WvCdmTestBase::Initialize(argc, argv)) return 0;
+
   return RUN_ALL_TESTS();
 }