1,修改黄区编译问题；2,修改acts脚本打包问题

Signed-off-by: Nwangshi <wangshi@kaihong.com>

graphic/vkgl/cpvkgl.sh

@@ -17,7 +17,8 @@ set -e
 
 mkdir -p  "suites/acts/testcases/vkgldata"
 cp -rf "../../third_party/VK-GL-CTS/external/openglcts/data" "suites/acts/testcases/vkgldata"
-tar czvf "vkgldata.tar.gz" -C "suites/acts/testcases/vkgldata" "data"
+tar czvf "vkgldata.tar.gz" -C "suites/acts/testcases/vkgldata" "."
+mv "vkgldata.tar.gz" "suites/acts/testcases/vkgldata"
 cp -rf "common/common/libdeqp_ohos_platform.z.so" "suites/acts/testcases/vkgldata"
 cp -rf "common/common/librosen_context.z.so" "suites/acts/testcases/vkgldata"
 cp -rf "graphic/graphic_standard/libdeqp_SPIRV.z.so" "suites/acts/testcases/vkgldata"

graphic/vkgl/src/deqpgles2/ActsDeqpgles20001TestSuite.cpp

@@ -47,7 +47,7 @@ namespace OHOS {
         printf("Test run totals --- Notsupport[%d]\n", runResult.numNotSupported);
         printf("Test run totals --- Warnings[%d]\n", runResult.numWarnings);
         printf("Test run totals --- Waved[%d]\n", runResult.numWaived);
-        printf("testmain end --- COST TIME[%lld]\n", (endTime-startTime));
+        cout << "testmain end --- COST TIME ["<< (endTime-startTime) << "]" << std::endl;;
     }
     // Preset action of the test case
     void ActsDeqpgles20001TestSuite::SetUp(void)

graphic/vkgl/src/deqpgles2/ActsDeqpgles20002TestSuite.cpp

@@ -47,7 +47,7 @@ namespace OHOS {
         printf("Test run totals --- Notsupport[%d]\n", runResult.numNotSupported);
         printf("Test run totals --- Warnings[%d]\n", runResult.numWarnings);
         printf("Test run totals --- Waved[%d]\n", runResult.numWaived);
-        printf("testmain end --- COST TIME[%lld]\n", (endTime-startTime));
+        cout << "testmain end --- COST TIME ["<< (endTime-startTime) << "]" << std::endl;;
     }
     // Preset action of the test case
     void ActsDeqpgles20002TestSuite::SetUp(void)

graphic/vkgl/src/deqpgles2/ActsDeqpgles20003TestSuite.cpp

@@ -47,7 +47,7 @@ namespace OHOS {
         printf("Test run totals --- Notsupport[%d]\n", runResult.numNotSupported);
         printf("Test run totals --- Warnings[%d]\n", runResult.numWarnings);
         printf("Test run totals --- Waved[%d]\n", runResult.numWaived);
-        printf("testmain end --- COST TIME[%lld]\n", (endTime-startTime));
+        cout << "testmain end --- COST TIME ["<< (endTime-startTime) << "]" << std::endl;;
     }
     // Preset action of the test case
     void ActsDeqpgles20003TestSuite::SetUp(void)

graphic/vkgl/src/deqpgles2/ActsDeqpgles20004TestSuite.cpp

@@ -47,7 +47,7 @@ namespace OHOS {
         printf("Test run totals --- Notsupport[%d]\n", runResult.numNotSupported);
         printf("Test run totals --- Warnings[%d]\n", runResult.numWarnings);
         printf("Test run totals --- Waved[%d]\n", runResult.numWaived);
-        printf("testmain end --- COST TIME[%lld]\n", (endTime-startTime));
+        cout << "testmain end --- COST TIME ["<< (endTime-startTime) << "]" << std::endl;;
     }
     // Preset action of the test case
     void ActsDeqpgles20004TestSuite::SetUp(void)

graphic/vkgl/src/deqpgles2/ActsDeqpgles20005TestSuite.cpp

@@ -47,7 +47,7 @@ namespace OHOS {
         printf("Test run totals --- Notsupport[%d]\n", runResult.numNotSupported);
         printf("Test run totals --- Warnings[%d]\n", runResult.numWarnings);
         printf("Test run totals --- Waved[%d]\n", runResult.numWaived);
-        printf("testmain end --- COST TIME[%lld]\n", (endTime-startTime));
+        cout << "testmain end --- COST TIME ["<< (endTime-startTime) << "]" << std::endl;;
     }
     // Preset action of the test case
     void ActsDeqpgles20005TestSuite::SetUp(void)

graphic/vkgl/src/deqpgles2/ActsDeqpgles20006TestSuite.cpp

@@ -47,7 +47,7 @@ namespace OHOS {
         printf("Test run totals --- Notsupport[%d]\n", runResult.numNotSupported);
         printf("Test run totals --- Warnings[%d]\n", runResult.numWarnings);
         printf("Test run totals --- Waved[%d]\n", runResult.numWaived);
-        printf("testmain end --- COST TIME[%lld]\n", (endTime-startTime));
+        cout << "testmain end --- COST TIME ["<< (endTime-startTime) << "]" << std::endl;;
     }
     // Preset action of the test case
     void ActsDeqpgles20006TestSuite::SetUp(void)

graphic/vkgl/src/deqpgles2/ActsDeqpgles20007TestSuite.cpp

@@ -47,7 +47,7 @@ namespace OHOS {
         printf("Test run totals --- Notsupport[%d]\n", runResult.numNotSupported);
         printf("Test run totals --- Warnings[%d]\n", runResult.numWarnings);
         printf("Test run totals --- Waved[%d]\n", runResult.numWaived);
-        printf("testmain end --- COST TIME[%lld]\n", (endTime-startTime));
+        cout << "testmain end --- COST TIME ["<< (endTime-startTime) << "]" << std::endl;;
     }
     // Preset action of the test case
     void ActsDeqpgles20007TestSuite::SetUp(void)

graphic/vkgl/src/deqpgles2/ActsDeqpgles20008TestSuite.cpp

@@ -47,7 +47,7 @@ namespace OHOS {
         printf("Test run totals --- Notsupport[%d]\n", runResult.numNotSupported);
         printf("Test run totals --- Warnings[%d]\n", runResult.numWarnings);
         printf("Test run totals --- Waved[%d]\n", runResult.numWaived);
-        printf("testmain end --- COST TIME[%lld]\n", (endTime-startTime));
+        cout << "testmain end --- COST TIME ["<< (endTime-startTime) << "]" << std::endl;;
     }
     // Preset action of the test case
     void ActsDeqpgles20008TestSuite::SetUp(void)

graphic/vkgl/src/deqpgles2/ActsDeqpgles20009TestSuite.cpp

@@ -47,7 +47,7 @@ namespace OHOS {
         printf("Test run totals --- Notsupport[%d]\n", runResult.numNotSupported);
         printf("Test run totals --- Warnings[%d]\n", runResult.numWarnings);
         printf("Test run totals --- Waved[%d]\n", runResult.numWaived);
-        printf("testmain end --- COST TIME[%lld]\n", (endTime-startTime));
+        cout << "testmain end --- COST TIME ["<< (endTime-startTime) << "]" << std::endl;;
     }
     // Preset action of the test case
     void ActsDeqpgles20009TestSuite::SetUp(void)

graphic/vkgl/src/deqpgles2/ActsDeqpgles20010TestSuite.cpp

@@ -47,7 +47,7 @@ namespace OHOS {
         printf("Test run totals --- Notsupport[%d]\n", runResult.numNotSupported);
         printf("Test run totals --- Warnings[%d]\n", runResult.numWarnings);
         printf("Test run totals --- Waved[%d]\n", runResult.numWaived);
-        printf("testmain end --- COST TIME[%lld]\n", (endTime-startTime));
+        cout << "testmain end --- COST TIME ["<< (endTime-startTime) << "]" << std::endl;;
     }
     // Preset action of the test case
     void ActsDeqpgles20010TestSuite::SetUp(void)

graphic/vkgl/src/deqpgles2/ActsDeqpgles20011TestSuite.cpp

