mirror of
https://gitlab.winehq.org/wine/wine-gecko.git
synced 2024-09-13 09:24:08 -07:00
Back out bug 759221 and bug 761326 because of media test failures
This commit is contained in:
Matt Brubeck
parent
77a213743f
commit
c4a437e09c
@ -11138,10 +11138,7 @@ ctx.fillRect(0, 0, 100, 50);
|
||||
ctx.scale(2, 0.5);
|
||||
ctx.fillStyle = '#0f0';
|
||||
ctx.beginPath();
|
||||
var hypothenuse = Math.sqrt(50 * 50 + 25 * 25);
|
||||
var tolerance = 0.5;
|
||||
var radius = hypothenuse + tolerance;
|
||||
ctx.arc(25, 50, radius, 0, 2*Math.PI, false);
|
||||
ctx.arc(25, 50, 56, 0, 2*Math.PI, false);
|
||||
ctx.fill();
|
||||
ctx.fillStyle = '#f00';
|
||||
ctx.beginPath();
|
||||
|
||||
@ -17,7 +17,6 @@ _TEST_FILES = \
|
||||
failing_tests_linux.txt \
|
||||
failing_tests_windows.txt \
|
||||
failing_tests_mac.txt \
|
||||
failing_tests_android.txt \
|
||||
$(NULL)
|
||||
|
||||
libs:: $(_TEST_FILES)
|
||||
|
||||
@ -1,35 +0,0 @@
|
||||
conformance/extensions/oes-standard-derivatives.html
|
||||
conformance/glsl/functions/glsl-function-abs.html
|
||||
conformance/glsl/functions/glsl-function-ceil.html
|
||||
conformance/glsl/functions/glsl-function-clamp-float.html
|
||||
conformance/glsl/functions/glsl-function-clamp-gentype.html
|
||||
conformance/glsl/functions/glsl-function-cross.html
|
||||
conformance/glsl/functions/glsl-function-distance.html
|
||||
conformance/glsl/functions/glsl-function-dot.html
|
||||
conformance/glsl/functions/glsl-function-faceforward.html
|
||||
conformance/glsl/functions/glsl-function-floor.html
|
||||
conformance/glsl/functions/glsl-function-fract.html
|
||||
conformance/glsl/functions/glsl-function.html
|
||||
conformance/glsl/functions/glsl-function-length.html
|
||||
conformance/glsl/functions/glsl-function-max-float.html
|
||||
conformance/glsl/functions/glsl-function-max-gentype.html
|
||||
conformance/glsl/functions/glsl-function-min-float.html
|
||||
conformance/glsl/functions/glsl-function-min-gentype.html
|
||||
conformance/glsl/functions/glsl-function-mix-float.html
|
||||
conformance/glsl/functions/glsl-function-mix-gentype.html
|
||||
conformance/glsl/functions/glsl-function-mod-float.html
|
||||
conformance/glsl/functions/glsl-function-mod-gentype.html
|
||||
conformance/glsl/functions/glsl-function-normalize.html
|
||||
conformance/glsl/functions/glsl-function-reflect.html
|
||||
conformance/glsl/functions/glsl-function-sign.html
|
||||
conformance/glsl/functions/glsl-function-smoothstep-float.html
|
||||
conformance/glsl/functions/glsl-function-smoothstep-gentype.html
|
||||
conformance/glsl/functions/glsl-function-step-float.html
|
||||
conformance/glsl/functions/glsl-function-step-gentype.html
|
||||
conformance/glsl/misc/glsl-function-nodes.html
|
||||
conformance/glsl/misc/shared.html
|
||||
conformance/misc/null-object-behaviour.html
|
||||
conformance/renderbuffers/framebuffer-object-attachment.html
|
||||
conformance/textures/texture-mips.html
|
||||
conformance/textures/texture-npot.html
|
||||
conformance/textures/texture-npot-video.html
|
||||
@ -49,12 +49,9 @@ function start() {
|
||||
var kIsWindows = false;
|
||||
var kIsMac = false;
|
||||
var kIsLinux = false;
|
||||
var kIsAndroid = false;
|
||||
if (navigator.platform.indexOf("Win") == 0)
|
||||
kIsWindows = true;
|
||||
else if (navigator.appVersion.indexOf("Android") != -1)
|
||||
kIsAndroid = true;
|
||||
else if (navigator.platform.indexOf("Linux") == 0) // must be checked after android, as android also has a 'Linux' platform string
|
||||
else if (navigator.platform.indexOf("Linux") == 0)
|
||||
kIsLinux = true;
|
||||
else if (navigator.platform.indexOf("Mac") == 0)
|
||||
kIsMac = true;
|
||||
@ -410,7 +407,7 @@ function start() {
|
||||
window.webglTestHarness = testHarness;
|
||||
}
|
||||
|
||||
SimpleTest.requestLongerTimeout(kIsAndroid ? 6 : 3);
|
||||
SimpleTest.requestLongerTimeout(3);
|
||||
|
||||
var statusElem = document.getElementById("status");
|
||||
var statusTextNode = document.createTextNode('');
|
||||
@ -435,8 +432,6 @@ function start() {
|
||||
failingTestsFilename = 'failing_tests_linux.txt';
|
||||
else if (kIsMac)
|
||||
failingTestsFilename = 'failing_tests_mac.txt';
|
||||
else if (kIsAndroid)
|
||||
failingTestsFilename = 'failing_tests_android.txt';
|
||||
|
||||
var testsExpectedToFail = loadTextFileSynchronous(failingTestsFilename)
|
||||
.replace(/\r/g, '') // convert to unix line breaks
|
||||
|
||||
@ -67,6 +67,10 @@ _TEST_FILES = \
|
||||
test_audio1.html \
|
||||
test_audio2.html \
|
||||
test_autoplay.html \
|
||||
test_autoplay_contentEditable.html \
|
||||
test_buffered.html \
|
||||
test_bug448534.html \
|
||||
test_bug463162.xhtml \
|
||||
test_bug465498.html \
|
||||
test_bug493187.html \
|
||||
test_bug495145.html \
|
||||
@ -78,6 +82,7 @@ _TEST_FILES = \
|
||||
test_controls.html \
|
||||
test_currentTime.html \
|
||||
test_decode_error.html \
|
||||
test_decoder_disable.html \
|
||||
test_defaultMuted.html \
|
||||
test_delay_load.html \
|
||||
test_error_on_404.html \
|
||||
@ -88,6 +93,7 @@ _TEST_FILES = \
|
||||
test_load_same_resource.html \
|
||||
test_load_source.html \
|
||||
test_loop.html \
|
||||
test_media_selection.html \
|
||||
test_mozLoadFrom.html \
|
||||
test_no_load_event.html \
|
||||
test_networkState.html \
|
||||
@ -97,6 +103,7 @@ _TEST_FILES = \
|
||||
test_play_events.html \
|
||||
test_play_events_2.html \
|
||||
test_played.html \
|
||||
test_playback.html \
|
||||
test_playback_errors.html \
|
||||
test_seekable1.html \
|
||||
test_preload_actions.html \
|
||||
@ -107,6 +114,7 @@ _TEST_FILES = \
|
||||
test_replay_metadata.html \
|
||||
test_seek.html \
|
||||
test_seek2.html \
|
||||
test_seekLies.html \
|
||||
test_seek_out_of_range.html \
|
||||
test_source.html \
|
||||
test_source_write.html \
|
||||
@ -124,23 +132,6 @@ _TEST_FILES = \
|
||||
test_source_media.html \
|
||||
$(NULL)
|
||||
|
||||
# Bug 759221
|
||||
# These tests are not built on Android because they were failing when we
|
||||
# enabled these tests on Android. The intent is to re-enable them as soon
|
||||
# as possible, and/or switch to a cleaner way to manage known-to-fail tests.
|
||||
ifneq ($(OS_TARGET),Android)
|
||||
_TEST_FILES = \
|
||||
test_autoplay_contentEditable.html \
|
||||
test_buffered.html \
|
||||
test_bug448534.html \
|
||||
test_bug463162.xhtml \
|
||||
test_decoder_disable.html \
|
||||
test_media_selection.html \
|
||||
test_playback.html \
|
||||
test_seekLies.html \
|
||||
$(NULL)
|
||||
endif
|
||||
|
||||
# Don't run in suite
|
||||
ifndef MOZ_SUITE
|
||||
_TEST_FILES += test_play_twice.html
|
||||
@ -239,22 +230,6 @@ _TEST_FILES += \
|
||||
ifdef MOZ_OGG
|
||||
_TEST_FILES += \
|
||||
test_can_play_type_ogg.html \
|
||||
noContentLength.sjs \
|
||||
test_seekable3.html \
|
||||
test_a4_tone.html \
|
||||
file_audio_event_adopt_iframe.html \
|
||||
test_audio_event_adopt.html \
|
||||
test_referer.html \
|
||||
test_bug726904.html \
|
||||
$(NULL)
|
||||
|
||||
# Bug 759221
|
||||
# These tests are not built on Android because they were failing when we
|
||||
# enabled these tests on Android. The intent is to re-enable them as soon
|
||||
# as possible, and/or switch to a cleaner way to manage known-to-fail tests.
|
||||
ifneq ($(OS_TARGET),Android)
|
||||
_TEST_FILES += \
|
||||
test_bug686137.html \
|
||||
test_contentDuration1.html \
|
||||
test_contentDuration2.html \
|
||||
test_contentDuration3.html \
|
||||
@ -269,10 +244,17 @@ _TEST_FILES += \
|
||||
contentDuration5.sjs \
|
||||
contentDuration6.sjs \
|
||||
contentDuration7.sjs \
|
||||
test_framebuffer.html \
|
||||
noContentLength.sjs \
|
||||
test_seekable2.html \
|
||||
test_seekable3.html \
|
||||
test_a4_tone.html \
|
||||
file_audio_event_adopt_iframe.html \
|
||||
test_audio_event_adopt.html \
|
||||
test_framebuffer.html \
|
||||
test_referer.html \
|
||||
test_bug726904.html \
|
||||
test_bug686137.html \
|
||||
$(NULL)
|
||||
endif
|
||||
else
|
||||
_TEST_FILES += \
|
||||
test_can_play_type_no_ogg.html \
|
||||
@ -292,21 +274,11 @@ endif
|
||||
ifdef MOZ_WAVE
|
||||
_TEST_FILES += \
|
||||
test_can_play_type_wave.html \
|
||||
$(NULL)
|
||||
|
||||
|
||||
# Bug 759221
|
||||
# These tests are not built on Android because they were failing when we
|
||||
# enabled these tests on Android. The intent is to re-enable them as soon
|
||||
# as possible, and/or switch to a cleaner way to manage known-to-fail tests.
|
||||
ifneq ($(OS_TARGET),Android)
|
||||
_TEST_FILES += \
|
||||
test_fragment_play.html \
|
||||
test_fragment_noplay.html \
|
||||
test_wave_data_u8.html \
|
||||
test_wave_data_s16.html \
|
||||
$(NULL)
|
||||
endif
|
||||
else
|
||||
_TEST_FILES += \
|
||||
test_can_play_type_no_wave.html \
|
||||
|
||||
@ -155,10 +155,6 @@ var gPlayTests = [
|
||||
// Optionally checks whether the file actually exists on disk at the location
|
||||
// we've specified.
|
||||
function fileUriToSrc(path, mustExist) {
|
||||
// android mochitest doesn't support file://
|
||||
if (navigator.appVersion.indexOf("Android") != -1)
|
||||
return path;
|
||||
|
||||
netscape.security.PrivilegeManager.enablePrivilege("UniversalXPConnect");
|
||||
const Ci = Components.interfaces;
|
||||
const Cc = Components.classes;
|
||||
|
||||
@ -35,6 +35,9 @@
|
||||
"content/base/test/websocket_hybi/test_receive-blob.html": "",
|
||||
"content/base/test/websocket_hybi/test_send-arraybuffer.html": "",
|
||||
"content/base/test/websocket_hybi/test_send-blob.html": "",
|
||||
"content/canvas/test/crossorigin/test_video_crossorigin.html": "",
|
||||
"content/canvas/test/test_canvas.html": "",
|
||||
"content/canvas/test/webgl/test_webgl_conformance_test_suite.html": "",
|
||||
"content/events/test/test_bug409604.html": "TIMED_OUT",
|
||||
"content/events/test/test_bug426082.html": "",
|
||||
"content/events/test/test_bug457672.html": "CRASH_DUMP, RANDOM",
|
||||
|
||||
@ -1,6 +1,4 @@
|
||||
{"content/canvas/test": "",
|
||||
"content/media/test": "",
|
||||
"content/smil/test": "",
|
||||
{"content/smil/test": "",
|
||||
"content/xml/document/test": "",
|
||||
"content/xslt/tests/mochitest": "",
|
||||
"dom/file/test": "",
|
||||
@ -27,3 +25,4 @@
|
||||
"parser/htmlparser/tests/mochitest": "",
|
||||
"js": ""
|
||||
}
|
||||
|
||||
|
||||
Loading…
Reference in New Issue
Block a user