[Util] Make pass-test-update.py test case more resilient (NFC) #155303
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This test case matches against python traceback output, which seems to vary slightly between versions. This relaxes the constraints a bit to make the test pass on buildbots.
|
@llvm/pr-subscribers-testing-tools Author: Henrik G. Olsson (hnrklssn) ChangesThis test case matches against python traceback output, which seems to vary slightly between versions. This relaxes the constraints a bit to make the test pass on buildbots. Full diff: https://github.com/llvm/llvm-project/pull/155303.diff 1 Files Affected:
diff --git a/llvm/utils/lit/tests/pass-test-update.py b/llvm/utils/lit/tests/pass-test-update.py
index e3efb9df919c4..f23bce9838f35 100644
--- a/llvm/utils/lit/tests/pass-test-update.py
+++ b/llvm/utils/lit/tests/pass-test-update.py
@@ -1,39 +1,34 @@
# RUN: %{lit} --update-tests --ignore-fail -v %S/Inputs/pass-test-update | FileCheck %s --implicit-check-not Exception
-# CHECK: UNRESOLVED: pass-test-update :: fail.test (1 of 5)
-# CHECK-NEXT: ******************** TEST 'pass-test-update :: fail.test' FAILED ********************
-# CHECK-NEXT: # {{R}}UN: at line 1
-# CHECK-NEXT: not echo "fail"
-# CHECK-NEXT: # executed command: not echo fail
-# CHECK-NEXT: # .---command stdout------------
-# CHECK-NEXT: # | fail
-# CHECK-NEXT: # `-----------------------------
-# CHECK-NEXT: # error: command failed with exit status: 1
-# CHECK-NEXT: Exception occurred in test updater:
-# CHECK-NEXT: Traceback (most recent call last):
-# CHECK-NEXT: File {{.*}}, line {{.*}}, in {{.*}}
-# CHECK-NEXT: update_output = test_updater(result, test)
-# CHECK-NEXT: File "{{.*}}/should_not_run.py", line {{.*}}, in should_not_run
-# CHECK-NEXT: raise Exception("this test updater should only run on failure")
-# CHECK-NEXT: Exception: this test updater should only run on failure
-# CHECK-EMPTY:
-# CHECK-NEXT: ********************
-# CHECK-NEXT: PASS: pass-test-update :: pass-silent.test (2 of 5)
-# CHECK-NEXT: PASS: pass-test-update :: pass.test (3 of 5)
-# CHECK-NEXT: {{X}}FAIL: pass-test-update :: xfail.test (4 of 5)
-# CHECK-NEXT: XPASS: pass-test-update :: xpass.test (5 of 5)
-# CHECK-NEXT: ******************** TEST 'pass-test-update :: xpass.test' FAILED ********************
-# CHECK-NEXT: Exit Code: 0
-# CHECK-EMPTY:
-# CHECK-NEXT: Command Output (stdout):
-# CHECK-NEXT: --
-# CHECK-NEXT: # {{R}}UN: at line 2
-# CHECK-NEXT: echo "accidentally passed"
-# CHECK-NEXT: # executed command: echo 'accidentally passed'
-# CHECK-NEXT: # .---command stdout------------
-# CHECK-NEXT: # | accidentally passed
-# CHECK-NEXT: # `-----------------------------
-# CHECK-EMPTY:
-# CHECK-NEXT: --
-# CHECK-EMPTY:
-# CHECK-NEXT: ********************
+# CHECK: UNRESOLVED: pass-test-update :: fail.test (1 of 5)
+# CHECK: ******************** TEST 'pass-test-update :: fail.test' FAILED ********************
+# CHECK: # {{R}}UN: at line 1
+# CHECK: not echo "fail"
+# CHECK: # executed command: not echo fail
+# CHECK: # .---command stdout------------
+# CHECK: # | fail
+# CHECK: # `-----------------------------
+# CHECK: # error: command failed with exit status: 1
+# CHECK: Exception occurred in test updater:
+# CHECK: Traceback (most recent call last):
+# CHECK: File {{.*}}, line {{.*}}, in {{.*}}
+# CHECK: update_output = test_updater(result, test)
+# CHECK: File "{{.*}}/should_not_run.py", line {{.*}}, in should_not_run
+# CHECK: raise Exception("this test updater should only run on failure")
+# CHECK: Exception: this test updater should only run on failure
+# CHECK: ********************
+# CHECK: PASS: pass-test-update :: pass-silent.test (2 of 5)
+# CHECK: PASS: pass-test-update :: pass.test (3 of 5)
+# CHECK: {{X}}FAIL: pass-test-update :: xfail.test (4 of 5)
+# CHECK: XPASS: pass-test-update :: xpass.test (5 of 5)
+# CHECK: ******************** TEST 'pass-test-update :: xpass.test' FAILED ********************
+# CHECK: Exit Code: 0
+# CHECK: Command Output (stdout):
+# CHECK: --
+# CHECK: # {{R}}UN: at line 2
+# CHECK: echo "accidentally passed"
+# CHECK: # executed command: echo 'accidentally passed'
+# CHECK: # .---command stdout------------
+# CHECK: # | accidentally passed
+# CHECK: # `-----------------------------
+# CHECK: ********************
|
|
LLVM Buildbot has detected a new failure on builder Full details are available at: https://lab.llvm.org/buildbot/#/builders/134/builds/25092 Here is the relevant piece of the build log for the reference |
dyung
added a commit
that referenced
this pull request
Aug 26, 2025
…155354) Should fix Windows build bot failures such as https://lab.llvm.org/buildbot/#/builders/46/builds/22281. The test (and the followup fix in #155303) did not properly account for Windows style path separators.
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
This test case matches against python traceback output, which seems to vary slightly between versions. This relaxes the constraints a bit to make the test pass on buildbots.