466405 - Ogg and Wave specific mochitests should be hidden by appropriate build-time conditional

Status: RESOLVED FIXED

(Firefox Build System :: General, defect)

Description

[Matthew Gregan [:kinetik]]

All of the mochitests specified in content/media/video/test/Makefile.in are used when MOZ_MEDIA is defined (the "video" directory is conditional on MOZ_MEDIA).  It's possible to build with the Ogg or Wave decoder disabled, so the tests specific to a backend should be conditional on that backend's build-time config.

Comment 1

[Matthew Gregan [:kinetik]]

Attachment: patch v1

Comment 2

[(not currently active) Ted Mielczarek]

Comment on attachment 349689 [details] [diff] [review]
patch v1

Can you reformat this such that each test file is on its own line? Like:
+_TEST_FILES += \
   test_bug461281.html \

Comment 3

[Matthew Gregan [:kinetik]]

Attachment: patch v2

Done.  Also converted the spaces to tabs to bring it in line with the rest of our Makefiles.

Comment 4

[Serge Gautherie (:sgautherie)]

Comment on attachment 349821 [details] [diff] [review]
patch v2

>-                r11025_u8_c1.wav \
>-#                test_bug448534.html \
>-                $(NULL)
>+		seek.ogg \
>+#		test_bug448534.html \
>+		$(NULL)

This is only a "hack" if it works:
to be (future) safe, move the commented out line out/after of the list.

Comment 5

[Matthew Gregan [:kinetik]]

I'm not sure what the problem is.  Can you please explain?  That line was commented out the same way before my patch, and commenting it out that way works fine.

Comment 6

[Matthew Gregan [:kinetik]]

Attachment: patch v3

Rebased against current tip.  Hopefully this'll get checked in ASAP so it doesn't bitrot, since just about any work on the media stuff adds new tests.

Comment 7

[Matthew Gregan [:kinetik]]

Note that this reenables a test for bug 448534 that was disabled in August because of random crashes.  It's likely that the cause of the crash has since been fixed, so we should try to reenable this test and see what happens.

Comment 8

[cajbir (:cajbir)]

Pushed to mozilla-central:
http://hg.mozilla.org/mozilla-central/rev/64d08af48174

Comment 9

[Robert O'Callahan (:roc) (email my personal email if necessary)]

Pushed db50c5ff1757 to 1.9.1