Skip to content

Commit

Permalink
Only mark tests as unsupported if they require unsplit-mode on build
Browse files Browse the repository at this point in the history
  • Loading branch information
ayylol committed Nov 6, 2024
1 parent 7a31c86 commit cd8afdd
Show file tree
Hide file tree
Showing 2 changed files with 1 addition and 22 deletions.
10 changes: 1 addition & 9 deletions sycl/test-e2e/format.py
Original file line number Diff line number Diff line change
Expand Up @@ -98,14 +98,6 @@ def getMatchedFromList(self, features, alist):
except ValueError as e:
raise ValueError("Error in UNSUPPORTED list:\n%s" % str(e))

def check_environment_supported(self, test):
missing_features = test.getMissingRequiredFeaturesFromList(test.config.available_features)
if any(feature in test.config.device_agnostic_features for feature in missing_features):
return False
if self.getMatchedFromList(test.config.available_features.union(missing_features), test.unsupported):
return False
return True

def select_devices_for_test(self, test):
devices = []
for d in test.config.sycl_devices:
Expand Down Expand Up @@ -165,7 +157,7 @@ def execute(self, test, litConfig):
devices_for_test = []
triples = set()
if "run-mode" not in test.config.available_features:
if not self.check_environment_supported(test):
if "unsplit-mode" in test.requires:
return lit.Test.Result(
lit.Test.UNSUPPORTED, "Test unsupported for this environment"
)
Expand Down
13 changes: 0 additions & 13 deletions sycl/test-e2e/lit.cfg.py
Original file line number Diff line number Diff line change
Expand Up @@ -48,19 +48,6 @@
config.available_features.add("run-mode")
config.available_features.add("build-mode")
config.available_features.add("unsplit-mode")
# Device-agnostic features, these are not ignored when in build-only mode
config.device_agnostic_features = {
"linux",
"windows",
"system-windows",
"cl_options",
"TEMPORARY_DISABLED",
"vulkan",
"zstd",
"unsplit-mode",
"run-mode",
"build-mode",
}

# Cleanup environment variables which may affect tests
possibly_dangerous_env_vars = [
Expand Down

0 comments on commit cd8afdd

Please sign in to comment.