From 5f925d3e71ccff743c890b3286c4efa4f07c285f Mon Sep 17 00:00:00 2001 From: "Scott E. Graves" Date: Thu, 24 Oct 2024 08:08:40 -0500 Subject: [PATCH] refactor --- post_build.sh | 2 -- repertory/repertory_test/src/winfsp_drive_test.cpp | 10 ++++------ .../repertory_test/test_input/bin}/License.txt | 0 .../repertory_test/test_input/bin}/README.md | 0 .../test_input/bin}/winfsp-tests-a64.exe | Bin .../test_input/bin}/winfsp-tests-x64.exe | Bin .../test_input/bin}/winfsp-tests-x86.exe | Bin .../repertory_test/test_input/bin}/winfsp-x64.dll | Bin 8 files changed, 4 insertions(+), 8 deletions(-) rename {bin => repertory/repertory_test/test_input/bin}/License.txt (100%) rename {bin => repertory/repertory_test/test_input/bin}/README.md (100%) rename {bin => repertory/repertory_test/test_input/bin}/winfsp-tests-a64.exe (100%) rename {bin => repertory/repertory_test/test_input/bin}/winfsp-tests-x64.exe (100%) rename {bin => repertory/repertory_test/test_input/bin}/winfsp-tests-x86.exe (100%) rename {bin => repertory/repertory_test/test_input/bin}/winfsp-x64.dll (100%) diff --git a/post_build.sh b/post_build.sh index 709f2772..4f5435c6 100755 --- a/post_build.sh +++ b/post_build.sh @@ -8,5 +8,3 @@ rsync -av --progress ${CURRENT_DIR}/${PROJECT_NAME}/${PROJECT_NAME}_test/test_in rsync -av --progress ${CURRENT_DIR}/${PROJECT_NAME}/${PROJECT_NAME}_test/test_input/ \ ${PROJECT_DIST_DIR}/test_input/ - -rsync -av --progress ${CURRENT_DIR}/bin/* ${PROJECT_DIST_DIR}/ diff --git a/repertory/repertory_test/src/winfsp_drive_test.cpp b/repertory/repertory_test/src/winfsp_drive_test.cpp index 07434e25..27fef111 100644 --- a/repertory/repertory_test/src/winfsp_drive_test.cpp +++ b/repertory/repertory_test/src/winfsp_drive_test.cpp @@ -20,7 +20,6 @@ SOFTWARE. */ #if defined(_WIN32) -#if 0 #include "fixtures/winfsp_fixture.hpp" @@ -229,15 +228,14 @@ TYPED_TEST(winfsp_test, run_winfsp_tests) { "--resilient", }; - auto res = - system((utils::path::combine(cur.string(), {"winfsp-tests-x64.exe"}) + - ' ' + utils::string::join(test_options, ' ')) - .c_str()); + auto res = system((utils::path::combine(test::get_project_input_dir(), + {"bin", "winfsp-tests-x64.exe"}) + + ' ' + utils::string::join(test_options, ' ')) + .c_str()); EXPECT_EQ(0, res); std::filesystem::current_path(cur); } } // namespace repertory -#endif // 0 #endif // defined(_WIN32) diff --git a/bin/License.txt b/repertory/repertory_test/test_input/bin/License.txt similarity index 100% rename from bin/License.txt rename to repertory/repertory_test/test_input/bin/License.txt diff --git a/bin/README.md b/repertory/repertory_test/test_input/bin/README.md similarity index 100% rename from bin/README.md rename to repertory/repertory_test/test_input/bin/README.md diff --git a/bin/winfsp-tests-a64.exe b/repertory/repertory_test/test_input/bin/winfsp-tests-a64.exe similarity index 100% rename from bin/winfsp-tests-a64.exe rename to repertory/repertory_test/test_input/bin/winfsp-tests-a64.exe diff --git a/bin/winfsp-tests-x64.exe b/repertory/repertory_test/test_input/bin/winfsp-tests-x64.exe similarity index 100% rename from bin/winfsp-tests-x64.exe rename to repertory/repertory_test/test_input/bin/winfsp-tests-x64.exe diff --git a/bin/winfsp-tests-x86.exe b/repertory/repertory_test/test_input/bin/winfsp-tests-x86.exe similarity index 100% rename from bin/winfsp-tests-x86.exe rename to repertory/repertory_test/test_input/bin/winfsp-tests-x86.exe diff --git a/bin/winfsp-x64.dll b/repertory/repertory_test/test_input/bin/winfsp-x64.dll similarity index 100% rename from bin/winfsp-x64.dll rename to repertory/repertory_test/test_input/bin/winfsp-x64.dll