@@ -47,7 +47,7 @@ namespace OHOS {
         printf("Test run totals --- Notsupport[%d]\n", runResult.numNotSupported);
         printf("Test run totals --- Warnings[%d]\n", runResult.numWarnings);
         printf("Test run totals --- Waved[%d]\n", runResult.numWaived);
-        printf("testmain end --- COST TIME[%lld]\n", (endTime-startTime));
+        cout << "testmain end --- COST TIME ["<< (endTime-startTime) << "]" << std::endl;;
     }
     // Preset action of the test case
     void ActsDeqpgles20011TestSuite::SetUp(void)

graphic/vkgl/src/deqpgles2/ActsDeqpgles20012TestSuite.cpp

@@ -47,7 +47,7 @@ namespace OHOS {
         printf("Test run totals --- Notsupport[%d]\n", runResult.numNotSupported);
         printf("Test run totals --- Warnings[%d]\n", runResult.numWarnings);
         printf("Test run totals --- Waved[%d]\n", runResult.numWaived);
-        printf("testmain end --- COST TIME[%lld]\n", (endTime-startTime));
+        cout << "testmain end --- COST TIME ["<< (endTime-startTime) << "]" << std::endl;;
     }
     // Preset action of the test case
     void ActsDeqpgles20012TestSuite::SetUp(void)

graphic/vkgl/src/deqpgles2/ActsDeqpgles20013TestSuite.cpp

@@ -47,7 +47,7 @@ namespace OHOS {
         printf("Test run totals --- Notsupport[%d]\n", runResult.numNotSupported);
         printf("Test run totals --- Warnings[%d]\n", runResult.numWarnings);
         printf("Test run totals --- Waved[%d]\n", runResult.numWaived);
-        printf("testmain end --- COST TIME[%lld]\n", (endTime-startTime));
+        cout << "testmain end --- COST TIME ["<< (endTime-startTime) << "]" << std::endl;;
     }
     // Preset action of the test case
     void ActsDeqpgles20013TestSuite::SetUp(void)

graphic/vkgl/src/deqpgles2/ActsDeqpgles20014TestSuite.cpp

@@ -47,7 +47,7 @@ namespace OHOS {
         printf("Test run totals --- Notsupport[%d]\n", runResult.numNotSupported);
         printf("Test run totals --- Warnings[%d]\n", runResult.numWarnings);
         printf("Test run totals --- Waved[%d]\n", runResult.numWaived);
-        printf("testmain end --- COST TIME[%lld]\n", (endTime-startTime));
+        cout << "testmain end --- COST TIME ["<< (endTime-startTime) << "]" << std::endl;;
     }
     // Preset action of the test case
     void ActsDeqpgles20014TestSuite::SetUp(void)

graphic/vkgl/src/deqpgles2/ActsDeqpgles20015TestSuite.cpp

@@ -47,7 +47,7 @@ namespace OHOS {
         printf("Test run totals --- Notsupport[%d]\n", runResult.numNotSupported);
         printf("Test run totals --- Warnings[%d]\n", runResult.numWarnings);
         printf("Test run totals --- Waved[%d]\n", runResult.numWaived);
-        printf("testmain end --- COST TIME[%lld]\n", (endTime-startTime));
+        cout << "testmain end --- COST TIME ["<< (endTime-startTime) << "]" << std::endl;;
     }
     // Preset action of the test case
     void ActsDeqpgles20015TestSuite::SetUp(void)

graphic/vkgl/src/deqpgles2/ActsDeqpgles20016TestSuite.cpp

@@ -47,7 +47,7 @@ namespace OHOS {
         printf("Test run totals --- Notsupport[%d]\n", runResult.numNotSupported);
         printf("Test run totals --- Warnings[%d]\n", runResult.numWarnings);
         printf("Test run totals --- Waved[%d]\n", runResult.numWaived);
-        printf("testmain end --- COST TIME[%lld]\n", (endTime-startTime));
+        cout << "testmain end --- COST TIME ["<< (endTime-startTime) << "]" << std::endl;;
     }
     // Preset action of the test case
     void ActsDeqpgles20016TestSuite::SetUp(void)

graphic/vkgl/src/deqpgles2/ActsDeqpgles20017TestSuite.cpp

@@ -47,7 +47,7 @@ namespace OHOS {
         printf("Test run totals --- Notsupport[%d]\n", runResult.numNotSupported);
         printf("Test run totals --- Warnings[%d]\n", runResult.numWarnings);
         printf("Test run totals --- Waved[%d]\n", runResult.numWaived);
-        printf("testmain end --- COST TIME[%lld]\n", (endTime-startTime));
+        cout << "testmain end --- COST TIME ["<< (endTime-startTime) << "]" << std::endl;;
     }
     // Preset action of the test case
     void ActsDeqpgles20017TestSuite::SetUp(void)

graphic/vkgl/src/deqpgles2/ActsDeqpgles2TestSuite.cpp

@@ -47,7 +47,7 @@ namespace OHOS {
         printf("Test run totals --- Notsupport[%d]\n", runResult.numNotSupported);
         printf("Test run totals --- Warnings[%d]\n", runResult.numWarnings);
         printf("Test run totals --- Waved[%d]\n", runResult.numWaived);
-        printf("testmain end --- COST TIME[%lld]\n", (endTime-startTime));
+        cout << "testmain end --- COST TIME ["<< (endTime-startTime) << "]" << std::endl;;
     }
     // Preset action of the test case
     void ActsDeqpgles2TestSuite::SetUp(void)

graphic/vkgl/src/deqpgles2/build0001/BUILD.gn

