From bf7a57fc55493247a624ecfd65e4d73964e7d8d2 Mon Sep 17 00:00:00 2001 From: SulfurNitride Date: Sun, 12 Apr 2026 02:40:16 -0500 Subject: Remove vendored usvfs and Windows-only usvfs code paths The Linux port uses its own in-process FUSE VFS (FuseConnector), so usvfs was dead weight: libs/usvfs/ was never built, usvfsconnector.cpp was explicitly REMOVE_ITEM'd from the source list, and every call site was already guarded by #ifdef _WIN32 with a working Linux branch (the Windows build is also broken on this branch, since FUSE3 is a hard find_package dependency). - Drop libs/usvfs/ and src/src/usvfsconnector.{cpp,h} - Collapse #ifdef _WIN32 / usvfs include branches in organizercore, mainwindow, settings, util, spawn - Remove getUsvfsVersionString() and the "usvfs: ..." log field - Remove vfs32/64DLLName APPPARAMs (nothing reads them) - Relabel About dialog "usvfs:" row to "VFS: FUSE 3" --- .../test/usvfs_test_runner/usvfs_test_runner.cpp | 105 --------------------- 1 file changed, 105 deletions(-) delete mode 100644 libs/usvfs/test/usvfs_test_runner/usvfs_test_runner.cpp (limited to 'libs/usvfs/test/usvfs_test_runner/usvfs_test_runner.cpp') diff --git a/libs/usvfs/test/usvfs_test_runner/usvfs_test_runner.cpp b/libs/usvfs/test/usvfs_test_runner/usvfs_test_runner.cpp deleted file mode 100644 index a70fb0f..0000000 --- a/libs/usvfs/test/usvfs_test_runner/usvfs_test_runner.cpp +++ /dev/null @@ -1,105 +0,0 @@ -#include - -#include -#include -#include -#include - -static std::string usvfs_test_command(const char* scenario, const char* platform, - const char* testflag = nullptr, - const char* opsarg = nullptr) -{ - using namespace test; - std::string command = - path_of_test_bin(platform_dependant_executable("usvfs_test", "exe", platform)) - .string(); - if (testflag) { - command += " -"; - command += testflag; - } - if (opsarg) { - command += " -opsarg -"; - command += opsarg; - } - command += " "; - command += scenario; - if (testflag || opsarg) { - command += ":"; - if (testflag) { - command += testflag; - command += "_"; - } - if (opsarg) { - command += opsarg; - command += "_"; - } - command += platform; - } - return command; -} - -static DWORD spawn(std::string commandline) -{ - STARTUPINFOA si{0}; - si.cb = sizeof(si); - PROCESS_INFORMATION pi{0}; - - std::cout << "Running: [" << commandline << "]" << std::endl; - if (!CreateProcessA(NULL, commandline.data(), NULL, NULL, FALSE, 0, NULL, NULL, &si, - &pi)) { - DWORD gle = GetLastError(); - std::cerr << "CreateProcess failed error=" << gle << std::endl; - return 98; - } - - WaitForSingleObject(pi.hProcess, INFINITE); - - DWORD exit = 99; - if (!GetExitCodeProcess(pi.hProcess, &exit)) { - DWORD gle = GetLastError(); - std::cerr << "GetExitCodeProcess failed error=" << gle << std::endl; - } - - CloseHandle(pi.hProcess); - CloseHandle(pi.hThread); - - return exit; -} - -TEST(UsvfsTest, basic_x64) -{ - EXPECT_EQ(0, spawn(usvfs_test_command("basic", "x64"))); -} - -TEST(UsvfsTest, basic_x86) -{ - EXPECT_EQ(0, spawn(usvfs_test_command("basic", "x86"))); -} - -TEST(UsvfsTest, basic_ops32_x64) -{ - EXPECT_EQ(0, spawn(usvfs_test_command("basic", "x64", "ops32"))); -} - -TEST(UsvfsTest, basic_ops64_x86) -{ - EXPECT_EQ(0, spawn(usvfs_test_command("basic", "x86", "ops64"))); -} - -/* -TEST(UsvfsTest, basic_ntapi_x64) -{ - EXPECT_EQ(0, spawn(usvfs_test_command("basic", "x64", nullptr, "ntapi"))); -} - -TEST(UsvfsTest, basic_ntapi_x86) -{ - EXPECT_EQ(0, spawn(usvfs_test_command("basic", "x86", nullptr, "ntapi"))); -} -*/ - -int main(int argc, char** argv) -{ - testing::InitGoogleTest(&argc, argv); - return RUN_ALL_TESTS(); -} -- cgit v1.3.1