Disable video_engine_tests and webrtc_perf_tests on Android.
BUG=3770 TESTED=Running the tests locally on an Android device. R=phoglund@webrtc.org TBR=henrik.lundin@webrtc.org, pbos@webrtc.org Review URL: https://webrtc-codereview.appspot.com/14299004 git-svn-id: http://webrtc.googlecode.com/svn/trunk@7026 4adac7df-926f-26a2-2b94-8c16560cd09d
This commit is contained in:
@@ -13,6 +13,9 @@
|
||||
#include "webrtc/test/testsupport/perf_test.h"
|
||||
#include "webrtc/typedefs.h"
|
||||
|
||||
// Disabled on Android since all tests currently fail (webrtc:3770).
|
||||
#ifndef WEBRTC_ANDROID
|
||||
|
||||
// Runs a test with 10% packet losses and 10% clock drift, to exercise
|
||||
// both loss concealment and time-stretching code.
|
||||
TEST(NetEqPerformanceTest, Run) {
|
||||
@@ -39,3 +42,5 @@ TEST(NetEqPerformanceTest, RunClean) {
|
||||
webrtc::test::PrintResult(
|
||||
"neteq_performance", "", "0_pl_0_drift", runtime, "ms", true);
|
||||
}
|
||||
|
||||
#endif // !WEBRTC_ANDROID
|
||||
|
||||
@@ -177,6 +177,7 @@
|
||||
'channel_transport/udp_transport_unittest.cc',
|
||||
'channel_transport/udp_socket_manager_unittest.cc',
|
||||
'channel_transport/udp_socket_wrapper_unittest.cc',
|
||||
'testsupport/always_passing_unittest.cc',
|
||||
'testsupport/unittest_utils.h',
|
||||
'testsupport/fileutils_unittest.cc',
|
||||
'testsupport/frame_reader_unittest.cc',
|
||||
|
||||
19
webrtc/test/testsupport/always_passing_unittest.cc
Normal file
19
webrtc/test/testsupport/always_passing_unittest.cc
Normal file
@@ -0,0 +1,19 @@
|
||||
/*
|
||||
* Copyright (c) 2014 The WebRTC project authors. All Rights Reserved.
|
||||
*
|
||||
* Use of this source code is governed by a BSD-style license
|
||||
* that can be found in the LICENSE file in the root of the source
|
||||
* tree. An additional intellectual property rights grant can be found
|
||||
* in the file PATENTS. All contributing project authors may
|
||||
* be found in the AUTHORS file in the root of the source tree.
|
||||
*/
|
||||
|
||||
#include "testing/gtest/include/gtest/gtest.h"
|
||||
|
||||
namespace webrtc {
|
||||
|
||||
// A test that always passes. Useful when all tests in a executable are
|
||||
// disabled, since a gtest returns exit code 1 if no tests have executed.
|
||||
TEST(AlwaysPassingTest, AlwaysPassingTest) {}
|
||||
|
||||
} // namespace webrtc
|
||||
@@ -26,6 +26,9 @@
|
||||
#include "webrtc/test/fake_encoder.h"
|
||||
#include "webrtc/test/frame_generator_capturer.h"
|
||||
|
||||
// Disabled on Android since all tests currently fail (webrtc:3770).
|
||||
#ifndef WEBRTC_ANDROID
|
||||
|
||||
namespace webrtc {
|
||||
namespace {
|
||||
// Note: consider to write tests that don't depend on the trace system instead
|
||||
@@ -329,3 +332,5 @@ TEST_F(BitrateEstimatorTest, SwitchesToASTThenBackToTOF) {
|
||||
EXPECT_EQ(kEventSignaled, receiver_trace_.Wait());
|
||||
}
|
||||
} // namespace webrtc
|
||||
|
||||
#endif // !WEBRTC_ANDROID
|
||||
|
||||
@@ -41,6 +41,9 @@
|
||||
#include "webrtc/voice_engine/include/voe_rtp_rtcp.h"
|
||||
#include "webrtc/voice_engine/include/voe_video_sync.h"
|
||||
|
||||
// Disabled on Android since all these tests currently fail (webrtc:3770).
|
||||
#ifndef WEBRTC_ANDROID
|
||||
|
||||
namespace webrtc {
|
||||
|
||||
class CallPerfTest : public test::CallTest {
|
||||
@@ -557,3 +560,5 @@ TEST_F(CallPerfTest, NoPadWithoutMinTransmitBitrate) {
|
||||
}
|
||||
|
||||
} // namespace webrtc
|
||||
|
||||
#endif // !WEBRTC_ANDROID
|
||||
|
||||
@@ -38,6 +38,9 @@
|
||||
#include "webrtc/test/testsupport/perf_test.h"
|
||||
#include "webrtc/video/transport_adapter.h"
|
||||
|
||||
// Disabled on Android since all tests currently fail (webrtc:3770).
|
||||
#ifndef WEBRTC_ANDROID
|
||||
|
||||
namespace webrtc {
|
||||
|
||||
static const int kRedPayloadType = 118;
|
||||
@@ -1838,3 +1841,5 @@ TEST_F(EndToEndTest, RestartingSendStreamPreservesRtpStatesWithRtx) {
|
||||
}
|
||||
|
||||
} // namespace webrtc
|
||||
|
||||
#endif // !WEBRTC_ANDROID
|
||||
|
||||
@@ -33,6 +33,9 @@
|
||||
#include "webrtc/test/testsupport/fileutils.h"
|
||||
#include "webrtc/typedefs.h"
|
||||
|
||||
// Disabled on Android since all tests currently fail (webrtc:3770).
|
||||
#ifndef WEBRTC_ANDROID
|
||||
|
||||
namespace webrtc {
|
||||
|
||||
static const int kFullStackTestDurationSecs = 60;
|
||||
@@ -532,3 +535,5 @@ TEST_F(FullStackTest, ForemanCif1000kbps100msLimitedQueue) {
|
||||
RunTest(foreman_cif);
|
||||
}
|
||||
} // namespace webrtc
|
||||
|
||||
#endif // !WEBRTC_ANDROID
|
||||
|
||||
@@ -18,6 +18,9 @@
|
||||
#include "webrtc/test/testsupport/perf_test.h"
|
||||
#include "webrtc/video/rampup_tests.h"
|
||||
|
||||
// Disabled on Android since all tests currently fail (webrtc:3770).
|
||||
#ifndef WEBRTC_ANDROID
|
||||
|
||||
namespace webrtc {
|
||||
namespace {
|
||||
|
||||
@@ -507,3 +510,5 @@ TEST_F(RampUpTest, UpDownUpOneStreamRtx) { RunRampUpDownUpTest(1, true); }
|
||||
TEST_F(RampUpTest, UpDownUpThreeStreamsRtx) { RunRampUpDownUpTest(3, true); }
|
||||
|
||||
} // namespace webrtc
|
||||
|
||||
#endif // !WEBRTC_ANDROID
|
||||
|
||||
@@ -35,6 +35,9 @@
|
||||
#include "webrtc/video/transport_adapter.h"
|
||||
#include "webrtc/video_send_stream.h"
|
||||
|
||||
// Disabled on Android since all tests currently fail (webrtc:3770).
|
||||
#ifndef WEBRTC_ANDROID
|
||||
|
||||
namespace webrtc {
|
||||
|
||||
enum VideoFormat { kGeneric, kVP8, };
|
||||
@@ -1481,3 +1484,5 @@ TEST_F(VideoSendStreamTest, RtcpSenderReportContainsMediaBytesSent) {
|
||||
}
|
||||
|
||||
} // namespace webrtc
|
||||
|
||||
#endif // !WEBRTC_ANDROID
|
||||
|
||||
@@ -104,6 +104,9 @@
|
||||
'video/full_stack.cc',
|
||||
'video/rampup_tests.cc',
|
||||
'video/rampup_tests.h',
|
||||
# Needed to make the test binary pass since all tests are disabled on
|
||||
# Android (webrtc:3770).
|
||||
'test/testsupport/always_passing_unittest.cc',
|
||||
],
|
||||
'dependencies': [
|
||||
'<(DEPTH)/testing/gtest.gyp:gtest',
|
||||
|
||||
Reference in New Issue
Block a user