Skip to content

Commit fbaf6dd

Browse files
committed
Use platform-specific path separator
Exclusion of known-broken tests from XML validation failed on Windows as the path names use \ instead of /.
1 parent 9d0b8ea commit fbaf6dd

File tree

1 file changed

+32
-33
lines changed
  • regression/validate-trace-xml-schema

1 file changed

+32
-33
lines changed

regression/validate-trace-xml-schema/check.py

Lines changed: 32 additions & 33 deletions
Original file line numberDiff line numberDiff line change
@@ -11,49 +11,48 @@
1111
test_base_dir = os.path.abspath(os.path.join(this_script_dir, '..', 'cbmc'))
1212

1313
# some tests in the cbmc suite don't work for the trace checks for one reason or another
14-
ExcludedTests = list(map(lambda s: os.path.join(test_base_dir, s), [
14+
ExcludedTests = list(map(lambda s: os.path.join(test_base_dir, s[0], s[1]), [
1515
# these tests expect input from stdin
16-
'json-interface1/test_wrong_option.desc',
17-
'json-interface1/test.desc',
18-
'json-interface1/test_wrong_flag.desc',
19-
'xml-interface1/test_wrong_option.desc',
20-
'xml-interface1/test.desc',
21-
'xml-interface1/test_wrong_flag.desc',
16+
['json-interface1', 'test_wrong_option.desc'],
17+
['json-interface1', 'test.desc'],
18+
['json-interface1', 'test_wrong_flag.desc'],
19+
['xml-interface1', 'test_wrong_option.desc'],
20+
['xml-interface1', 'test.desc'],
21+
['xml-interface1', 'test_wrong_flag.desc'],
2222
# these want --show-goto-functions instead of producing a trace
23-
'destructors/compound_literal.desc',
24-
'destructors/enter_lexical_block.desc',
25-
'reachability-slice-interproc2/test.desc',
23+
['destructors', 'compound_literal.desc'],
24+
['destructors', 'enter_lexical_block.desc'],
25+
['reachability-slice-interproc2', 'test.desc'],
2626
# this one wants show-properties instead producing a trace
27-
'show_properties1/test.desc',
27+
['show_properties1', 'test.desc'],
2828
# program-only instead of trace
29-
'vla1/program-only.desc',
30-
'Quantifiers-simplify/simplify_not_forall.desc',
31-
# this one doesn't work for me locally at all
32-
# 'integer-assignments1/test.desc',
29+
['vla1', 'program-only.desc'],
30+
['Quantifiers-simplify', 'simplify_not_forall.desc'],
3331
# these test for invalid command line handling
34-
'bad_option/test_multiple.desc',
35-
'bad_option/test.desc',
36-
'unknown-argument-suggestion/test.desc',
32+
['bad_option', 'test_multiple.desc'],
33+
['bad_option', 'test.desc'],
34+
['unknown-argument-suggestion', 'test.desc'],
3735
# this one produces XML intermingled with main XML output when used with --xml-ui
38-
'graphml_witness2/test.desc',
36+
['graphml_witness2', 'test.desc'],
3937
# produces intermingled XML on the command line
40-
'coverage_report1/test.desc',
41-
'coverage_report1/paths.desc',
42-
'graphml_witness1/test.desc',
43-
'switch8/program-only.desc',
38+
['coverage_report1', 'test.desc'],
39+
['coverage_report1', 'paths.desc'],
40+
['graphml_witness1', 'test.desc'],
41+
['switch8', 'program-only.desc'],
4442
# this uses json-ui (fails for a different reason actually, but should also
4543
# fail because of command line incompatibility)
46-
'json1/test.desc',
44+
['json1', 'test.desc'],
4745
# uses show-goto-functions
48-
'reachability-slice/test.desc',
49-
'reachability-slice/test2.desc',
50-
'reachability-slice/test3.desc',
51-
'reachability-slice-interproc/test.desc',
52-
'unsigned1/test.desc',
53-
'reachability-slice-interproc3/test.desc',
54-
'sync_lock_release-1/symbol_per_type.desc',
55-
# this test is marked broken-smt-backend and doesn't work for me locally
56-
'integer-assignments1/test.desc'
46+
['reachability-slice', 'test.desc'],
47+
['reachability-slice', 'test2.desc'],
48+
['reachability-slice', 'test3.desc'],
49+
['reachability-slice-interproc', 'test.desc'],
50+
['unsigned1', 'test.desc'],
51+
['reachability-slice-interproc3', 'test.desc'],
52+
['sync_lock_release-1', 'symbol_per_type.desc'],
53+
# this test is marked smt-backend, and would thus fail as we run tests with
54+
# the SAT back-end only
55+
['integer-assignments1', 'test.desc']
5756
]))
5857

5958
# TODO maybe consider looking them up on PATH, but direct paths are

0 commit comments

Comments
 (0)