From eaeb9f6afeaff8318f28d6ab2c855789980e1d11 Mon Sep 17 00:00:00 2001 From: Marcus Holland-Moritz Date: Wed, 31 Jul 2024 00:20:16 +0200 Subject: [PATCH] test: more FUSE driver tests on windows --- test/tools_test.cpp | 28 +++++++++++++++------------- 1 file changed, 15 insertions(+), 13 deletions(-) diff --git a/test/tools_test.cpp b/test/tools_test.cpp index d1229392..10ad4386 100644 --- a/test/tools_test.cpp +++ b/test/tools_test.cpp @@ -914,18 +914,6 @@ TEST_P(tools_test, end_to_end) { break; } - std::vector all_options{ - "-s", -#ifndef _WIN32 - "-oenable_nlink", - "-oreadonly", -#endif - "-omlock=try", - "-ono_cache_image", - "-ocache_files", - "-otidy_strategy=time", - }; - unicode_symlink = mountpoint / unicode_symlink_name; if (skip_fuse_tests()) { @@ -1041,6 +1029,18 @@ TEST_P(tools_test, end_to_end) { << err; } + std::vector all_options{ + "-s", +#ifndef _WIN32 + "-oenable_nlink", + "-oreadonly", +#endif + "-omlock=try", + "-ono_cache_image", + "-ocache_files", + "-otidy_strategy=time", + }; + unsigned const combinations = 1 << all_options.size(); for (unsigned bitmask = 0; bitmask < combinations; ++bitmask) { @@ -1048,20 +1048,22 @@ TEST_P(tools_test, end_to_end) { #ifndef _WIN32 bool enable_nlink{false}; bool readonly{false}; +#endif for (size_t i = 0; i < all_options.size(); ++i) { if ((1 << i) & bitmask) { auto const& opt = all_options[i]; +#ifndef _WIN32 if (opt == "-oreadonly") { readonly = true; } if (opt == "-oenable_nlink") { enable_nlink = true; } +#endif args.push_back(opt); } } -#endif args.push_back("-otidy_interval=1s"); args.push_back("-otidy_max_age=2s");