Backed out changeset 5c28253351a2 (bug 1018402) for breaking Windows PGO Builds on a CLOSED TREE

This commit is contained in:
Carsten "Tomcat" Book 2014-06-27 10:56:40 +02:00
parent ce17f433bb
commit 75c4fb0c3e
2 changed files with 4 additions and 4 deletions

View File

@ -246,6 +246,9 @@ TEST(VP8VideoTrackEncoder, FetchMetaData)
}
// Encode test
// XXX(bug 1018402): Disable this test when compiled with VS2013 because it
// crashes.
#if !defined(_MSC_VER) || _MSC_VER < 1800
TEST(VP8VideoTrackEncoder, FrameEncode)
{
// Initiate VP8 encoder
@ -275,6 +278,7 @@ TEST(VP8VideoTrackEncoder, FrameEncode)
EncodedFrameContainer container;
EXPECT_TRUE(NS_SUCCEEDED(encoder.GetEncodedTrack(container)));
}
#endif // _MSC_VER
// EOS test
TEST(VP8VideoTrackEncoder, EncodeComplete)

View File

@ -110,10 +110,6 @@ vp8_asm_enc_offsets.asm: vp8_asm_enc_offsets.$(OBJ_SUFFIX) $(HOST_PROGRAM)
# It was generated solely so it could be parsed by obj_int_extract.
OBJS := $(filter-out vp8_asm_enc_offsets.$(OBJ_SUFFIX),$(OBJS))
# obj_int_extract doesn't understand files produced with the -Gw optimization.
vpx_scale_asm_offsets.$(OBJ_SUFFIX) vp8_asm_enc_offsets.$(OBJ_SUFFIX): \
COMPILE_CFLAGS := $(filter-out -Gw,$(COMPILE_CFLAGS))
endif
# Workaround a bug of Sun Studio (CR 6963410)