@@ -25,10 +25,10 @@ config("deqp_platform_ohos_config") {
   defines = deqp_common_defines
 
   # defines -=["DE_PTR_SIZE=8"]
-  defines += [
-    "DE_PTR_SIZE=4",
-    "_XOPEN_SOURCE=600",
-  ]
+  #defines += [
+#    "DE_PTR_SIZE=4",
+#    "_XOPEN_SOURCE=600",
+#  ]
 }
 
 ohos_static_library("libdeqpgles2func0001") {

graphic/vkgl/src/deqpgles2/build0002/BUILD.gn

@@ -25,10 +25,10 @@ config("deqp_platform_ohos_config") {
   defines = deqp_common_defines
 
   # defines -=["DE_PTR_SIZE=8"]
-  defines += [
-    "DE_PTR_SIZE=4",
-    "_XOPEN_SOURCE=600",
-  ]
+  #defines += [
+#    "DE_PTR_SIZE=4",
+#    "_XOPEN_SOURCE=600",
+#  ]
 }
 
 ohos_static_library("libdeqpgles2func0002") {

graphic/vkgl/src/deqpgles2/build0003/BUILD.gn

@@ -25,10 +25,10 @@ config("deqp_platform_ohos_config") {
   defines = deqp_common_defines
 
   # defines -=["DE_PTR_SIZE=8"]
-  defines += [
-    "DE_PTR_SIZE=4",
-    "_XOPEN_SOURCE=600",
-  ]
+  #defines += [
+#    "DE_PTR_SIZE=4",
+#    "_XOPEN_SOURCE=600",
+#  ]
 }
 
 ohos_static_library("libdeqpgles2func0003") {

graphic/vkgl/src/deqpgles2/build0004/BUILD.gn

@@ -25,10 +25,10 @@ config("deqp_platform_ohos_config") {
   defines = deqp_common_defines
 
   # defines -=["DE_PTR_SIZE=8"]
-  defines += [
-    "DE_PTR_SIZE=4",
-    "_XOPEN_SOURCE=600",
-  ]
+  #defines += [
+#    "DE_PTR_SIZE=4",
+#    "_XOPEN_SOURCE=600",
+#  ]
 }
 
 ohos_static_library("libdeqpgles2func0004") {

graphic/vkgl/src/deqpgles2/build0005/BUILD.gn

@@ -25,10 +25,10 @@ config("deqp_platform_ohos_config") {
   defines = deqp_common_defines
 
   # defines -=["DE_PTR_SIZE=8"]
-  defines += [
-    "DE_PTR_SIZE=4",
-    "_XOPEN_SOURCE=600",
-  ]
+  #defines += [
+#    "DE_PTR_SIZE=4",
+#    "_XOPEN_SOURCE=600",
+#  ]
 }
 
 ohos_static_library("libdeqpgles2func0005") {

graphic/vkgl/src/deqpgles2/build0006/BUILD.gn

@@ -25,10 +25,10 @@ config("deqp_platform_ohos_config") {
   defines = deqp_common_defines
 
   # defines -=["DE_PTR_SIZE=8"]
-  defines += [
-    "DE_PTR_SIZE=4",
-    "_XOPEN_SOURCE=600",
-  ]
+  #defines += [
+#    "DE_PTR_SIZE=4",
+#    "_XOPEN_SOURCE=600",
+#  ]
 }
 
 ohos_static_library("libdeqpgles2func0006") {

graphic/vkgl/src/deqpgles2/build0007/BUILD.gn

@@ -25,10 +25,10 @@ config("deqp_platform_ohos_config") {
   defines = deqp_common_defines
 
   # defines -=["DE_PTR_SIZE=8"]
-  defines += [
-    "DE_PTR_SIZE=4",
-    "_XOPEN_SOURCE=600",
-  ]
+  #defines += [
+#    "DE_PTR_SIZE=4",
+#    "_XOPEN_SOURCE=600",
+#  ]
 }
 
 ohos_static_library("libdeqpgles2func0007") {

graphic/vkgl/src/deqpgles2/build0008/BUILD.gn

@@ -25,10 +25,10 @@ config("deqp_platform_ohos_config") {
   defines = deqp_common_defines
 
   # defines -=["DE_PTR_SIZE=8"]
-  defines += [
-    "DE_PTR_SIZE=4",
-    "_XOPEN_SOURCE=600",
-  ]
+  #defines += [
+#    "DE_PTR_SIZE=4",
+#    "_XOPEN_SOURCE=600",
+#  ]
 }
 
 ohos_static_library("libdeqpgles2func0008") {

graphic/vkgl/src/deqpgles2/build0009/BUILD.gn

@@ -25,10 +25,10 @@ config("deqp_platform_ohos_config") {
   defines = deqp_common_defines
 
   # defines -=["DE_PTR_SIZE=8"]
-  defines += [
-    "DE_PTR_SIZE=4",
-    "_XOPEN_SOURCE=600",
-  ]
+  #defines += [
+#    "DE_PTR_SIZE=4",
+#    "_XOPEN_SOURCE=600",
+#  ]
 }
 
 ohos_static_library("libdeqpgles2func0009") {

graphic/vkgl/src/deqpgles2/build0010/BUILD.gn

@@ -25,10 +25,10 @@ config("deqp_platform_ohos_config") {
   defines = deqp_common_defines
 
   # defines -=["DE_PTR_SIZE=8"]
-  defines += [
-    "DE_PTR_SIZE=4",
-    "_XOPEN_SOURCE=600",
-  ]
+  #defines += [
+#    "DE_PTR_SIZE=4",
+#    "_XOPEN_SOURCE=600",
+#  ]
 }
 
 ohos_static_library("libdeqpgles2func0010") {

graphic/vkgl/src/deqpgles2/build0011/BUILD.gn

@@ -25,10 +25,10 @@ config("deqp_platform_ohos_config") {
   defines = deqp_common_defines
 
   # defines -=["DE_PTR_SIZE=8"]
-  defines += [
-    "DE_PTR_SIZE=4",
-    "_XOPEN_SOURCE=600",
-  ]
+  #defines += [
+#    "DE_PTR_SIZE=4",
+#    "_XOPEN_SOURCE=600",
+#  ]
 }
 
 ohos_static_library("libdeqpgles2func0011") {

graphic/vkgl/src/deqpgles2/build0012/BUILD.gn

@@ -25,10 +25,10 @@ config("deqp_platform_ohos_config") {
   defines = deqp_common_defines
 
   # defines -=["DE_PTR_SIZE=8"]
-  defines += [
-    "DE_PTR_SIZE=4",
-    "_XOPEN_SOURCE=600",
-  ]
+  #defines += [
+#    "DE_PTR_SIZE=4",
+#    "_XOPEN_SOURCE=600",
+#  ]
 }
 
 ohos_static_library("libdeqpgles2func0012") {

graphic/vkgl/src/deqpgles2/build0013/BUILD.gn

@@ -25,10 +25,10 @@ config("deqp_platform_ohos_config") {
   defines = deqp_common_defines
 
   # defines -=["DE_PTR_SIZE=8"]
-  defines += [
-    "DE_PTR_SIZE=4",
-    "_XOPEN_SOURCE=600",
-  ]
+  #defines += [
+#    "DE_PTR_SIZE=4",
+#    "_XOPEN_SOURCE=600",
+#  ]
 }
 
 ohos_static_library("libdeqpgles2func0013") {

graphic/vkgl/src/deqpgles2/build0014/BUILD.gn

@@ -25,10 +25,10 @@ config("deqp_platform_ohos_config") {
   defines = deqp_common_defines
 
   # defines -=["DE_PTR_SIZE=8"]
-  defines += [
-    "DE_PTR_SIZE=4",
-    "_XOPEN_SOURCE=600",
-  ]
+  #defines += [
+#    "DE_PTR_SIZE=4",
+#    "_XOPEN_SOURCE=600",
+#  ]
 }
 
 ohos_static_library("libdeqpgles2func0014") {

graphic/vkgl/src/deqpgles2/build0015/BUILD.gn

@@ -25,10 +25,10 @@ config("deqp_platform_ohos_config") {
   defines = deqp_common_defines
 
   # defines -=["DE_PTR_SIZE=8"]
-  defines += [
-    "DE_PTR_SIZE=4",
-    "_XOPEN_SOURCE=600",
-  ]
+  #defines += [
+#    "DE_PTR_SIZE=4",
+#    "_XOPEN_SOURCE=600",
+#  ]
 }
 
 ohos_static_library("libdeqpgles2func0015") {

graphic/vkgl/src/deqpgles2/build0016/BUILD.gn

@@ -25,10 +25,10 @@ config("deqp_platform_ohos_config") {
   defines = deqp_common_defines
 
   # defines -=["DE_PTR_SIZE=8"]
-  defines += [
-    "DE_PTR_SIZE=4",
-    "_XOPEN_SOURCE=600",
-  ]
+  #defines += [
+#    "DE_PTR_SIZE=4",
+#    "_XOPEN_SOURCE=600",
+#  ]
 }
 
 ohos_static_library("libdeqpgles2func0016") {

graphic/vkgl/src/deqpgles2/build0017/BUILD.gn

@@ -25,10 +25,10 @@ config("deqp_platform_ohos_config") {
   defines = deqp_common_defines
 
   # defines -=["DE_PTR_SIZE=8"]
-  defines += [
-    "DE_PTR_SIZE=4",
-    "_XOPEN_SOURCE=600",
-  ]
+  #defines += [
+#    "DE_PTR_SIZE=4",
+#    "_XOPEN_SOURCE=600",
+#  ]
 }
 
 ohos_static_library("libdeqpgles2func0017") {

graphic/vkgl/src/deqpgles3/ActsDeqpgles30001TestSuite.cpp

@@ -47,7 +47,7 @@ namespace OHOS {
         printf("Test run totals --- Notsupport[%d]\n", runResult.numNotSupported);
         printf("Test run totals --- Warnings[%d]\n", runResult.numWarnings);
         printf("Test run totals --- Waved[%d]\n", runResult.numWaived);
-        printf("testmain end --- COST TIME[%lld]\n", (endTime-startTime));
+        cout << "testmain end --- COST TIME ["<< (endTime-startTime) << "]" << std::endl;;
     }
     // Preset action of the test case
     void ActsDeqpgles30001TestSuite::SetUp(void)

graphic/vkgl/src/deqpgles3/ActsDeqpgles30002TestSuite.cpp

@@ -47,7 +47,7 @@ namespace OHOS {
         printf("Test run totals --- Notsupport[%d]\n", runResult.numNotSupported);
         printf("Test run totals --- Warnings[%d]\n", runResult.numWarnings);
         printf("Test run totals --- Waved[%d]\n", runResult.numWaived);
-        printf("testmain end --- COST TIME[%lld]\n", (endTime-startTime));
+        cout << "testmain end --- COST TIME ["<< (endTime-startTime) << "]" << std::endl;;
     }
     // Preset action of the test case
     void ActsDeqpgles30002TestSuite::SetUp(void)

graphic/vkgl/src/deqpgles3/ActsDeqpgles30003TestSuite.cpp

@@ -47,7 +47,7 @@ namespace OHOS {
         printf("Test run totals --- Notsupport[%d]\n", runResult.numNotSupported);
         printf("Test run totals --- Warnings[%d]\n", runResult.numWarnings);
         printf("Test run totals --- Waved[%d]\n", runResult.numWaived);
-        printf("testmain end --- COST TIME[%lld]\n", (endTime-startTime));
+        cout << "testmain end --- COST TIME ["<< (endTime-startTime) << "]" << std::endl;;
     }
     // Preset action of the test case
     void ActsDeqpgles30003TestSuite::SetUp(void)

graphic/vkgl/src/deqpgles3/ActsDeqpgles30004TestSuite.cpp

@@ -47,7 +47,7 @@ namespace OHOS {
         printf("Test run totals --- Notsupport[%d]\n", runResult.numNotSupported);
         printf("Test run totals --- Warnings[%d]\n", runResult.numWarnings);
         printf("Test run totals --- Waved[%d]\n", runResult.numWaived);
-        printf("testmain end --- COST TIME[%lld]\n", (endTime-startTime));
+        cout << "testmain end --- COST TIME ["<< (endTime-startTime) << "]" << std::endl;;
     }
     // Preset action of the test case
     void ActsDeqpgles30004TestSuite::SetUp(void)

graphic/vkgl/src/deqpgles3/ActsDeqpgles30005TestSuite.cpp

@@ -47,7 +47,7 @@ namespace OHOS {
         printf("Test run totals --- Notsupport[%d]\n", runResult.numNotSupported);
         printf("Test run totals --- Warnings[%d]\n", runResult.numWarnings);
         printf("Test run totals --- Waved[%d]\n", runResult.numWaived);
-        printf("testmain end --- COST TIME[%lld]\n", (endTime-startTime));
+        cout << "testmain end --- COST TIME ["<< (endTime-startTime) << "]" << std::endl;;
     }
     // Preset action of the test case
     void ActsDeqpgles30005TestSuite::SetUp(void)

graphic/vkgl/src/deqpgles3/ActsDeqpgles30006TestSuite.cpp

@@ -47,7 +47,7 @@ namespace OHOS {
         printf("Test run totals --- Notsupport[%d]\n", runResult.numNotSupported);
         printf("Test run totals --- Warnings[%d]\n", runResult.numWarnings);
         printf("Test run totals --- Waved[%d]\n", runResult.numWaived);
-        printf("testmain end --- COST TIME[%lld]\n", (endTime-startTime));
+        cout << "testmain end --- COST TIME ["<< (endTime-startTime) << "]" << std::endl;;
     }
     // Preset action of the test case
     void ActsDeqpgles30006TestSuite::SetUp(void)

graphic/vkgl/src/deqpgles3/ActsDeqpgles30007TestSuite.cpp

@@ -47,7 +47,7 @@ namespace OHOS {
         printf("Test run totals --- Notsupport[%d]\n", runResult.numNotSupported);
         printf("Test run totals --- Warnings[%d]\n", runResult.numWarnings);
         printf("Test run totals --- Waved[%d]\n", runResult.numWaived);
-        printf("testmain end --- COST TIME[%lld]\n", (endTime-startTime));
+        cout << "testmain end --- COST TIME ["<< (endTime-startTime) << "]" << std::endl;;
     }
     // Preset action of the test case
     void ActsDeqpgles30007TestSuite::SetUp(void)

graphic/vkgl/src/deqpgles3/ActsDeqpgles30008TestSuite.cpp

@@ -47,7 +47,7 @@ namespace OHOS {
         printf("Test run totals --- Notsupport[%d]\n", runResult.numNotSupported);
         printf("Test run totals --- Warnings[%d]\n", runResult.numWarnings);
         printf("Test run totals --- Waved[%d]\n", runResult.numWaived);
-        printf("testmain end --- COST TIME[%lld]\n", (endTime-startTime));
+        cout << "testmain end --- COST TIME ["<< (endTime-startTime) << "]" << std::endl;;
     }
     // Preset action of the test case
     void ActsDeqpgles30008TestSuite::SetUp(void)

graphic/vkgl/src/deqpgles3/ActsDeqpgles30009TestSuite.cpp

@@ -47,7 +47,7 @@ namespace OHOS {
         printf("Test run totals --- Notsupport[%d]\n", runResult.numNotSupported);
         printf("Test run totals --- Warnings[%d]\n", runResult.numWarnings);
         printf("Test run totals --- Waved[%d]\n", runResult.numWaived);
-        printf("testmain end --- COST TIME[%lld]\n", (endTime-startTime));
+        cout << "testmain end --- COST TIME ["<< (endTime-startTime) << "]" << std::endl;;
     }
     // Preset action of the test case
     void ActsDeqpgles30009TestSuite::SetUp(void)

graphic/vkgl/src/deqpgles3/ActsDeqpgles30010TestSuite.cpp

@@ -47,7 +47,7 @@ namespace OHOS {
         printf("Test run totals --- Notsupport[%d]\n", runResult.numNotSupported);
         printf("Test run totals --- Warnings[%d]\n", runResult.numWarnings);
         printf("Test run totals --- Waved[%d]\n", runResult.numWaived);
-        printf("testmain end --- COST TIME[%lld]\n", (endTime-startTime));
+        cout << "testmain end --- COST TIME ["<< (endTime-startTime) << "]" << std::endl;;
     }
     // Preset action of the test case
     void ActsDeqpgles30010TestSuite::SetUp(void)

graphic/vkgl/src/deqpgles3/ActsDeqpgles30011TestSuite.cpp

@@ -47,7 +47,7 @@ namespace OHOS {
         printf("Test run totals --- Notsupport[%d]\n", runResult.numNotSupported);
         printf("Test run totals --- Warnings[%d]\n", runResult.numWarnings);
         printf("Test run totals --- Waved[%d]\n", runResult.numWaived);
-        printf("testmain end --- COST TIME[%lld]\n", (endTime-startTime));
+        cout << "testmain end --- COST TIME ["<< (endTime-startTime) << "]" << std::endl;;
     }
     // Preset action of the test case
     void ActsDeqpgles30011TestSuite::SetUp(void)

graphic/vkgl/src/deqpgles3/ActsDeqpgles30012TestSuite.cpp

@@ -47,7 +47,7 @@ namespace OHOS {
         printf("Test run totals --- Notsupport[%d]\n", runResult.numNotSupported);
         printf("Test run totals --- Warnings[%d]\n", runResult.numWarnings);
         printf("Test run totals --- Waved[%d]\n", runResult.numWaived);
-        printf("testmain end --- COST TIME[%lld]\n", (endTime-startTime));
+        cout << "testmain end --- COST TIME ["<< (endTime-startTime) << "]" << std::endl;;
     }
     // Preset action of the test case
     void ActsDeqpgles30012TestSuite::SetUp(void)

graphic/vkgl/src/deqpgles3/ActsDeqpgles30013TestSuite.cpp

@@ -47,7 +47,7 @@ namespace OHOS {
         printf("Test run totals --- Notsupport[%d]\n", runResult.numNotSupported);
         printf("Test run totals --- Warnings[%d]\n", runResult.numWarnings);
         printf("Test run totals --- Waved[%d]\n", runResult.numWaived);
-        printf("testmain end --- COST TIME[%lld]\n", (endTime-startTime));
+        cout << "testmain end --- COST TIME ["<< (endTime-startTime) << "]" << std::endl;;
     }
     // Preset action of the test case
     void ActsDeqpgles30013TestSuite::SetUp(void)

graphic/vkgl/src/deqpgles3/ActsDeqpgles30014TestSuite.cpp

@@ -47,7 +47,7 @@ namespace OHOS {
         printf("Test run totals --- Notsupport[%d]\n", runResult.numNotSupported);
         printf("Test run totals --- Warnings[%d]\n", runResult.numWarnings);
         printf("Test run totals --- Waved[%d]\n", runResult.numWaived);
-        printf("testmain end --- COST TIME[%lld]\n", (endTime-startTime));
+        cout << "testmain end --- COST TIME ["<< (endTime-startTime) << "]" << std::endl;;
     }
     // Preset action of the test case
     void ActsDeqpgles30014TestSuite::SetUp(void)

graphic/vkgl/src/deqpgles3/ActsDeqpgles30015TestSuite.cpp

@@ -47,7 +47,7 @@ namespace OHOS {
         printf("Test run totals --- Notsupport[%d]\n", runResult.numNotSupported);
         printf("Test run totals --- Warnings[%d]\n", runResult.numWarnings);
         printf("Test run totals --- Waved[%d]\n", runResult.numWaived);
-        printf("testmain end --- COST TIME[%lld]\n", (endTime-startTime));
+        cout << "testmain end --- COST TIME ["<< (endTime-startTime) << "]" << std::endl;;
     }
     // Preset action of the test case
     void ActsDeqpgles30015TestSuite::SetUp(void)

graphic/vkgl/src/deqpgles3/ActsDeqpgles30016TestSuite.cpp

@@ -47,7 +47,7 @@ namespace OHOS {
         printf("Test run totals --- Notsupport[%d]\n", runResult.numNotSupported);
         printf("Test run totals --- Warnings[%d]\n", runResult.numWarnings);
         printf("Test run totals --- Waved[%d]\n", runResult.numWaived);
-        printf("testmain end --- COST TIME[%lld]\n", (endTime-startTime));
+        cout << "testmain end --- COST TIME ["<< (endTime-startTime) << "]" << std::endl;;
     }
     // Preset action of the test case
     void ActsDeqpgles30016TestSuite::SetUp(void)

graphic/vkgl/src/deqpgles3/ActsDeqpgles30017TestSuite.cpp

@@ -47,7 +47,7 @@ namespace OHOS {
         printf("Test run totals --- Notsupport[%d]\n", runResult.numNotSupported);
         printf("Test run totals --- Warnings[%d]\n", runResult.numWarnings);
         printf("Test run totals --- Waved[%d]\n", runResult.numWaived);
-        printf("testmain end --- COST TIME[%lld]\n", (endTime-startTime));
+        cout << "testmain end --- COST TIME ["<< (endTime-startTime) << "]" << std::endl;;
     }
     // Preset action of the test case
     void ActsDeqpgles30017TestSuite::SetUp(void)

graphic/vkgl/src/deqpgles3/ActsDeqpgles30018TestSuite.cpp

@@ -47,7 +47,7 @@ namespace OHOS {
         printf("Test run totals --- Notsupport[%d]\n", runResult.numNotSupported);
         printf("Test run totals --- Warnings[%d]\n", runResult.numWarnings);
         printf("Test run totals --- Waved[%d]\n", runResult.numWaived);
-        printf("testmain end --- COST TIME[%lld]\n", (endTime-startTime));
+        cout << "testmain end --- COST TIME ["<< (endTime-startTime) << "]" << std::endl;;
     }
     // Preset action of the test case
     void ActsDeqpgles30018TestSuite::SetUp(void)

graphic/vkgl/src/deqpgles3/ActsDeqpgles30019TestSuite.cpp

@@ -47,7 +47,7 @@ namespace OHOS {
         printf("Test run totals --- Notsupport[%d]\n", runResult.numNotSupported);
         printf("Test run totals --- Warnings[%d]\n", runResult.numWarnings);
         printf("Test run totals --- Waved[%d]\n", runResult.numWaived);
-        printf("testmain end --- COST TIME[%lld]\n", (endTime-startTime));
+        cout << "testmain end --- COST TIME ["<< (endTime-startTime) << "]" << std::endl;;
     }
     // Preset action of the test case
     void ActsDeqpgles30019TestSuite::SetUp(void)

graphic/vkgl/src/deqpgles3/ActsDeqpgles30020TestSuite.cpp

@@ -47,7 +47,7 @@ namespace OHOS {
         printf("Test run totals --- Notsupport[%d]\n", runResult.numNotSupported);
         printf("Test run totals --- Warnings[%d]\n", runResult.numWarnings);
         printf("Test run totals --- Waved[%d]\n", runResult.numWaived);
-        printf("testmain end --- COST TIME[%lld]\n", (endTime-startTime));
+        cout << "testmain end --- COST TIME ["<< (endTime-startTime) << "]" << std::endl;;
     }
     // Preset action of the test case
     void ActsDeqpgles30020TestSuite::SetUp(void)

graphic/vkgl/src/deqpgles3/ActsDeqpgles30021TestSuite.cpp

@@ -47,7 +47,7 @@ namespace OHOS {
         printf("Test run totals --- Notsupport[%d]\n", runResult.numNotSupported);
         printf("Test run totals --- Warnings[%d]\n", runResult.numWarnings);
         printf("Test run totals --- Waved[%d]\n", runResult.numWaived);
-        printf("testmain end --- COST TIME[%lld]\n", (endTime-startTime));
+        cout << "testmain end --- COST TIME ["<< (endTime-startTime) << "]" << std::endl;;
     }
     // Preset action of the test case
     void ActsDeqpgles30021TestSuite::SetUp(void)

graphic/vkgl/src/deqpgles3/ActsDeqpgles30022TestSuite.cpp

@@ -47,7 +47,7 @@ namespace OHOS {
         printf("Test run totals --- Notsupport[%d]\n", runResult.numNotSupported);
         printf("Test run totals --- Warnings[%d]\n", runResult.numWarnings);
         printf("Test run totals --- Waved[%d]\n", runResult.numWaived);
-        printf("testmain end --- COST TIME[%lld]\n", (endTime-startTime));
+        cout << "testmain end --- COST TIME ["<< (endTime-startTime) << "]" << std::endl;;
     }
     // Preset action of the test case
     void ActsDeqpgles30022TestSuite::SetUp(void)

graphic/vkgl/src/deqpgles3/ActsDeqpgles30023TestSuite.cpp

@@ -47,7 +47,7 @@ namespace OHOS {
         printf("Test run totals --- Notsupport[%d]\n", runResult.numNotSupported);
         printf("Test run totals --- Warnings[%d]\n", runResult.numWarnings);
         printf("Test run totals --- Waved[%d]\n", runResult.numWaived);
-        printf("testmain end --- COST TIME[%lld]\n", (endTime-startTime));
+        cout << "testmain end --- COST TIME ["<< (endTime-startTime) << "]" << std::endl;;
     }
     // Preset action of the test case
     void ActsDeqpgles30023TestSuite::SetUp(void)

graphic/vkgl/src/deqpgles3/ActsDeqpgles30024TestSuite.cpp

@@ -47,7 +47,7 @@ namespace OHOS {
         printf("Test run totals --- Notsupport[%d]\n", runResult.numNotSupported);
         printf("Test run totals --- Warnings[%d]\n", runResult.numWarnings);
         printf("Test run totals --- Waved[%d]\n", runResult.numWaived);
-        printf("testmain end --- COST TIME[%lld]\n", (endTime-startTime));
+        cout << "testmain end --- COST TIME ["<< (endTime-startTime) << "]" << std::endl;;
     }
     // Preset action of the test case
     void ActsDeqpgles30024TestSuite::SetUp(void)

graphic/vkgl/src/deqpgles3/ActsDeqpgles30025TestSuite.cpp

@@ -47,7 +47,7 @@ namespace OHOS {
         printf("Test run totals --- Notsupport[%d]\n", runResult.numNotSupported);
         printf("Test run totals --- Warnings[%d]\n", runResult.numWarnings);
         printf("Test run totals --- Waved[%d]\n", runResult.numWaived);
-        printf("testmain end --- COST TIME[%lld]\n", (endTime-startTime));
+        cout << "testmain end --- COST TIME ["<< (endTime-startTime) << "]" << std::endl;;
     }
     // Preset action of the test case
     void ActsDeqpgles30025TestSuite::SetUp(void)

graphic/vkgl/src/deqpgles3/ActsDeqpgles30026TestSuite.cpp

@@ -47,7 +47,7 @@ namespace OHOS {
         printf("Test run totals --- Notsupport[%d]\n", runResult.numNotSupported);
         printf("Test run totals --- Warnings[%d]\n", runResult.numWarnings);
         printf("Test run totals --- Waved[%d]\n", runResult.numWaived);
-        printf("testmain end --- COST TIME[%lld]\n", (endTime-startTime));
+        cout << "testmain end --- COST TIME ["<< (endTime-startTime) << "]" << std::endl;;
     }
     // Preset action of the test case
     void ActsDeqpgles30026TestSuite::SetUp(void)

graphic/vkgl/src/deqpgles3/ActsDeqpgles30027TestSuite.cpp

@@ -47,7 +47,7 @@ namespace OHOS {
         printf("Test run totals --- Notsupport[%d]\n", runResult.numNotSupported);
         printf("Test run totals --- Warnings[%d]\n", runResult.numWarnings);
         printf("Test run totals --- Waved[%d]\n", runResult.numWaived);
-        printf("testmain end --- COST TIME[%lld]\n", (endTime-startTime));
+        cout << "testmain end --- COST TIME ["<< (endTime-startTime) << "]" << std::endl;;
     }
     // Preset action of the test case
     void ActsDeqpgles30027TestSuite::SetUp(void)

graphic/vkgl/src/deqpgles3/ActsDeqpgles30028TestSuite.cpp

@@ -47,7 +47,7 @@ namespace OHOS {
         printf("Test run totals --- Notsupport[%d]\n", runResult.numNotSupported);
         printf("Test run totals --- Warnings[%d]\n", runResult.numWarnings);
         printf("Test run totals --- Waved[%d]\n", runResult.numWaived);
-        printf("testmain end --- COST TIME[%lld]\n", (endTime-startTime));
+        cout << "testmain end --- COST TIME ["<< (endTime-startTime) << "]" << std::endl;;
     }
     // Preset action of the test case
     void ActsDeqpgles30028TestSuite::SetUp(void)

graphic/vkgl/src/deqpgles3/ActsDeqpgles30029TestSuite.cpp

@@ -47,7 +47,7 @@ namespace OHOS {
         printf("Test run totals --- Notsupport[%d]\n", runResult.numNotSupported);
         printf("Test run totals --- Warnings[%d]\n", runResult.numWarnings);
         printf("Test run totals --- Waved[%d]\n", runResult.numWaived);
-        printf("testmain end --- COST TIME[%lld]\n", (endTime-startTime));
+        cout << "testmain end --- COST TIME ["<< (endTime-startTime) << "]" << std::endl;;
     }
     // Preset action of the test case
     void ActsDeqpgles30029TestSuite::SetUp(void)

graphic/vkgl/src/deqpgles3/ActsDeqpgles30030TestSuite.cpp

@@ -47,7 +47,7 @@ namespace OHOS {
         printf("Test run totals --- Notsupport[%d]\n", runResult.numNotSupported);
         printf("Test run totals --- Warnings[%d]\n", runResult.numWarnings);
         printf("Test run totals --- Waved[%d]\n", runResult.numWaived);
-        printf("testmain end --- COST TIME[%lld]\n", (endTime-startTime));
+        cout << "testmain end --- COST TIME ["<< (endTime-startTime) << "]" << std::endl;;
     }
     // Preset action of the test case
     void ActsDeqpgles30030TestSuite::SetUp(void)

graphic/vkgl/src/deqpgles3/ActsDeqpgles30031TestSuite.cpp

@@ -47,7 +47,7 @@ namespace OHOS {
         printf("Test run totals --- Notsupport[%d]\n", runResult.numNotSupported);
         printf("Test run totals --- Warnings[%d]\n", runResult.numWarnings);
         printf("Test run totals --- Waved[%d]\n", runResult.numWaived);
-        printf("testmain end --- COST TIME[%lld]\n", (endTime-startTime));
+        cout << "testmain end --- COST TIME ["<< (endTime-startTime) << "]" << std::endl;;
     }
     // Preset action of the test case
     void ActsDeqpgles30031TestSuite::SetUp(void)

graphic/vkgl/src/deqpgles3/ActsDeqpgles30032TestSuite.cpp

@@ -47,7 +47,7 @@ namespace OHOS {
         printf("Test run totals --- Notsupport[%d]\n", runResult.numNotSupported);
         printf("Test run totals --- Warnings[%d]\n", runResult.numWarnings);
         printf("Test run totals --- Waved[%d]\n", runResult.numWaived);
-        printf("testmain end --- COST TIME[%lld]\n", (endTime-startTime));
+        cout << "testmain end --- COST TIME ["<< (endTime-startTime) << "]" << std::endl;;
     }
     // Preset action of the test case
     void ActsDeqpgles30032TestSuite::SetUp(void)

graphic/vkgl/src/deqpgles3/ActsDeqpgles30033TestSuite.cpp

@@ -47,7 +47,7 @@ namespace OHOS {
         printf("Test run totals --- Notsupport[%d]\n", runResult.numNotSupported);
         printf("Test run totals --- Warnings[%d]\n", runResult.numWarnings);
         printf("Test run totals --- Waved[%d]\n", runResult.numWaived);
-        printf("testmain end --- COST TIME[%lld]\n", (endTime-startTime));
+        cout << "testmain end --- COST TIME ["<< (endTime-startTime) << "]" << std::endl;;
     }
     // Preset action of the test case
     void ActsDeqpgles30033TestSuite::SetUp(void)

graphic/vkgl/src/deqpgles3/ActsDeqpgles30034TestSuite.cpp

@@ -47,7 +47,7 @@ namespace OHOS {
         printf("Test run totals --- Notsupport[%d]\n", runResult.numNotSupported);
         printf("Test run totals --- Warnings[%d]\n", runResult.numWarnings);
         printf("Test run totals --- Waved[%d]\n", runResult.numWaived);
-        printf("testmain end --- COST TIME[%lld]\n", (endTime-startTime));
+        cout << "testmain end --- COST TIME ["<< (endTime-startTime) << "]" << std::endl;;
     }
     // Preset action of the test case
     void ActsDeqpgles30034TestSuite::SetUp(void)

graphic/vkgl/src/deqpgles3/ActsDeqpgles30035TestSuite.cpp

@@ -47,7 +47,7 @@ namespace OHOS {
         printf("Test run totals --- Notsupport[%d]\n", runResult.numNotSupported);
         printf("Test run totals --- Warnings[%d]\n", runResult.numWarnings);
         printf("Test run totals --- Waved[%d]\n", runResult.numWaived);
-        printf("testmain end --- COST TIME[%lld]\n", (endTime-startTime));
+        cout << "testmain end --- COST TIME ["<< (endTime-startTime) << "]" << std::endl;;
     }
     // Preset action of the test case
     void ActsDeqpgles30035TestSuite::SetUp(void)

graphic/vkgl/src/deqpgles3/ActsDeqpgles30036TestSuite.cpp

@@ -47,7 +47,7 @@ namespace OHOS {
         printf("Test run totals --- Notsupport[%d]\n", runResult.numNotSupported);
         printf("Test run totals --- Warnings[%d]\n", runResult.numWarnings);
         printf("Test run totals --- Waved[%d]\n", runResult.numWaived);
-        printf("testmain end --- COST TIME[%lld]\n", (endTime-startTime));
+        cout << "testmain end --- COST TIME ["<< (endTime-startTime) << "]" << std::endl;;
     }
     // Preset action of the test case
     void ActsDeqpgles30036TestSuite::SetUp(void)

graphic/vkgl/src/deqpgles3/ActsDeqpgles30037TestSuite.cpp

@@ -47,7 +47,7 @@ namespace OHOS {
         printf("Test run totals --- Notsupport[%d]\n", runResult.numNotSupported);
         printf("Test run totals --- Warnings[%d]\n", runResult.numWarnings);
         printf("Test run totals --- Waved[%d]\n", runResult.numWaived);
-        printf("testmain end --- COST TIME[%lld]\n", (endTime-startTime));
+        cout << "testmain end --- COST TIME ["<< (endTime-startTime) << "]" << std::endl;;
     }
     // Preset action of the test case
     void ActsDeqpgles30037TestSuite::SetUp(void)

graphic/vkgl/src/deqpgles3/ActsDeqpgles30038TestSuite.cpp

@@ -47,7 +47,7 @@ namespace OHOS {
         printf("Test run totals --- Notsupport[%d]\n", runResult.numNotSupported);
         printf("Test run totals --- Warnings[%d]\n", runResult.numWarnings);
         printf("Test run totals --- Waved[%d]\n", runResult.numWaived);
-        printf("testmain end --- COST TIME[%lld]\n", (endTime-startTime));
+        cout << "testmain end --- COST TIME ["<< (endTime-startTime) << "]" << std::endl;;
     }
     // Preset action of the test case
     void ActsDeqpgles30038TestSuite::SetUp(void)

graphic/vkgl/src/deqpgles3/ActsDeqpgles30039TestSuite.cpp

@@ -47,7 +47,7 @@ namespace OHOS {
         printf("Test run totals --- Notsupport[%d]\n", runResult.numNotSupported);
         printf("Test run totals --- Warnings[%d]\n", runResult.numWarnings);
         printf("Test run totals --- Waved[%d]\n", runResult.numWaived);
-        printf("testmain end --- COST TIME[%lld]\n", (endTime-startTime));
+        cout << "testmain end --- COST TIME ["<< (endTime-startTime) << "]" << std::endl;;
     }
     // Preset action of the test case
     void ActsDeqpgles30039TestSuite::SetUp(void)

graphic/vkgl/src/deqpgles3/ActsDeqpgles30040TestSuite.cpp

@@ -47,7 +47,7 @@ namespace OHOS {
         printf("Test run totals --- Notsupport[%d]\n", runResult.numNotSupported);
         printf("Test run totals --- Warnings[%d]\n", runResult.numWarnings);
         printf("Test run totals --- Waved[%d]\n", runResult.numWaived);
-        printf("testmain end --- COST TIME[%lld]\n", (endTime-startTime));
+        cout << "testmain end --- COST TIME ["<< (endTime-startTime) << "]" << std::endl;;
     }
     // Preset action of the test case
     void ActsDeqpgles30040TestSuite::SetUp(void)

graphic/vkgl/src/deqpgles3/ActsDeqpgles30041TestSuite.cpp

@@ -47,7 +47,7 @@ namespace OHOS {
         printf("Test run totals --- Notsupport[%d]\n", runResult.numNotSupported);
         printf("Test run totals --- Warnings[%d]\n", runResult.numWarnings);
         printf("Test run totals --- Waved[%d]\n", runResult.numWaived);
-        printf("testmain end --- COST TIME[%lld]\n", (endTime-startTime));
+        cout << "testmain end --- COST TIME ["<< (endTime-startTime) << "]" << std::endl;;
     }
     // Preset action of the test case
     void ActsDeqpgles30041TestSuite::SetUp(void)

graphic/vkgl/src/deqpgles3/ActsDeqpgles30042TestSuite.cpp

@@ -47,7 +47,7 @@ namespace OHOS {
         printf("Test run totals --- Notsupport[%d]\n", runResult.numNotSupported);
         printf("Test run totals --- Warnings[%d]\n", runResult.numWarnings);
         printf("Test run totals --- Waved[%d]\n", runResult.numWaived);
-        printf("testmain end --- COST TIME[%lld]\n", (endTime-startTime));
+        cout << "testmain end --- COST TIME ["<< (endTime-startTime) << "]" << std::endl;;
     }
     // Preset action of the test case
     void ActsDeqpgles30042TestSuite::SetUp(void)

graphic/vkgl/src/deqpgles3/ActsDeqpgles30043TestSuite.cpp

@@ -47,7 +47,7 @@ namespace OHOS {
         printf("Test run totals --- Notsupport[%d]\n", runResult.numNotSupported);
         printf("Test run totals --- Warnings[%d]\n", runResult.numWarnings);
         printf("Test run totals --- Waved[%d]\n", runResult.numWaived);
-        printf("testmain end --- COST TIME[%lld]\n", (endTime-startTime));
+        cout << "testmain end --- COST TIME ["<< (endTime-startTime) << "]" << std::endl;;
     }
     // Preset action of the test case
     void ActsDeqpgles30043TestSuite::SetUp(void)

graphic/vkgl/src/deqpgles3/ActsDeqpgles30044TestSuite.cpp

@@ -47,7 +47,7 @@ namespace OHOS {
         printf("Test run totals --- Notsupport[%d]\n", runResult.numNotSupported);
         printf("Test run totals --- Warnings[%d]\n", runResult.numWarnings);
         printf("Test run totals --- Waved[%d]\n", runResult.numWaived);
-        printf("testmain end --- COST TIME[%lld]\n", (endTime-startTime));
+        cout << "testmain end --- COST TIME ["<< (endTime-startTime) << "]" << std::endl;;
     }
     // Preset action of the test case
     void ActsDeqpgles30044TestSuite::SetUp(void)

graphic/vkgl/src/deqpgles3/ActsDeqpgles30045TestSuite.cpp

@@ -47,7 +47,7 @@ namespace OHOS {
         printf("Test run totals --- Notsupport[%d]\n", runResult.numNotSupported);
         printf("Test run totals --- Warnings[%d]\n", runResult.numWarnings);
         printf("Test run totals --- Waved[%d]\n", runResult.numWaived);
-        printf("testmain end --- COST TIME[%lld]\n", (endTime-startTime));
+        cout << "testmain end --- COST TIME ["<< (endTime-startTime) << "]" << std::endl;;
     }
     // Preset action of the test case
     void ActsDeqpgles30045TestSuite::SetUp(void)

graphic/vkgl/src/deqpgles3/ActsDeqpgles3TestSuite.cpp

@@ -47,7 +47,7 @@ namespace OHOS {
         printf("Test run totals --- Notsupport[%d]\n", runResult.numNotSupported);
         printf("Test run totals --- Warnings[%d]\n", runResult.numWarnings);
         printf("Test run totals --- Waved[%d]\n", runResult.numWaived);
-        printf("testmain end --- COST TIME[%lld]\n", (endTime-startTime));
+        cout << "testmain end --- COST TIME ["<< (endTime-startTime) << "]" << std::endl;;
     }
     // Preset action of the test case
     void ActsDeqpgles3TestSuite::SetUp(void)

graphic/vkgl/src/deqpgles3/build0001/BUILD.gn

@@ -25,10 +25,10 @@ config("deqp_platform_ohos_config") {
   defines = deqp_common_defines
 
   # defines -=["DE_PTR_SIZE=8"]
-  defines += [
-    "DE_PTR_SIZE=4",
-    "_XOPEN_SOURCE=600",
-  ]
+  #defines += [
+#    "DE_PTR_SIZE=4",
+#    "_XOPEN_SOURCE=600",
+#  ]
 }
 
 ohos_static_library("libdeqpgles3func0001") {

graphic/vkgl/src/deqpgles3/build0002/BUILD.gn

@@ -25,10 +25,10 @@ config("deqp_platform_ohos_config") {
   defines = deqp_common_defines
 
   # defines -=["DE_PTR_SIZE=8"]
-  defines += [
-    "DE_PTR_SIZE=4",
-    "_XOPEN_SOURCE=600",
-  ]
+  #defines += [
+#    "DE_PTR_SIZE=4",
+#    "_XOPEN_SOURCE=600",
+#  ]
 }
 
 ohos_static_library("libdeqpgles3func0002") {

graphic/vkgl/src/deqpgles3/build0003/BUILD.gn

@@ -25,10 +25,10 @@ config("deqp_platform_ohos_config") {
   defines = deqp_common_defines
 
   # defines -=["DE_PTR_SIZE=8"]
-  defines += [
-    "DE_PTR_SIZE=4",
-    "_XOPEN_SOURCE=600",
-  ]
+  #defines += [
+#    "DE_PTR_SIZE=4",
+#    "_XOPEN_SOURCE=600",
+#  ]
 }
 
 ohos_static_library("libdeqpgles3func0003") {

graphic/vkgl/src/deqpgles3/build0004/BUILD.gn

@@ -25,10 +25,10 @@ config("deqp_platform_ohos_config") {
   defines = deqp_common_defines
 
   # defines -=["DE_PTR_SIZE=8"]
-  defines += [
-    "DE_PTR_SIZE=4",
-    "_XOPEN_SOURCE=600",
-  ]
+  #defines += [
+#    "DE_PTR_SIZE=4",
+#    "_XOPEN_SOURCE=600",
+#  ]
 }
 
 ohos_static_library("libdeqpgles3func0004") {

graphic/vkgl/src/deqpgles3/build0005/BUILD.gn

@@ -25,10 +25,10 @@ config("deqp_platform_ohos_config") {
   defines = deqp_common_defines
 
   # defines -=["DE_PTR_SIZE=8"]
-  defines += [
-    "DE_PTR_SIZE=4",
-    "_XOPEN_SOURCE=600",
-  ]
+  #defines += [
+#    "DE_PTR_SIZE=4",
+#    "_XOPEN_SOURCE=600",
+#  ]
 }
 
 ohos_static_library("libdeqpgles3func0005") {

graphic/vkgl/src/deqpgles3/build0006/BUILD.gn

@@ -25,10 +25,10 @@ config("deqp_platform_ohos_config") {
   defines = deqp_common_defines
 
   # defines -=["DE_PTR_SIZE=8"]
-  defines += [
-    "DE_PTR_SIZE=4",
-    "_XOPEN_SOURCE=600",
-  ]
+  #defines += [
+#    "DE_PTR_SIZE=4",
+#    "_XOPEN_SOURCE=600",
+#  ]
 }
 
 ohos_static_library("libdeqpgles3func0006") {

graphic/vkgl/src/deqpgles3/build0007/BUILD.gn

@@ -25,10 +25,10 @@ config("deqp_platform_ohos_config") {
   defines = deqp_common_defines
 
   # defines -=["DE_PTR_SIZE=8"]
-  defines += [
-    "DE_PTR_SIZE=4",
-    "_XOPEN_SOURCE=600",
-  ]
+  #defines += [
+#    "DE_PTR_SIZE=4",
+#    "_XOPEN_SOURCE=600",
+#  ]
 }
 
 ohos_static_library("libdeqpgles3func0007") {

graphic/vkgl/src/deqpgles3/build0008/BUILD.gn

@@ -25,10 +25,10 @@ config("deqp_platform_ohos_config") {
   defines = deqp_common_defines
 
   # defines -=["DE_PTR_SIZE=8"]
-  defines += [
-    "DE_PTR_SIZE=4",
-    "_XOPEN_SOURCE=600",
-  ]
+  #defines += [
+#    "DE_PTR_SIZE=4",
+#    "_XOPEN_SOURCE=600",
+#  ]
 }
 
 ohos_static_library("libdeqpgles3func0008") {

graphic/vkgl/src/deqpgles3/build0009/BUILD.gn

@@ -25,10 +25,10 @@ config("deqp_platform_ohos_config") {
   defines = deqp_common_defines
 
   # defines -=["DE_PTR_SIZE=8"]
-  defines += [
-    "DE_PTR_SIZE=4",
-    "_XOPEN_SOURCE=600",
-  ]
+  #defines += [
+#    "DE_PTR_SIZE=4",
+#    "_XOPEN_SOURCE=600",
+#  ]
 }
 
 ohos_static_library("libdeqpgles3func0009") {

graphic/vkgl/src/deqpgles3/build0010/BUILD.gn

@@ -25,10 +25,10 @@ config("deqp_platform_ohos_config") {
   defines = deqp_common_defines
 
   # defines -=["DE_PTR_SIZE=8"]
-  defines += [
-    "DE_PTR_SIZE=4",
-    "_XOPEN_SOURCE=600",
-  ]
+  #defines += [
+#    "DE_PTR_SIZE=4",
+#    "_XOPEN_SOURCE=600",
+#  ]
 }
 
 ohos_static_library("libdeqpgles3func0010") {

graphic/vkgl/src/deqpgles3/build0011/BUILD.gn

@@ -25,10 +25,10 @@ config("deqp_platform_ohos_config") {
   defines = deqp_common_defines
 
   # defines -=["DE_PTR_SIZE=8"]
-  defines += [
-    "DE_PTR_SIZE=4",
-    "_XOPEN_SOURCE=600",
-  ]
+  #defines += [
+#    "DE_PTR_SIZE=4",
+#    "_XOPEN_SOURCE=600",
+#  ]
 }
 
 ohos_static_library("libdeqpgles3func0011") {

graphic/vkgl/src/deqpgles3/build0012/BUILD.gn

@@ -25,10 +25,10 @@ config("deqp_platform_ohos_config") {
   defines = deqp_common_defines
 
   # defines -=["DE_PTR_SIZE=8"]
-  defines += [
-    "DE_PTR_SIZE=4",
-    "_XOPEN_SOURCE=600",
-  ]
+  #defines += [
+#    "DE_PTR_SIZE=4",
+#    "_XOPEN_SOURCE=600",
+#  ]
 }
 
 ohos_static_library("libdeqpgles3func0012") {

graphic/vkgl/src/deqpgles3/build0013/BUILD.gn

@@ -25,10 +25,10 @@ config("deqp_platform_ohos_config") {
   defines = deqp_common_defines
 
   # defines -=["DE_PTR_SIZE=8"]
-  defines += [
-    "DE_PTR_SIZE=4",
-    "_XOPEN_SOURCE=600",
-  ]
+  #defines += [
+#    "DE_PTR_SIZE=4",
+#    "_XOPEN_SOURCE=600",
+#  ]
 }
 
 ohos_static_library("libdeqpgles3func0013") {

graphic/vkgl/src/deqpgles3/build0014/BUILD.gn

@@ -25,10 +25,10 @@ config("deqp_platform_ohos_config") {
   defines = deqp_common_defines
 
   # defines -=["DE_PTR_SIZE=8"]
-  defines += [
-    "DE_PTR_SIZE=4",
-    "_XOPEN_SOURCE=600",
-  ]
+  #defines += [
+#    "DE_PTR_SIZE=4",
+#    "_XOPEN_SOURCE=600",
+#  ]
 }
 
 ohos_static_library("libdeqpgles3func0014") {

graphic/vkgl/src/deqpgles3/build0015/BUILD.gn

@@ -25,10 +25,10 @@ config("deqp_platform_ohos_config") {
   defines = deqp_common_defines
 
   # defines -=["DE_PTR_SIZE=8"]
-  defines += [
-    "DE_PTR_SIZE=4",
-    "_XOPEN_SOURCE=600",
-  ]
+  #defines += [
+#    "DE_PTR_SIZE=4",
+#    "_XOPEN_SOURCE=600",
+#  ]
 }
 
 ohos_static_library("libdeqpgles3func0015") {

graphic/vkgl/src/deqpgles3/build0016/BUILD.gn

@@ -25,10 +25,10 @@ config("deqp_platform_ohos_config") {
   defines = deqp_common_defines
 
   # defines -=["DE_PTR_SIZE=8"]
-  defines += [
-    "DE_PTR_SIZE=4",
-    "_XOPEN_SOURCE=600",
-  ]
+  #defines += [
+#    "DE_PTR_SIZE=4",
+#    "_XOPEN_SOURCE=600",
+#  ]
 }
 
 ohos_static_library("libdeqpgles3func0016") {

graphic/vkgl/src/deqpgles3/build0017/BUILD.gn

@@ -25,10 +25,10 @@ config("deqp_platform_ohos_config") {
   defines = deqp_common_defines
 
   # defines -=["DE_PTR_SIZE=8"]
-  defines += [
-    "DE_PTR_SIZE=4",
-    "_XOPEN_SOURCE=600",
-  ]
+  #defines += [
+#    "DE_PTR_SIZE=4",
+#    "_XOPEN_SOURCE=600",
+#  ]
 }
 
 ohos_static_library("libdeqpgles3func0017") {

graphic/vkgl/src/deqpgles3/build0018/BUILD.gn

@@ -25,10 +25,10 @@ config("deqp_platform_ohos_config") {
   defines = deqp_common_defines
 
   # defines -=["DE_PTR_SIZE=8"]
-  defines += [
-    "DE_PTR_SIZE=4",
-    "_XOPEN_SOURCE=600",
-  ]
+  #defines += [
+#    "DE_PTR_SIZE=4",
+#    "_XOPEN_SOURCE=600",
+#  ]
 }
 
 ohos_static_library("libdeqpgles3func0018") {