Skip to content

[LIT][E2E] Fix LIT hang when executing non-existent files #17505

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 10 commits into from
Apr 9, 2025
Merged

[LIT][E2E] Fix LIT hang when executing non-existent files #17505

Show file tree
Hide file tree
Changes from 5 commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
7e9a0fe
Fix lit hang
ayylol Mar 18, 2025
42bc1ae
Always use internal shell in e2e tests
ayylol Mar 18, 2025
7a6fc6d
Add dummy test that would hang without the changes
ayylol Mar 18, 2025
a9d562a
Remove dummy test
ayylol Mar 18, 2025
8e0d6b3
Merge branch 'sycl' into lit-hang-fix
ayylol Mar 18, 2025
6eb4193
Merge branch 'sycl' into lit-hang-fix
ayylol Apr 7, 2025
7c953eb
Initial commit for timeout hang test
ayylol Apr 1, 2025
26fd14a
Implement timeout hang test
ayylol Apr 1, 2025
dff686b
Format lit files
ayylol Apr 8, 2025
ba22249
Format format.py
ayylol Apr 8, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
18 changes: 9 additions & 9 deletions llvm/utils/lit/lit/TestRunner.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -201,7 +201,12 @@ def executeShCmd(cmd, shenv, results, timeout=0):
timeoutHelper = TimeoutHelper(timeout)
if timeout > 0:
timeoutHelper.startTimer()
finalExitCode = _executeShCmd(cmd, shenv, results, timeoutHelper)
try:
finalExitCode = _executeShCmd(cmd, shenv, results, timeoutHelper)
except InternalShellError:
e = sys.exc_info()[1]
finalExitCode = 127
results.append(ShellCommandResult(e.command, "", e.message, finalExitCode, False))
timeoutHelper.cancel()
timeoutInfo = None
if timeoutHelper.timeoutReached():
Expand Down Expand Up @@ -1105,15 +1110,10 @@ def executeScriptInternal(

results = []
timeoutInfo = None
try:
shenv = ShellEnvironment(cwd, test.config.environment)
exitCode, timeoutInfo = executeShCmd(
shenv = ShellEnvironment(cwd, test.config.environment)
exitCode, timeoutInfo = executeShCmd(
cmd, shenv, results, timeout=litConfig.maxIndividualTestTime
)
except InternalShellError:
e = sys.exc_info()[1]
exitCode = 127
results.append(ShellCommandResult(e.command, "", e.message, exitCode, False))
)

out = err = ""
for i, result in enumerate(results):
Expand Down
5 changes: 1 addition & 4 deletions sycl/test-e2e/format.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -372,14 +372,11 @@ def get_extra_env(sycl_devices):
recursion_limit=test.config.recursiveExpansionLimit,
)

# TODO: workaround for lit hanging when executing non-existent binary
# inside our containers
if len(script) == 0:
return lit.Test.Result(lit.Test.UNSUPPORTED, "Lit script is empty")
useExternalSh = test.config.test_mode == "run-only"

result = lit.TestRunner._runShTest(
test, litConfig, useExternalSh, script, tmpBase
test, litConfig, False, script, tmpBase
)

# Single triple/device - might be an XFAIL.
Expand Down