Skip to content

Commit 4c138ad

Browse files
charles-lunargcharles-lunarg
committed
Cleanup test is_dir usage
Remove set_is_dir(false) in many places since it is redundant as false is the default. Remove set_is_dir(true) in many places where it does nothing, eg the discovery type isnt' env-var or add-env-var.
1 parent 612b10b commit 4c138ad

File tree

3 files changed

+11
-26
lines changed

3 files changed

+11
-26
lines changed

‎tests/framework/test_environment.h‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -391,8 +391,6 @@ struct LoaderSettings {
391391
BUILDER_VECTOR(AppSpecificSettings, app_specific_settings, app_specific_setting);
392392
};
393393

394-
struct FrameworkEnvironment; // forward declaration
395-
396394
struct PlatformShimWrapper {
397395
PlatformShimWrapper(fs::FileSystemManager& file_system_manager, const char* log_filter) noexcept;
398396
PlatformShimWrapper(PlatformShimWrapper const&) = delete;

‎tests/loader_envvar_tests.cpp‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -148,7 +148,7 @@ TEST(EnvVarICDOverrideSetup, TestOnlyDriverEnvVarRunningWithElevatedPrivileges)
148148
// Test VK_DRIVER_FILES environment variable containing a path to a folder
149149
TEST(EnvVarICDOverrideSetup, TestOnlyDriverEnvVarInFolder) {
150150
FrameworkEnvironment env{};
151-
env.add_icd(TEST_ICD_PATH_EXPORT_NONE, ManifestOptions{}.set_discovery_type(ManifestDiscoveryType::env_var).set_is_dir(false));
151+
env.add_icd(TEST_ICD_PATH_EXPORT_NONE, ManifestOptions{}.set_discovery_type(ManifestDiscoveryType::env_var).set_is_dir(true));
152152
env.get_test_icd(0).add_physical_device("pd0");
153153

154154
InstWrapper inst1{env.vulkan_functions};
@@ -178,7 +178,7 @@ TEST(EnvVarICDOverrideSetup, TestOnlyDriverEnvVarInFolder) {
178178
// Test VK_DRIVER_FILES environment variable containing a path to a folder with elevated privileges
179179
TEST(EnvVarICDOverrideSetup, TestOnlyDriverEnvVarInFolderWithElevatedPrivileges) {
180180
FrameworkEnvironment env{FrameworkSettings{}.set_run_as_if_with_elevated_privleges(true)};
181-
env.add_icd(TEST_ICD_PATH_EXPORT_NONE, ManifestOptions{}.set_discovery_type(ManifestDiscoveryType::env_var).set_is_dir(false));
181+
env.add_icd(TEST_ICD_PATH_EXPORT_NONE, ManifestOptions{}.set_discovery_type(ManifestDiscoveryType::env_var).set_is_dir(true));
182182
env.get_test_icd(0).add_physical_device("pd0");
183183

184184
for (uint32_t add = 0; add < 2; ++add) {

‎tests/loader_layer_tests.cpp‎

Lines changed: 9 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -1004,8 +1004,7 @@ TEST(ImplicitLayers, VkImplicitLayerPathEnvVar) {
10041004
const char* regular_layer_name_1 = "VK_LAYER_RegularLayer1";
10051005
env.add_implicit_layer(ManifestOptions{}
10061006

1007-
.set_discovery_type(ManifestDiscoveryType::env_var)
1008-
.set_is_dir(false),
1007+
.set_discovery_type(ManifestDiscoveryType::env_var),
10091008
ManifestLayer{}.add_layer(ManifestLayer::LayerDescription{}
10101009
.set_name(regular_layer_name_1)
10111010
.set_lib_path(TEST_LAYER_PATH_EXPORT_VERSION_2)
@@ -1023,20 +1022,14 @@ TEST(ImplicitLayers, VkImplicitLayerPathEnvVarContainsMultipleFilePaths) {
10231022

10241023
// verify layers load successfully when setting VK_IMPLICIT_LAYER_PATH to multiple full filepaths
10251024
const char* regular_layer_name_1 = "VK_LAYER_RegularLayer1";
1026-
env.add_implicit_layer(ManifestOptions{}
1027-
1028-
.set_discovery_type(ManifestDiscoveryType::env_var)
1029-
.set_is_dir(false),
1025+
env.add_implicit_layer(ManifestOptions{}.set_discovery_type(ManifestDiscoveryType::env_var),
10301026
ManifestLayer{}.add_layer(ManifestLayer::LayerDescription{}
10311027
.set_name(regular_layer_name_1)
10321028
.set_lib_path(TEST_LAYER_PATH_EXPORT_VERSION_2)
10331029
.set_disable_environment("Yikes")));
10341030

10351031
const char* regular_layer_name_2 = "VK_LAYER_RegularLayer2";
1036-
env.add_implicit_layer(ManifestOptions{}
1037-
1038-
.set_discovery_type(ManifestDiscoveryType::env_var)
1039-
.set_is_dir(false),
1032+
env.add_implicit_layer(ManifestOptions{}.set_discovery_type(ManifestDiscoveryType::env_var),
10401033
ManifestLayer{}.add_layer(ManifestLayer::LayerDescription{}
10411034
.set_name(regular_layer_name_2)
10421035
.set_lib_path(TEST_LAYER_PATH_EXPORT_VERSION_2)
@@ -1090,8 +1083,7 @@ TEST(ImplicitLayers, DuplicateLayersInVkImplicitLayerPath) {
10901083

10911084
env.add_implicit_layer(ManifestOptions{}
10921085
// putting it in a separate folder then manually adding the folder to VK_IMPLICIT_LAYER_PATH
1093-
.set_discovery_type(ManifestDiscoveryType::override_folder)
1094-
.set_is_dir(true),
1086+
.set_discovery_type(ManifestDiscoveryType::override_folder),
10951087
ManifestLayer{}.add_layer(ManifestLayer::LayerDescription{}
10961088
.set_name(layer_name)
10971089
.set_description("actually_layer_2")
@@ -1126,8 +1118,7 @@ TEST(ImplicitLayers, DuplicateLayersInVK_ADD_IMPLICIT_LAYER_PATH) {
11261118
const char* same_layer_name_1 = "VK_LAYER_RegularLayer1";
11271119
env.add_implicit_layer(ManifestOptions{}
11281120
// use override folder as just a folder and manually set the VK_ADD_IMPLICIT_LAYER_PATH env-var to it
1129-
.set_discovery_type(ManifestDiscoveryType::override_folder)
1130-
.set_is_dir(true),
1121+
.set_discovery_type(ManifestDiscoveryType::override_folder),
11311122
ManifestLayer{}.add_layer(ManifestLayer::LayerDescription{}
11321123
.set_name(same_layer_name_1)
11331124
.set_description("actually_layer_1")
@@ -2390,10 +2381,7 @@ TEST(ExplicitLayers, VkLayerPathEnvVar) {
23902381
// verify layer loads successfully when setting VK_LAYER_PATH to a full filepath
23912382
const char* regular_layer_name_1 = "VK_LAYER_RegularLayer1";
23922383
env.add_explicit_layer(
2393-
ManifestOptions{}
2394-
2395-
.set_discovery_type(ManifestDiscoveryType::env_var)
2396-
.set_is_dir(false),
2384+
ManifestOptions{}.set_discovery_type(ManifestDiscoveryType::env_var),
23972385
ManifestLayer{}.add_layer(
23982386
ManifestLayer::LayerDescription{}.set_name(regular_layer_name_1).set_lib_path(TEST_LAYER_PATH_EXPORT_VERSION_2)));
23992387

@@ -2411,13 +2399,13 @@ TEST(ExplicitLayers, VkLayerPathEnvVarContainsMultipleFilepaths) {
24112399
// verify layers load successfully when setting VK_LAYER_PATH to multiple full filepaths
24122400
const char* regular_layer_name_1 = "VK_LAYER_RegularLayer1";
24132401
env.add_explicit_layer(
2414-
ManifestOptions{}.set_discovery_type(ManifestDiscoveryType::env_var).set_is_dir(false),
2402+
ManifestOptions{}.set_discovery_type(ManifestDiscoveryType::env_var),
24152403
ManifestLayer{}.add_layer(
24162404
ManifestLayer::LayerDescription{}.set_name(regular_layer_name_1).set_lib_path(TEST_LAYER_PATH_EXPORT_VERSION_2)));
24172405

24182406
const char* regular_layer_name_2 = "VK_LAYER_RegularLayer2";
24192407
env.add_explicit_layer(
2420-
ManifestOptions{}.set_discovery_type(ManifestDiscoveryType::env_var).set_is_dir(false),
2408+
ManifestOptions{}.set_discovery_type(ManifestDiscoveryType::env_var),
24212409
ManifestLayer{}.add_layer(
24222410
ManifestLayer::LayerDescription{}.set_name(regular_layer_name_2).set_lib_path(TEST_LAYER_PATH_EXPORT_VERSION_2)));
24232411

@@ -2534,8 +2522,7 @@ TEST(ExplicitLayers, DuplicateLayersInVK_ADD_LAYER_PATH) {
25342522
const char* same_layer_name_1 = "VK_LAYER_RegularLayer1";
25352523
env.add_explicit_layer(ManifestOptions{}
25362524
// use override folder as just a folder and manually set the VK_ADD_LAYER_PATH env-var to it
2537-
.set_discovery_type(ManifestDiscoveryType::override_folder)
2538-
.set_is_dir(true),
2525+
.set_discovery_type(ManifestDiscoveryType::override_folder),
25392526
ManifestLayer{}.add_layer(ManifestLayer::LayerDescription{}
25402527
.set_name(same_layer_name_1)
25412528
.set_description("actually_layer_1")

0 commit comments

Comments
 (0)