Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-10-11 04:15:43 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Backed out changeset b527670b6728 (bug 811118) for orange.

Browse Source
This commit is contained in:
Ryan VanderMeulen 2012-11-16 21:24:14 -05:00
parent a272b4266e
commit f9cd0623b0
4 changed files with 3 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
configure.in
View File

@ -5231,6 +5231,7 @@ 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)

7
media/mtransport/test/mtransport_test_utils.h
View File

@ -91,13 +91,6 @@ 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

6
media/webrtc/signaling/test/mediaconduit_unittests.cpp
View File

@ -749,12 +749,6 @@ TEST_F(TransportConduitTest, TestVideoConduitCodecAPI) {
int main(int argc, char **argv)
{
#ifdef LINUX
// On Linux this needs to be conditional since the builders
// do not have audio capabilities
CHECK_ENVIRONMENT_FLAG("MOZ_WEBRTC_TESTS")
#endif
test_utils = new MtransportTestUtils();
::testing::InitGoogleTest(&argc, argv);
int rv = RUN_ALL_TESTS();

2
toolkit/toolkit-tiers.mk
View File

@ -307,7 +307,9 @@ 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