--- a/egl/egltest/src/eglteststep.cpp Tue Aug 31 16:31:06 2010 +0300
+++ b/egl/egltest/src/eglteststep.cpp Wed Sep 01 12:39:21 2010 +0100
@@ -1,4 +1,4 @@
-// Copyright (c) 2009-2010 Nokia Corporation and/or its subsidiary(-ies).
+// Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies).
// All rights reserved.
// This component and the accompanying materials are made available
// under the terms of "Eclipse Public License v1.0"
@@ -31,10 +31,6 @@
#include "egltest_image_multithread.h"
#include "egltest_image_multiprocess.h"
#include "egltest_benchmark_sgimage.h"
-#include "egltest_oom_sgimage.h"
-#include "egltest_stress_sgimage.h"
-#include "egltest_benchmark_swapbuffers.h"
-#include "egltest_surfacescaling.h"
/*
Entry point from egltest to create test step
@@ -68,7 +64,7 @@
else if (aStepName == KDisplay_OOM_ClientHeap_Initialize) testStep = new CEglTest_Display_OOM_ClientHeap_Initialize;
// SyncObject tests excluding WaitFlush which requires OpenVG and OpenGL ES
- else if (aStepName == KSyncObject_Positive_GetProcAddress) testStep = new CEglTest_SyncObject_Positive_GetProcAddress;
+ else if (aStepName == KSyncObject_Positive_GetProcAddress) testStep = new CEglTest_SyncObject_Positive_GetProcAddress;
else if (aStepName == KSyncObject_Positive_CreateDestroy) testStep = new CEglTest_SyncObject_Positive_CreateDestroy;
else if (aStepName == KSyncObject_Positive_WaitSignal) testStep = new CEglTest_SyncObject_Positive_WaitSignal;
else if (aStepName == KSyncObject_Positive_WaitSignal2) testStep = new CEglTest_SyncObject_Positive_WaitSignal2;
@@ -153,47 +149,10 @@
else if (aStepName == KEGL_Image_Multi_Process_VgImage_ProcessTerminateNegative) testStep = new CEglTest_EGL_Image_Multi_Process_VgImage_ProcessTerminateNegative;
else if (aStepName == KEGL_Image_Multi_Process_VgImage_ReadWrite) testStep = new CEglTest_EGL_Image_Multi_Process_VgImage_ReadWrite;
- // Benchmark - SgImage
+ // Benchmark
else if (aStepName == KBenchmark_CreateCloseImage) testStep = new CEglTest_Benchmark_CreateCloseImage;
else if (aStepName == KBenchmark_Multi_Process_CreateCloseImage) testStep = new CEglTest_Benchmark_Multi_Process_CreateCloseImage;
else if (aStepName == KBenchmark_DrawImage) testStep = new CEglTest_Benchmark_DrawImage;
- // Benchmark - SwapBuffers
- else if (aStepName == KBenchmark_SwapBuffers) testStep = new CEglTest_Benchmark_SwapBuffers;
-
- //OOM - SgImage
- else if (aStepName == KOOM_CloseVGImageWithTermination) testStep = new CEglTest_OOM_CloseVGImageWithTermination;
- else if (aStepName == KOOM_CloseVGImage) testStep = new CEglTest_OOM_CloseVGImage;
- else if (aStepName == KOOM_ClosePixmapSurfaceWithTermination) testStep = new CEglTest_OOM_ClosePixmapSurfaceWithTermination;
- else if (aStepName == KOOM_ClosePixmapSurface) testStep = new CEglTest_OOM_ClosePixmapSurface;
- else if (aStepName == KOOM_CloseSgImageDifferentProcess) testStep = new CEglTest_OOM_CloseSgImageDifferentProcess;
- else if (aStepName == KOOM_CloseSgImageSameThread) testStep = new CEglTest_OOM_CloseSgImageSameThread;
-
- //Stress - SgImage
- else if (aStepName == KStress) testStep = new CEglTest_Stress;
-
- // Surface Scaling
- else if (aStepName == KSurfaceScaling_Positive) testStep = new CEglTest_SurfaceScaling_Positive;
- else if (aStepName == KSurfaceScaling_WindowResize) testStep = new CEglTest_SurfaceScaling_WindowResize;
- else if (aStepName == KSurfaceScaling_ExtentPositionChange) testStep = new CEglTest_SurfaceScaling_ExtentPositionChange;
- else if (aStepName == KSurfaceScaling_ExtentSizeChange) testStep = new CEglTest_SurfaceScaling_ExtentSizeChange;
- else if (aStepName == KSurfaceScaling_SwapBuffers) testStep = new CEglTest_SurfaceScaling_SwapBuffers;
- else if (aStepName == KSurfaceScaling_WindowSurface_Check) testStep = new CEglTest_SurfaceScaling_WindowSurface_Check;
- else if (aStepName == KSurfaceScaling_Negative_CreateWindowSurface) testStep = new CEglTest_SurfaceScaling_Negative_CreateWindowSurface;
- else if (aStepName == KSurfaceScaling_Negative_FixedSize_NonWindowSurface) testStep = new CEglTest_SurfaceScaling_Negative_FixedSize_NonWindowSurface;
- else if (aStepName == KSurfaceScalingDefaultBorderColor) testStep = new CEglTest_SurfaceScalingDefaultBorderColor;
- else if (aStepName == KSurfaceScalingModifyingBorderColor) testStep = new CEglTest_SurfaceScalingModifyingBorderColor;
- else if (aStepName == KSurfaceScalingModifyingBorderColorNonFixed) testStep = new CEglTest_SurfaceScalingModifyingBorderColorNonFixed;
- else if (aStepName == KSurfaceScalingModifyingInvalidBorderColor) testStep = new CEglTest_SurfaceScalingModifyingInvalidBorderColor;
- else if (aStepName == KSurfaceScalingModifyingExtent) testStep = new CEglTest_SurfaceScalingModifyingExtent;
- else if (aStepName == KSurfaceScalingModifyingExtentNonFixed) testStep = new CEglTest_SurfaceScalingModifyingExtentNonFixed;
- else if (aStepName == KSurfaceScalingQuerySurface) testStep = new CEglTest_SurfaceScalingQuerySurface;
- else if (aStepName == KSurfaceScalingQuerySurfaceNonFixed) testStep = new CEglTest_SurfaceScalingQuerySurfaceNonFixed;
- else if (aStepName == KSurfaceScalingCapability) testStep = new CEglTest_SurfaceScalingCapability;
- else if (aStepName == KSurfaceScalingSet) testStep = new CEglTest_SurfaceScalingSet;
- else if (aStepName == KSurfaceScalingSetNonFixed) testStep = new CEglTest_SurfaceScalingSetNonFixed;
- else if (aStepName == KSurfaceScalingSetInvalidAttributes) testStep = new CEglTest_SurfaceScalingSetInvalidAttributes;
- else if (aStepName == KSurfaceScalingNotInitialized) testStep = new CEglTest_SurfaceScalingNotInitialized;
-
return testStep;
}