summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authoralokp@chromium.org <alokp@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-05-13 16:49:22 +0000
committeralokp@chromium.org <alokp@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-05-13 16:49:22 +0000
commit253b7154b231a8c46ed74eaef03b87bd2e642517 (patch)
treef0573763ecca2ed32f1dfc1b62e1b970f0e15a2d
parent9001c8ca3fa4ccd1dee1c54dbedf3e2619179f11 (diff)
downloadchromium_src-253b7154b231a8c46ed74eaef03b87bd2e642517.zip
chromium_src-253b7154b231a8c46ed74eaef03b87bd2e642517.tar.gz
chromium_src-253b7154b231a8c46ed74eaef03b87bd2e642517.tar.bz2
Enabled gpu unit-tests on linux.
BUG=40015 TEST=GPU unit tests Review URL: http://codereview.chromium.org/2063001 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@47153 0039d316-1c4b-4281-b951-d872f2087c98
-rw-r--r--gpu/command_buffer/service/gpu_processor_unittest.cc30
1 files changed, 10 insertions, 20 deletions
diff --git a/gpu/command_buffer/service/gpu_processor_unittest.cc b/gpu/command_buffer/service/gpu_processor_unittest.cc
index 6245a93..82aca8f 100644
--- a/gpu/command_buffer/service/gpu_processor_unittest.cc
+++ b/gpu/command_buffer/service/gpu_processor_unittest.cc
@@ -88,8 +88,7 @@ class GPUProcessorTest : public testing::Test {
scoped_ptr<GPUProcessor> processor_;
};
-// TODO(apatrick): This test is broken on linux.
-TEST_F(GPUProcessorTest, DISABLED_ProcessorDoesNothingIfRingBufferIsEmpty) {
+TEST_F(GPUProcessorTest, ProcessorDoesNothingIfRingBufferIsEmpty) {
CommandBuffer::State state;
state.put_offset = 0;
@@ -103,8 +102,7 @@ TEST_F(GPUProcessorTest, DISABLED_ProcessorDoesNothingIfRingBufferIsEmpty) {
processor_->ProcessCommands();
}
-// TODO(apatrick): This test is broken on linux.
-TEST_F(GPUProcessorTest, DISABLED_ProcessesOneCommand) {
+TEST_F(GPUProcessorTest, ProcessesOneCommand) {
CommandHeader* header = reinterpret_cast<CommandHeader*>(&buffer_[0]);
header[0].command = 7;
header[0].size = 2;
@@ -126,8 +124,7 @@ TEST_F(GPUProcessorTest, DISABLED_ProcessesOneCommand) {
processor_->ProcessCommands();
}
-// TODO(apatrick): This test is broken on linux.
-TEST_F(GPUProcessorTest, DISABLED_ProcessesTwoCommands) {
+TEST_F(GPUProcessorTest, ProcessesTwoCommands) {
CommandHeader* header = reinterpret_cast<CommandHeader*>(&buffer_[0]);
header[0].command = 7;
header[0].size = 2;
@@ -151,8 +148,7 @@ TEST_F(GPUProcessorTest, DISABLED_ProcessesTwoCommands) {
processor_->ProcessCommands();
}
-// TODO(apatrick): This test is broken on linux.
-TEST_F(GPUProcessorTest, DISABLED_ProcessorSetsTheGLContext) {
+TEST_F(GPUProcessorTest, ProcessorSetsTheGLContext) {
EXPECT_CALL(*decoder_, MakeCurrent())
.WillOnce(Return(true));
@@ -166,8 +162,7 @@ TEST_F(GPUProcessorTest, DISABLED_ProcessorSetsTheGLContext) {
processor_->ProcessCommands();
}
-// TODO(apatrick): This test is broken on linux.
-TEST_F(GPUProcessorTest, DISABLED_PostsTaskToFinishRemainingCommands) {
+TEST_F(GPUProcessorTest, PostsTaskToFinishRemainingCommands) {
CommandHeader* header = reinterpret_cast<CommandHeader*>(&buffer_[0]);
header[0].command = 7;
header[0].size = 2;
@@ -207,8 +202,7 @@ TEST_F(GPUProcessorTest, DISABLED_PostsTaskToFinishRemainingCommands) {
MessageLoop::current()->RunAllPending();
}
-// TODO(apatrick): This test is broken on linux.
-TEST_F(GPUProcessorTest, DISABLED_SetsErrorCodeOnCommandBuffer) {
+TEST_F(GPUProcessorTest, SetsErrorCodeOnCommandBuffer) {
CommandHeader* header = reinterpret_cast<CommandHeader*>(&buffer_[0]);
header[0].command = 7;
header[0].size = 1;
@@ -229,8 +223,7 @@ TEST_F(GPUProcessorTest, DISABLED_SetsErrorCodeOnCommandBuffer) {
processor_->ProcessCommands();
}
-// TODO(apatrick): This test is broken on linux.
-TEST_F(GPUProcessorTest, DISABLED_ProcessCommandsDoesNothingAfterError) {
+TEST_F(GPUProcessorTest, ProcessCommandsDoesNothingAfterError) {
CommandBuffer::State state;
state.error = error::kGenericError;
@@ -240,8 +233,7 @@ TEST_F(GPUProcessorTest, DISABLED_ProcessCommandsDoesNothingAfterError) {
processor_->ProcessCommands();
}
-// TODO(apatrick): This test is broken on linux.
-TEST_F(GPUProcessorTest, DISABLED_CanGetAddressOfSharedMemory) {
+TEST_F(GPUProcessorTest, CanGetAddressOfSharedMemory) {
EXPECT_CALL(*command_buffer_.get(), GetTransferBuffer(7))
.WillOnce(Return(shared_memory_buffer_));
@@ -252,16 +244,14 @@ ACTION_P2(SetPointee, address, value) {
*address = value;
}
-// TODO(apatrick): This test is broken on linux.
-TEST_F(GPUProcessorTest, DISABLED_CanGetSizeOfSharedMemory) {
+TEST_F(GPUProcessorTest, CanGetSizeOfSharedMemory) {
EXPECT_CALL(*command_buffer_.get(), GetTransferBuffer(7))
.WillOnce(Return(shared_memory_buffer_));
EXPECT_EQ(kRingBufferSize, processor_->GetSharedMemoryBuffer(7).size);
}
-// TODO(apatrick): This test is broken on linux.
-TEST_F(GPUProcessorTest, DISABLED_SetTokenForwardsToCommandBuffer) {
+TEST_F(GPUProcessorTest, SetTokenForwardsToCommandBuffer) {
EXPECT_CALL(*command_buffer_, SetToken(7));
processor_->set_token(7);
}