#95: changes for pr

DARMA-tasking · Aug 27, 2024 · 5c18b10 · 5c18b10
1 parent f2a7e72
commit 5c18b10
Show file tree

Hide file tree

Showing 5 changed files with 2 additions and 18 deletions.
diff --git a/.github/workflows/build-and-test.yml b/.github/workflows/build-and-test.yml
@@ -5,7 +5,6 @@ on:
   push:
     branches:
       - master
-      - 95-improve-ci-rendering-tests # TODO: REMOVE ONCE PR CREATED
   pull_request:
     types: [opened, reopened, synchronize, converted_to_draft, ready_for_review]
 

diff --git a/build.sh b/build.sh
@@ -40,7 +40,7 @@ VT_TV_COVERAGE_ENABLED=$(on_off ${VT_TV_COVERAGE_ENABLED:-OFF})
 VT_TV_CLEAN=$(on_off ${VT_TV_CLEAN:-ON})
 VT_TV_PYTHON_BINDINGS_ENABLED=$(on_off ${VT_TV_PYTHON_BINDINGS_ENABLED:-OFF})
 VT_TV_WERROR_ENABLED=$(on_off ${VT_TV_WERROR_ENABLED:-OFF})
-VT_TV_XVFB_ENABLED=$(on_off ${VT_TV_WERROR_ENABLED:-OFF})
+VT_TV_XVFB_ENABLED=$(on_off ${VT_TV_XVFB_ENABLED:-OFF})
 # >> Run tests settings
 VT_TV_RUN_TESTS=$(on_off ${VT_TV_RUN_TESTS:-OFF})
 VT_TV_RUN_TESTS_FILTER=${VT_TV_RUN_TESTS_FILTER:-""}

diff --git a/src/vt-tv/render/render.h b/src/vt-tv/render/render.h
@@ -97,7 +97,6 @@
 #include <array>
 #include <variant>
 #include <cmath>
-#include <regex>
 
 namespace vt { namespace tv {
 

diff --git a/tests/unit/render/test_parse_render.cc b/tests/unit/render/test_parse_render.cc
@@ -64,15 +64,7 @@ using Util = vt::tv::tests::unit::Util;
 /**
  * Provides unit tests for the vt::tv::utility::ParseRender class to test with config file input
  */
-class ParseRenderTest :public ::testing::TestWithParam<std::string> {
-
-  void SetUp() override {
-    // Make the output directory for these tests
-    // std::filesystem::create_directory(fmt::format("{}/output", SRC_DIR));
-    // std::filesystem::create_directory(fmt::format("{}/output/tests", SRC_DIR));
-    // std::filesystem::create_directory(fmt::format("{}/output/tests/no_png", SRC_DIR));
-  }
-};
+class ParseRenderTest :public ::testing::TestWithParam<std::string> { };
 
 /**
  * Test ParseRender:parseAndRender correcty run the different configuration files

diff --git a/tests/unit/render/test_render.cc b/tests/unit/render/test_render.cc
@@ -69,12 +69,6 @@ using Util = vt::tv::tests::unit::Util;
  */
 class RenderTest :public ::testing::TestWithParam<std::string> {
 
-  void SetUp() override {
-    // Make the output directory for these tests
-    // std::filesystem::create_directory(fmt::format("{}/output", SRC_DIR));
-    // std::filesystem::create_directory(fmt::format("{}/output/tests", SRC_DIR));
-  }
-
 protected:
   Render createRender(YAML::Node config, Info info, std::string &output_dir) {
     // change output directory to use specific one for these tests