From 50efcbd9d826c73d62765c44d5629effa42bf376 Mon Sep 17 00:00:00 2001 From: wangshi Date: Wed, 13 Jul 2022 16:46:36 +0800 Subject: [PATCH] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E4=BC=98=E5=8C=96=E8=BF=87?= =?UTF-8?q?=E7=9A=84logdefine=E5=92=8C=E7=BC=A9=E5=87=8F=E4=BB=A3=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: wangshi --- graphic/vkgl/src/logdefine.h | 36 ++++++++++++++++++++++++++ graphic/vkgl/src/shrinkdefine.h | 46 +++++++++++++++++++++++++++++++++ 2 files changed, 82 insertions(+) create mode 100644 graphic/vkgl/src/logdefine.h create mode 100644 graphic/vkgl/src/shrinkdefine.h diff --git a/graphic/vkgl/src/logdefine.h b/graphic/vkgl/src/logdefine.h new file mode 100644 index 000000000..b554c8826 --- /dev/null +++ b/graphic/vkgl/src/logdefine.h @@ -0,0 +1,36 @@ +/* + * Copyright (c) 2022 Shenzhen Kaihong Digital Industry Development Co., Ltd. + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +#ifndef TEST_LOGDEFINE_H +#define TEST_LOGDEFINE_H + +#include +#include "tcuDefs.hpp" +#include "tcuCommandLine.hpp" +#include "tcuPlatform.hpp" +#include "ActsApp.h" +#include "tcuResource.hpp" +#include "tcuTestLog.hpp" +#include "tcuTestSessionExecutor.hpp" +#include "deUniquePtr.hpp" + +namespace OHOS { + class Logdefine { + public: + static tcu::TestLog tcutestlog; + }; +} // OHOS + +#endif // TEST_LOGDEFINE_H \ No newline at end of file diff --git a/graphic/vkgl/src/shrinkdefine.h b/graphic/vkgl/src/shrinkdefine.h new file mode 100644 index 000000000..7293781a3 --- /dev/null +++ b/graphic/vkgl/src/shrinkdefine.h @@ -0,0 +1,46 @@ +/* + * Copyright (c) 2022 Shenzhen Kaihong Digital Industry Development Co., Ltd. + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +#ifndef TEST_SHRINKDEFINE_H +#define TEST_SHRINKDEFINE_H + +#define SHRINK_HWTEST_F(TestSuite, TestCase, VkglCase1, VkglCase2) \ + HWTEST_F(TestSuite, TestCase, Function | MediumTest | Level2) \ + { \ + GTEST_LOG_(INFO) << #TestCase << "start"; \ + int argc = 3; \ + const char *argv[3] = { \ + ".", \ + "--deqp-case=" \ + VkglCase1 \ + VkglCase2, \ + "--deqp-archive-dir=/data/local/tmp/" \ + }; \ + FuncRunResult result = RunTestKHRGLES(argc, argv); \ + TestSuite::runResult.numPassed += result.numPassed; \ + TestSuite::runResult.numFailed += result.numFailed; \ + TestSuite::runResult.numNotSupported += result.numNotSupported; \ + TestSuite::runResult.numWarnings += result.numWarnings; \ + TestSuite::runResult.numWaived += result.numWaived; \ + if (result.numNotSupported == 1) { \ + GTEST_LOG_(INFO) << #TestCase << "notsupport!"; \ + } else if (result.isComplete) { \ + EXPECT_TRUE(result.isComplete); \ + EXPECT_TRUE(result.numPassed == 1); \ + }; \ + GTEST_LOG_(INFO) << #TestCase << "end"; \ + } + +#endif // 为缩减代码而存在 \ No newline at end of file -- GitLab