зеркало из https://github.com/mozilla/gecko-dev.git
Bug 811118 build webrtc unittests by default but run only some r=jesup
This commit is contained in:
Родитель
5866920e6f
Коммит
0aff34f3d3
|
@ -5230,7 +5230,6 @@ dnl enable once PeerConnection lands
|
|||
fi
|
||||
|
||||
AC_SUBST(MOZ_WEBRTC)
|
||||
AC_SUBST(MOZ_WEBRTC_TESTS)
|
||||
AC_SUBST(MOZ_WEBRTC_SIGNALING)
|
||||
AC_SUBST(MOZ_PEERCONNECTION)
|
||||
AC_SUBST(MOZ_WEBRTC_IN_LIBXUL)
|
||||
|
|
|
@ -91,6 +91,13 @@ MtransportTestUtils *mtransport_test_utils;
|
|||
#define SETUP_MTRANSPORT_TEST_UTILS() \
|
||||
MtransportTestUtils utils_; mtransport_test_utils = &utils_
|
||||
|
||||
#define CHECK_ENVIRONMENT_FLAG(envname) \
|
||||
char *test_flag = getenv(envname); \
|
||||
if (!test_flag || strcmp(test_flag, "1")) { \
|
||||
printf("To run this test set %s=1 in your environment\n", envname); \
|
||||
exit(0); \
|
||||
} \
|
||||
|
||||
|
||||
#endif
|
||||
|
||||
|
|
|
@ -749,6 +749,9 @@ TEST_F(TransportConduitTest, TestVideoConduitCodecAPI) {
|
|||
|
||||
int main(int argc, char **argv)
|
||||
{
|
||||
// This test can cause intermittent oranges on the builders
|
||||
CHECK_ENVIRONMENT_FLAG("MOZ_WEBRTC_TESTS")
|
||||
|
||||
test_utils = new MtransportTestUtils();
|
||||
::testing::InitGoogleTest(&argc, argv);
|
||||
int rv = RUN_ALL_TESTS();
|
||||
|
|
|
@ -1203,6 +1203,9 @@ TEST_F(SignalingTest, FullCallTrickle)
|
|||
} // End namespace test.
|
||||
|
||||
int main(int argc, char **argv) {
|
||||
// This test can cause intermittent oranges on the builders
|
||||
CHECK_ENVIRONMENT_FLAG("MOZ_WEBRTC_TESTS")
|
||||
|
||||
test_utils = new MtransportTestUtils();
|
||||
NSS_NoDB_Init(NULL);
|
||||
NSS_SetDomesticPolicy();
|
||||
|
|
|
@ -301,9 +301,7 @@ tier_platform_dirs += testing/tools/screenshot
|
|||
tier_platform_dirs += testing/peptest
|
||||
tier_platform_dirs += testing/mozbase
|
||||
ifdef MOZ_WEBRTC
|
||||
ifdef MOZ_WEBRTC_TESTS
|
||||
tier_platform_dirs += media/webrtc/signaling/test
|
||||
tier_platform_dirs += media/mtransport/test
|
||||
endif
|
||||
endif
|
||||
endif
|
||||
|
|
Загрузка…
Ссылка в новой задаче