Skip to content

Commit

Permalink
Backed out 9 changesets (bug 1521879) for flake failures at /transfor…
Browse files Browse the repository at this point in the history
…ms/tests.py. CLOSED TREE

Backed out changeset baac167868b3 (bug 1521879)
Backed out changeset 54ac1b47b736 (bug 1521879)
Backed out changeset 94b62c6f22e2 (bug 1521879)
Backed out changeset d44f15fd4529 (bug 1521879)
Backed out changeset 761fca0514fb (bug 1521879)
Backed out changeset 0b85b1a7c1ce (bug 1521879)
Backed out changeset 5dc76e863a02 (bug 1521879)
Backed out changeset 604b9a007fe5 (bug 1521879)
Backed out changeset c414d82a5325 (bug 1521879)
  • Loading branch information
cristianbrindusan committed Feb 21, 2019
1 parent c9dc463 commit 339c294
Show file tree
Hide file tree
Showing 45 changed files with 155 additions and 1,835 deletions.
2 changes: 1 addition & 1 deletion CLOBBER
Original file line number Diff line number Diff line change
Expand Up @@ -22,4 +22,4 @@
# changes to stick? As of bug 928195, this shouldn't be necessary! Please
# don't change CLOBBER for WebIDL changes any more.

Bug 1521879: Adding PMediaTransport.ipdl requires a clobber.
Bug 1524688: Deleting preprocessed manifests requires clobber.
5 changes: 1 addition & 4 deletions dom/media/moz.build
Original file line number Diff line number Diff line change
Expand Up @@ -175,7 +175,6 @@ EXPORTS.mozilla += [

EXPORTS.mozilla.media.webrtc += [
'webrtc/WebrtcGlobal.h',
'webrtc/WebrtcIPCTraits.h',
]

if not CONFIG['MOZ_WEBRTC']:
Expand All @@ -184,7 +183,7 @@ if not CONFIG['MOZ_WEBRTC']:
]

IPDL_SOURCES += [
'webrtc/PWebrtcGlobal.ipdl',
'webrtc/PWebrtcGlobal.ipdl'
]

EXPORTS.mozilla.dom += [
Expand All @@ -207,8 +206,6 @@ EXPORTS.mozilla.dom += [
'VideoStreamTrack.h',
'VideoTrack.h',
'VideoTrackList.h',
'webrtc/MediaTransportChild.h',
'webrtc/MediaTransportParent.h',
]

UNIFIED_SOURCES += [
Expand Down
10 changes: 5 additions & 5 deletions dom/media/tests/mochitest/mochitest.ini
Original file line number Diff line number Diff line change
Expand Up @@ -126,13 +126,13 @@ skip-if = (android_version == '18') # android(Bug 1189784, timeouts on 4.3 emula
[test_peerConnection_checkPacketDumpHook.html]
skip-if = (android_version == '18') # android(Bug 1189784, timeouts on 4.3 emulator)
[test_peerConnection_basicAudioNATSrflx.html]
skip-if = toolkit == 'android' || (verify && (os == 'linux')) || socketprocess_e10s # websockets don't work on android (bug 1266217, IPV6 is busted in try which causes timeouts in socket process case (bug 1521117))
skip-if = toolkit == 'android' || (verify && (os == 'linux')) # websockets don't work on android (bug 1266217)
[test_peerConnection_basicAudioNATRelay.html]
skip-if = toolkit == 'android' || (verify && debug && (os == 'linux')) || socketprocess_e10s # websockets don't work on android (bug 1266217, IPV6 is busted in try which causes timeouts in socket process case (bug 1521117))
skip-if = toolkit == 'android' || (verify && debug && (os == 'linux')) # websockets don't work on android (bug 1266217)
[test_peerConnection_basicAudioNATRelayTCP.html]
skip-if = toolkit == 'android' || socketprocess_e10s # websockets don't work on android (bug 1266217, IPV6 is busted in try which causes timeouts in socket process case (bug 1521117))
skip-if = toolkit == 'android' # websockets don't work on android (bug 1266217)
[test_peerConnection_basicAudioNATRelayTLS.html]
skip-if = true # need pyopenssl on builders, see bug 1323439 # toolkit == 'android' || socketprocess_e10s # websockets don't work on android (bug 1266217), IPV6 is busted in try which causes timeouts in socket process case (bug 1521117)
skip-if = true # need pyopenssl on builders, see bug 1323439 # toolkit == 'android' # websockets don't work on android (bug 1266217)
[test_peerConnection_basicAudioRequireEOC.html]
skip-if = (android_version == '18') # android(Bug 1189784, timeouts on 4.3 emulator)
[test_peerConnection_basicAudioPcmaPcmuOnly.html]
Expand Down Expand Up @@ -347,7 +347,7 @@ skip-if = (android_version == '18') # android(Bug 1189784, timeouts on 4.3 emula
[test_peerConnection_stats.html]
skip-if = toolkit == 'android' # android(Bug 1189784, timeouts on 4.3 emulator, Bug 1373858)
[test_peerConnection_stats_relayProtocol.html]
skip-if = toolkit == 'android' || socketprocess_e10s # android(Bug 1189784, timeouts on 4.3 emulator, Bug 1373858, Bug 1521117)
skip-if = toolkit == 'android' # android(Bug 1189784, timeouts on 4.3 emulator, Bug 1373858)
[test_peerConnection_sender_and_receiver_stats.html]
skip-if = (android_version == '18') # android(Bug 1189784, timeouts on 4.3 emulator)
[test_peerConnection_trackless_sender_stats.html]
Expand Down
38 changes: 0 additions & 38 deletions dom/media/webrtc/MediaTransportChild.h

This file was deleted.

64 changes: 0 additions & 64 deletions dom/media/webrtc/MediaTransportParent.h

This file was deleted.

100 changes: 0 additions & 100 deletions dom/media/webrtc/PMediaTransport.ipdl

This file was deleted.

1 change: 0 additions & 1 deletion dom/media/webrtc/RTCCertificate.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,6 @@
#include "mozilla/dom/WebCryptoTask.h"
#include "mozilla/Move.h"
#include "mozilla/Sprintf.h"
#include "mtransport/dtlsidentity.h"

#include <cstdio>

Expand Down
2 changes: 1 addition & 1 deletion dom/media/webrtc/RTCCertificate.h
Original file line number Diff line number Diff line change
Expand Up @@ -19,11 +19,11 @@
#include "mozilla/RefPtr.h"
#include "mozilla/dom/CryptoKey.h"
#include "mozilla/dom/RTCCertificateBinding.h"
#include "mtransport/dtlsidentity.h"
#include "js/StructuredClone.h"
#include "js/TypeDecls.h"

namespace mozilla {
class DtlsIdentity;
namespace dom {

class ObjectOrString;
Expand Down
Loading

0 comments on commit 339c294

Please sign in to comment.