#8: update code after rebase

DARMA-tasking · Aug 26, 2024 · b651602 · b651602
1 parent 931d8b7
commit b651602
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 7 deletions.
diff --git a/bindings/python/tv.h b/bindings/python/tv.h
@@ -65,10 +65,8 @@
 #include <filesystem>
 #include <map>
 
-#ifdef VT_TV_OPENMP_ENABLED
 #if VT_TV_OPENMP_ENABLED
-    #include <omp.h>
-#endif
+#include <omp.h>
 #endif
 
 namespace vt::tv::bindings::python {

diff --git a/tests/unit/util.h b/tests/unit/util.h
@@ -54,6 +54,10 @@
 #include <regex>
 #include <tuple>
 
+#if VT_TV_OPENMP_ENABLED
+#include <omp.h>
+#endif
+
 #include <fmt-vt/format.h>
 
 #include <gtest/gtest.h>

diff --git a/tests/unit/utility/test_json_reader.cc b/tests/unit/utility/test_json_reader.cc
@@ -112,8 +112,8 @@ TEST_F(JSONReaderTest, test_json_reader_1) {
   }
 }
 
-TEST_F(TestJSONReader, test_json_reader_metadata_attributes) {
-  std::filesystem::path p = std::filesystem::path(SRC_DIR) / "tests/unit/reader_test_data" ;
+TEST_F(JSONReaderTest, test_json_reader_metadata_attributes) {
+  std::filesystem::path p = std::filesystem::path(SRC_DIR) / "tests/data/reader_test_data" ;
   std::string path = std::filesystem::absolute(p).string();
 
   NodeType rank = 0;
@@ -136,7 +136,7 @@ TEST_F(TestJSONReader, test_json_reader_metadata_attributes) {
 }
 
 TEST_F(JSONReaderTest, test_json_reader_object_info_attributes) {
-  std::filesystem::path p = std::filesystem::path(SRC_DIR) / "tests/data/lb_test_data" ;
+  std::filesystem::path p = std::filesystem::path(SRC_DIR) / "tests/data/reader_test_data" ;
   std::string path = std::filesystem::absolute(p).string();
 
   NodeType rank = 0;
@@ -184,7 +184,7 @@ TEST_F(JSONReaderTest, test_json_reader_qoi_serializer) {
 }
 
 TEST_F(JSONReaderTest, test_json_reader_object_work_user_defined) {
-  std::filesystem::path p = std::filesystem::path(SRC_DIR) / "tests/data/lb_test_data" ;
+  std::filesystem::path p = std::filesystem::path(SRC_DIR) / "tests/data/reader_test_data" ;
   std::string path = std::filesystem::absolute(p).string();
 
   NodeType rank = 0;