Move test code to specific folder
Organized the folder structure and deleted some unused code.
BUG=b:172227944
TEST=compile
Change-Id: I2bd33097781b329ce5f5defd306855af7b134e3c
Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/vkbench/+/2552098
Reviewed-by: Ilja H. Friedel <ihf@chromium.org>
Tested-by: Ilja H. Friedel <ihf@chromium.org>
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 96d7c55..02112d1 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -33,8 +33,9 @@
endforeach(GLSL)
add_custom_target(Shaders DEPENDS ${SPIRV_BINARY_FILES})
+file(GLOB_RECURSE TEST_FILES "src/tests/*.cc")
file(GLOB_RECURSE SRC_FILES "src/*.cc")
-add_executable(vkbench ${SRC_FILES})
+add_executable(vkbench ${SRC_FILES} ${SRC_FILES})
add_dependencies(vkbench Shaders)
diff --git a/src/constant.h b/src/constant.h
deleted file mode 100644
index 3c0acf4..0000000
--- a/src/constant.h
+++ /dev/null
@@ -1,14 +0,0 @@
-// Copyright 2020 The Chromium OS Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style license that can be
-// found in the LICENSE file.
-
-#ifndef __CONSTANT_H__
-#define __CONSTANT_H__
-
-// ERROR_TYPE indicates various error type for vkbench itself.
-enum ERROR_TYPE {
- TEST_PASS,
- TEST_FAIL,
-};
-
-#endif
diff --git a/src/main.cc b/src/main.cc
index 12352d0..84b509a 100644
--- a/src/main.cc
+++ b/src/main.cc
@@ -9,11 +9,10 @@
#include <map>
#include <vector>
-#include "clearTest.h"
-#include "constant.h"
-#include "drawSizeTest.h"
#include "filepath.h"
-#include "submitTest.h"
+#include "tests/clearTest.h"
+#include "tests/drawSizeTest.h"
+#include "tests/submitTest.h"
#include "utils.h"
// g_list determines should we show the test list.
@@ -60,13 +59,8 @@
}
DEFER(test->Cleanup());
- try {
- for (int i = 0; i < iteration; i++) {
- test->Run();
- }
- } catch (const vk::SystemError& err) {
- LOG("TestRun failed: %s", err.what());
- throw TEST_FAIL;
+ for (int i = 0; i < iteration; i++) {
+ test->Run();
}
return GetUTime() - start;
}
@@ -231,17 +225,6 @@
Run(test, 1000000);
if (!g_hasty)
test->vk->Destroy();
- } catch (const ERROR_TYPE& type) {
- switch (type) {
- case TEST_PASS:
- break;
- case TEST_FAIL:
- failed_test[test->Name()] += 1;
- break;
- default:
- ERROR("Unimplemented error type");
- throw;
- }
} catch (const std::runtime_error error) {
failed_test[test->Name()] += 1;
LOG("Runtime Error: %s", error.what());
diff --git a/src/clearTest.cc b/src/tests/clearTest.cc
similarity index 100%
rename from src/clearTest.cc
rename to src/tests/clearTest.cc
diff --git a/src/clearTest.h b/src/tests/clearTest.h
similarity index 97%
rename from src/clearTest.h
rename to src/tests/clearTest.h
index e7e8e40..4fe532a 100644
--- a/src/clearTest.h
+++ b/src/tests/clearTest.h
@@ -5,7 +5,7 @@
#ifndef VKBENCH_CLEARTEST_H
#define VKBENCH_CLEARTEST_H
-#include "testBase.h"
+#include "../testBase.h"
namespace vkbench {
class ClearTest : public testBase {
diff --git a/src/drawSizeTest.cc b/src/tests/drawSizeTest.cc
similarity index 100%
rename from src/drawSizeTest.cc
rename to src/tests/drawSizeTest.cc
diff --git a/src/drawSizeTest.h b/src/tests/drawSizeTest.h
similarity index 97%
rename from src/drawSizeTest.h
rename to src/tests/drawSizeTest.h
index d7d88a0..05304b0 100644
--- a/src/drawSizeTest.h
+++ b/src/tests/drawSizeTest.h
@@ -5,7 +5,7 @@
#ifndef VKBENCH_DRAWSIZETEST_H
#define VKBENCH_DRAWSIZETEST_H
-#include "testBase.h"
+#include "../testBase.h"
namespace vkbench {
class DrawSizeTest : public testBase {
diff --git a/src/submitTest.cc b/src/tests/submitTest.cc
similarity index 100%
rename from src/submitTest.cc
rename to src/tests/submitTest.cc
diff --git a/src/submitTest.h b/src/tests/submitTest.h
similarity index 97%
rename from src/submitTest.h
rename to src/tests/submitTest.h
index 9fd2b52..2f70fd9 100644
--- a/src/submitTest.h
+++ b/src/tests/submitTest.h
@@ -5,7 +5,7 @@
#ifndef VKBENCH_SUBMITTEST_H
#define VKBENCH_SUBMITTEST_H
-#include "testBase.h"
+#include "../testBase.h"
namespace vkbench {
class SubmitTest : public testBase {
diff --git a/src/vkBase.cc b/src/vkBase.cc
index ccbaa95..9aedfaf 100644
--- a/src/vkBase.cc
+++ b/src/vkBase.cc
@@ -7,7 +7,6 @@
#include <limits>
#include <vulkan/vulkan.hpp>
-#include "constant.h"
#include "utils.h"
#include "vkBase.h"