@@ -67,12 +67,19 @@ runs:
67
67
export LD_LIBRARY_PATH=$GITHUB_WORKSPACE/install_dpcpp/lib:$GITHUB_WORKSPACE/install_ock/lib
68
68
export ONEAPI_DEVICE_SELECTOR=opencl:0
69
69
export CTS_CSV_FILE=$GITHUB_WORKSPACE/.github/scripts/sycl-cts.csv
70
- echo > expect_fail.csv
70
+
71
71
# $CTS_FILTER ignores certain test, so is treated differently to temporary fails.
72
- [ -f .github/sycl_cts/expect_fail_all.csv ] && cat .github/sycl_cts/expect_fail_all.csv >> expect_fail.csv
73
- [ -f .github/sycl_cts/expect_fail_${{ inputs.target }}.csv ] && cat .github/sycl_cts/expect_fail_${{ inputs.target }}.csv >> expect_fail.csv
74
- cp expect_fail.csv disable.csv
75
- [ -f "$SYCL_CTS_FILTER" ] && cat "$SYCL_CTS_FILTER" >> disable.csv
72
+
73
+ # Build override file, all is done first, then the target specific. The last file can overwrite prevous overrides.
74
+ for csv in .github/sycl_cts/override_all.csv ..github/sycl_cts/override_${{ inputs.target }}.csv
75
+ do
76
+ [ -f $csv ] && cat $csv
77
+ done > override.csv
78
+
79
+ echo override file:
80
+ cat override.csv
81
+
82
+ exitcode=0
76
83
python3 $GITHUB_WORKSPACE/scripts/testing/run_cities.py \
77
84
--color=always \
78
85
--timeout $SYCL_CTS_TIMEOUT \
@@ -85,30 +92,11 @@ runs:
85
92
-l SYCL-CTS/cts.log -f SYCL-CTS/cts.fail \
86
93
-r SYCL-CTS/cts.xml \
87
94
-v \
88
- -i disable.csv || exitcode=$?
95
+ -o override.csv \
96
+ $SYCL_CTS_FILTER || exitcode=$?
97
+
89
98
export OCL_ICD_FILENAMES=$GITHUB_WORKSPACE/install_ock/lib/libCL.so
90
99
$GITHUB_WORKSPACE/.github/scripts/create_sycl_cts_test_lists.sh $PREPEND_PATH SYCL-CTS $CTS_CSV_FILE csv.txt cts_all.txt
91
100
# output a diff of the generated list csv.txt and cts_all.txt
92
101
diff csv.txt cts_all.txt || echo "WARNING - Missing some tests from sycl cts file based on test_all --list-tests - see > above"
93
102
exit $exitcode
94
-
95
- - name : run sycl cts expected fails
96
- shell : bash
97
- env :
98
- PREPEND_PATH : ' ' # TODO: have qemu as input and set up this
99
- SYCL_CTS_TIMEOUT : ' 02:00:00'
100
- run : |
101
- echo running sycl cts
102
- export LD_LIBRARY_PATH=$GITHUB_WORKSPACE/install_dpcpp/lib:$GITHUB_WORKSPACE/install_ock/lib
103
- export ONEAPI_DEVICE_SELECTOR=opencl:0
104
- python3 $GITHUB_WORKSPACE/scripts/testing/run_cities.py \
105
- --color=always \
106
- --timeout $SYCL_CTS_TIMEOUT \
107
- $PREPEND_PATH \
108
- -p sycl_cts \
109
- -b SYCL-CTS/bin \
110
- -L SYCL-CTS/lib \
111
- -e OCL_ICD_FILENAMES=$GITHUB_WORKSPACE/install_ock/lib/libCL.so \
112
- -l SYCL-CTS/cts.log -f SYCL-CTS/cts.fail \
113
- -r SYCL-CTS/cts.xml \
114
- -s expect_fail.csv || echo failed as expected
0 commit comments