Skip to content

Commit e9e4dd2

Browse files
committed
Merge branch 'private/asachkov/track-amount-of-xfailed-tests-without-tracker' of https://github.com/AlexeySachkov/llvm into private/asachkov/track-amount-of-xfailed-tests-without-tracker
2 parents c908d65 + 8ff75fd commit e9e4dd2

File tree

2 files changed

+7
-7
lines changed

2 files changed

+7
-7
lines changed

sycl/test-e2e/README.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -323,11 +323,11 @@ must keep using `<sycl/sycl.hpp>` provided by the SYCL2020 specification.**
323323

324324
## Marking tests as expected to fail
325325

326-
Every test should be written in a way that it is either passes, or it is skipped
326+
Every test should be written in a way that it is either passed, or it is skipped
327327
(in case it is not compatible with an environment it was launched in).
328328

329329
If for any reason you find yourself in need to temporary mark test as expected
330-
to fail under certain conditions, you need to submin issue to the repo to
330+
to fail under certain conditions, you need to submit an issue to the repo to
331331
analyze that failure and make test passed or skipped.
332332

333333
Once the issue is created, you can update the test by adding `XFAIL` and

sycl/test-e2e/no-xfail-without-tracker.cpp

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -14,9 +14,9 @@
1414
// REQUIRES: linux
1515
//
1616
// Explanation of the command:
17-
// - search for all "XFAIL" occurences, display line with match and the next one
17+
// - search for all "XFAIL" occurrences, display line with match and the next one
1818
// -I, --include to drop binary files and other unrelated files
19-
// - in the result, serach for "XFAIL" again, but invert the result - this
19+
// - in the result, search for "XFAIL" again, but invert the result - this
2020
// allows us to get the line *after* XFAIL
2121
// - in those lines, check that XFAIL-TRACKER is present and correct. Once
2222
// again, invert the search to get all "bad" lines
@@ -29,22 +29,22 @@
2929
// RUN: grep -Pv "XFAIL-TRACKER:\s+(?:https://github.com/[\w\d-]+/[\w\d-]+/issues/[\d]+)|(?:[\w]+-[\d]+)" | \
3030
// RUN: wc -l | FileCheck %s --check-prefix NUMBER-OF-XFAIL-WITHOUT-TRACKER
3131
//
32-
// The number below is a number of tests which are *impropertly* XFAIL-ed, i.e.
32+
// The number below is a number of tests which are *improperly* XFAIL-ed, i.e.
3333
// we either don't have a tracker associated with a failure listed in those
3434
// tests, or it is listed in a wrong format.
3535
// Note: strictly speaking, that is not amount of files, but amount of XFAIL
3636
// directives. If a test contains several XFAIL directives, some of them may be
3737
// valid and other may not.
3838
//
39-
// That number *must not* increase. Any PR which causes this number to group
39+
// That number *must not* increase. Any PR which causes this number to grow
4040
// should be rejected and it should be updated to either keep the number as-is
4141
// or have it reduced (preferrably, down to zero).
4242
//
4343
// If you see this test failed for your patch, it means that you either
4444
// introduced XFAIL directive to a test improperly, or broke the format of an
4545
// existing XFAIL-ed tests.
4646
// Another possibility (and that is a good option) is that you updated some
47-
// tests to match the requried format and in that case you should just update
47+
// tests to match the required format and in that case you should just update
4848
// (i.e. reduce) the number below.
4949
//
5050
// NUMBER-OF-XFAIL-WITHOUT-TRACKER: 176

0 commit comments

Comments
 (0)