From 8e85dba47eafc78b17b181dc0f16915b39ae71cd Mon Sep 17 00:00:00 2001 From: Sven Erdem Date: Wed, 31 Jul 2024 20:55:30 +0200 Subject: [PATCH] ... --- .github/workflows/testWindows.yml | 32 ++++++++++++++--------------- Intern/rayx-core/tests/setupTests.h | 4 ++++ Intern/rayx/src/CommandParser.cpp | 2 +- 3 files changed, 21 insertions(+), 17 deletions(-) diff --git a/.github/workflows/testWindows.yml b/.github/workflows/testWindows.yml index 9854d3c0..e7bda583 100644 --- a/.github/workflows/testWindows.yml +++ b/.github/workflows/testWindows.yml @@ -17,22 +17,22 @@ jobs: git submodule sync git submodule update --init --recursive - # - name: Prepare Vulkan SDK - # uses: humbletim/setup-vulkan-sdk@v1.2.0 - # with: - # vulkan-query-version: 1.3.275.0 - # vulkan-components: Vulkan-Headers, Vulkan-Loader, SPIRV-Cross, SPIRV-Tools, Glslang - # vulkan-use-cache: true - # - # - name: Download glslangValidator - # run: curl -L -o glslang.zip https://github.com/KhronosGroup/glslang/releases/download/main-tot/glslang-master-windows-Release.zip - # - # - name: Extract glslangValidator - # shell: powershell - # run: Expand-Archive -Path glslang.zip -DestinationPath ${{github.workspace}}/glslang - # - # - name: Add glslangValidator to PATH - # run: echo "${{github.workspace}}/glslang/bin" | Out-File -FilePath $env:GITHUB_PATH -Encoding utf8 -Append + - name: Prepare Vulkan SDK + uses: humbletim/setup-vulkan-sdk@v1.2.0 + with: + vulkan-query-version: 1.3.275.0 + vulkan-components: Vulkan-Headers, Vulkan-Loader, SPIRV-Cross, SPIRV-Tools, Glslang + vulkan-use-cache: true + + - name: Download glslangValidator + run: curl -L -o glslang.zip https://github.com/KhronosGroup/glslang/releases/download/main-tot/glslang-master-windows-Release.zip + + - name: Extract glslangValidator + shell: powershell + run: Expand-Archive -Path glslang.zip -DestinationPath ${{github.workspace}}/glslang + + - name: Add glslangValidator to PATH + run: echo "${{github.workspace}}/glslang/bin" | Out-File -FilePath $env:GITHUB_PATH -Encoding utf8 -Append - name: Install boost uses: MarkusJx/install-boost@v2.4.5 diff --git a/Intern/rayx-core/tests/setupTests.h b/Intern/rayx-core/tests/setupTests.h index 7d0df4a7..4dea18b3 100644 --- a/Intern/rayx-core/tests/setupTests.h +++ b/Intern/rayx-core/tests/setupTests.h @@ -152,6 +152,7 @@ inline void add_failure() { ADD_FAILURE(); } class TestSuite : public testing::Test { protected: static void SetUpTestSuite() { + RAYX_LOG << "SetUpTestSuite"; RAYX::error_fn = add_failure; bool cpu = false; @@ -163,9 +164,12 @@ class TestSuite : public testing::Test { } // Choose Hardware + RAYX_LOG << "SetUpTestSuite create tracer"; + RAYX_LOG << "cpu: " << cpu; using DeviceType = RAYX::DeviceConfig::DeviceType; const auto deviceType = cpu ? DeviceType::Cpu : DeviceType::Gpu; tracer = std::make_unique(RAYX::DeviceConfig(deviceType).enableBestDevice()); + RAYX_LOG << "SetUpTestSuite created tracer"; } // called before every test invocation. diff --git a/Intern/rayx/src/CommandParser.cpp b/Intern/rayx/src/CommandParser.cpp index 57a2e6bd..394a3fb0 100644 --- a/Intern/rayx/src/CommandParser.cpp +++ b/Intern/rayx/src/CommandParser.cpp @@ -34,7 +34,7 @@ CommandParser::CommandParser(int _argc, char* const* _argv) : m_cli11{std::make_ } catch (const CLI::ParseError& e) { m_cli11_return = m_cli11->exit(e); if ((e.get_name() == "CallForHelp") || (e.get_name() == "CallForAllHelp")) - exit(1); + RAYX_ERR << "CLI ERROR: unknown error"; else RAYX_D_ERR << "CLI ERROR" << m_cli11_return << " " << e.get_name(); }