Android tests call exit() when complete.
[ Merge of http://go/wvgerrit/119804 ] The coverage framework used by Android requires the process to call exit() for coverage information to be dumped after the tests. Android unit tests have been adapted to use the a new main module. The core test_main.cpp used by integration tests has been updated to call exit(). Bug: 138941105 Test: Linux and Android unittests Change-Id: Ifffc7b8290c50dffe527738a36547c1d2fb90bd3
This commit is contained in:
@@ -5,7 +5,7 @@
|
|||||||
// Use in place of the gtest_main in order to initialize the WvCdmTestBase using
|
// Use in place of the gtest_main in order to initialize the WvCdmTestBase using
|
||||||
// command line parameters.
|
// command line parameters.
|
||||||
|
|
||||||
#include <stdio.h>
|
#include <stdlib.h>
|
||||||
|
|
||||||
#include "log.h"
|
#include "log.h"
|
||||||
#include "test_base.h"
|
#include "test_base.h"
|
||||||
@@ -13,5 +13,8 @@
|
|||||||
int main(int argc, char** argv) {
|
int main(int argc, char** argv) {
|
||||||
if (!wvcdm::WvCdmTestBase::Initialize(argc, argv)) return 1;
|
if (!wvcdm::WvCdmTestBase::Initialize(argc, argv)) return 1;
|
||||||
::testing::InitGoogleTest(&argc, argv);
|
::testing::InitGoogleTest(&argc, argv);
|
||||||
return RUN_ALL_TESTS();
|
const int status = RUN_ALL_TESTS();
|
||||||
|
LOGD("CDM test complete with status %d", status);
|
||||||
|
exit(status); // Explicit call to exit() is required for code coverage.
|
||||||
|
return status;
|
||||||
}
|
}
|
||||||
|
|||||||
17
libwvdrmengine/cdm/test/cdm_test_main.cpp
Normal file
17
libwvdrmengine/cdm/test/cdm_test_main.cpp
Normal file
@@ -0,0 +1,17 @@
|
|||||||
|
// Copyright 2021 Google LLC. All Rights Reserved. This file and proprietary
|
||||||
|
// source code may only be used and distributed under the Widevine License
|
||||||
|
// Agreement.
|
||||||
|
#include <stdlib.h>
|
||||||
|
|
||||||
|
#include "gtest/gtest.h"
|
||||||
|
|
||||||
|
#include "log.h"
|
||||||
|
|
||||||
|
int main(int argc, char** argv) {
|
||||||
|
LOGI("Running Android CDM tests");
|
||||||
|
testing::InitGoogleTest(&argc, argv);
|
||||||
|
const int status = RUN_ALL_TESTS();
|
||||||
|
LOGD("CDM test complete with status %d", status);
|
||||||
|
exit(status); // Explicit call to exit() is required for code coverage.
|
||||||
|
return status;
|
||||||
|
}
|
||||||
@@ -20,6 +20,7 @@ LOCAL_SRC_FILES := \
|
|||||||
../core/test/url_request.cpp \
|
../core/test/url_request.cpp \
|
||||||
../../oemcrypto/test/oec_device_features.cpp \
|
../../oemcrypto/test/oec_device_features.cpp \
|
||||||
../util/test/test_sleep.cpp \
|
../util/test/test_sleep.cpp \
|
||||||
|
./cdm_test_main.cpp \
|
||||||
|
|
||||||
LOCAL_C_INCLUDES := \
|
LOCAL_C_INCLUDES := \
|
||||||
vendor/widevine/libwvdrmengine/android/cdm/test \
|
vendor/widevine/libwvdrmengine/android/cdm/test \
|
||||||
@@ -44,7 +45,6 @@ LOCAL_STATIC_LIBRARIES := \
|
|||||||
libjsmn \
|
libjsmn \
|
||||||
libgmock \
|
libgmock \
|
||||||
libgtest \
|
libgtest \
|
||||||
libgtest_main \
|
|
||||||
libwvlevel3 \
|
libwvlevel3 \
|
||||||
|
|
||||||
LOCAL_SHARED_LIBRARIES := \
|
LOCAL_SHARED_LIBRARIES := \
|
||||||
|
|||||||
Reference in New Issue
Block a user