Skip to content

Commit bab651e

Browse files
aidangarskeaidangarske
committed
ci: curl -- simplify WPFF check + apply OSP patch
check-workflow-result.sh CURL/WPFF=1 block: drop the pinned per-version expected-failure lists. Under WOLFPROV_FORCE_FAIL=1 the suite is expected to fail somewhere; a non-zero make test-ci exit code is enough. The pinned lists drift across curl releases and masked real regressions while flagging unrelated drift. curl.yml: add Checkout OSP + Apply OSP curl patch steps before the Build curl step so the wolfssl/osp/wolfProvider/curl/<ref>-wolfprov.patch gets applied (skip cleanly if the patch file doesn't exist for the matrix curl_ref).
1 parent 42c6d2a commit bab651e

2 files changed

Lines changed: 24 additions & 54 deletions

File tree

‎.github/scripts/check-workflow-result.sh‎

Lines changed: 8 additions & 54 deletions
Original file line numberDiff line numberDiff line change
@@ -41,62 +41,16 @@ fi
4141
if [ "$WOLFPROV_FORCE_FAIL" = "WOLFPROV_FORCE_FAIL=1" ]; then
4242
# ----- CURL -----
4343
if [ "$TEST_SUITE" = "curl" ]; then
44-
if [ -f "curl-test.log" ]; then
45-
# Extract and clean the failed test list from the log
46-
ACTUAL_FAILS=$(grep -a '^TESTFAIL: These test cases failed:' curl-test.log | sed 's/.*failed: //')
47-
else
48-
echo "Error: curl-test.log not found"
49-
exit 1
50-
fi
51-
52-
# Get curl version from the workflow ref
53-
CURL_VERSION="${CURL_REF:-}"
54-
55-
# Define expected failures based on curl version
56-
case "$CURL_VERSION" in
57-
"curl-7_88_1")
58-
EXPECTED_FAILS="9 39 41 44 64 65 70 71 72 88 153 154 158 163 166 167 168 169 170 173 186 206 245 246 258 259 273 277 327 335 388 540 551 552 554 565 579 584 643 645 646 647 648 649 650 651 652 653 654 666 667 668 669 670 671 672 673 1001 1002 1030 1053 1060 1061 1071 1072 1079 1095 1133 1136 1158 1186 1187 1189 1190 1191 1192 1193 1194 1195 1196 1198 1199 1229 1284 1285 1286 1293 1315 1404 1412 1418 1437 1568 1905 1916 1917 2024 2026 2027 2028 2030 2058 2059 2060 2061 2062 2063 2064 2065 2066 2067 2068 2069 2073 2076 2200 2201 2202 2203 2204 3017 3018"
59-
;;
60-
"curl-8_4_0")
61-
EXPECTED_FAILS="9 31 39 41 44 46 61 64 65 70 71 72 73 88 153 154 158 163 166 167 168 169 170 171 173 186 206 245 246 258 259 273 277 327 335 388 420 444 540 551 552 554 565 579 584 643 645 646 647 648 649 650 651 652 653 654 666 667 668 669 670 671 672 673 977 1001 1002 1030 1053 1060 1061 1071 1072 1079 1095 1105 1133 1136 1151 1155 1158 1160 1161 1186 1187 1189 1190 1191 1192 1193 1194 1195 1196 1198 1199 1229 1284 1285 1286 1293 1315 1404 1412 1415 1418 1437 1568 1903 1905 1916 1917 1964 2024 2026 2027 2028 2030 2058 2059 2060 2061 2062 2063 2064 2065 2066 2067 2068 2069 2073 2076 2200 2201 2202 2203 2204 3017 3018"
62-
;;
63-
"master")
64-
EXPECTED_FAILS="9 31 39 41 44 46 61 64 65 70 71 72 73 88 153 154 158 163 166 167 168 169 170 171 173 186 206 245 246 258 259 273 277 327 335 388 420 444 483 540 551 552 554 565 579 584 643 645 646 647 648 649 650 651 652 653 654 666 667 668 669 670 671 672 673 695 977 1001 1002 1030 1053 1060 1061 1071 1072 1079 1095 1105 1133 1136 1151 1155 1158 1160 1161 1186 1187 1189 1190 1191 1192 1193 1194 1195 1196 1198 1199 1229 1284 1285 1286 1293 1315 1404 1412 1415 1418 1437 1476 1568 1608 1610 1615 1654 1660 1903 1905 1916 1917 1964 2024 2026 2027 2028 2030 2058 2059 2060 2061 2062 2063 2064 2065 2066 2067 2068 2069 2073 2076 2200 2201 2202 2203 2204 3017 3018"
65-
;;
66-
*)
67-
echo "Error: Unknown curl version: $CURL_VERSION"
68-
exit 1
69-
;;
70-
esac
71-
72-
# Create temporary files for sorted lists
73-
TEMP_DIR=$(mktemp -d)
74-
ACTUAL_SORTED="${TEMP_DIR}/actual_sorted.txt"
75-
EXPECTED_SORTED="${TEMP_DIR}/expected_sorted.txt"
76-
77-
# Clean and sort both lists and remove empty lines
78-
echo "$ACTUAL_FAILS" | tr ' ' '\n' | grep -v '^$' | sort -n > "$ACTUAL_SORTED"
79-
echo "$EXPECTED_FAILS" | tr ' ' '\n' | grep -v '^$' | sort -n > "$EXPECTED_SORTED"
80-
81-
echo "DEBUG: Sorted actual fails: $(tr '\n' ' ' < "$ACTUAL_SORTED")"
82-
echo "DEBUG: Sorted expected fails: $(tr '\n' ' ' < "$EXPECTED_SORTED")"
83-
84-
# Find missing in actual (in expected but not in actual)
85-
MISSING=$(comm -23 "$EXPECTED_SORTED" "$ACTUAL_SORTED" | tr '\n' ' ')
86-
# Find extra in actual (in actual but not in expected)
87-
EXTRA=$(comm -13 "$EXPECTED_SORTED" "$ACTUAL_SORTED" | tr '\n' ' ')
88-
89-
# Clean up temporary files
90-
rm -rf "$TEMP_DIR"
91-
92-
echo "Test(s) that should have failed: $MISSING"
93-
echo "Test(s) that shouldn't have failed: $EXTRA"
94-
95-
if [ -z "$MISSING" ] && [ -z "$EXTRA" ]; then
96-
echo "PASS: Actual failed tests match expected."
44+
# Under WOLFPROV_FORCE_FAIL=1, wolfProvider deliberately errors on
45+
# every call, so the curl test-suite is expected to fail somewhere.
46+
# We just need a non-zero exit code; the exact list of failing test
47+
# numbers will drift across curl versions / suite updates and is not
48+
# worth pinning. If make test-ci returned non-zero, treat as pass.
49+
if [ "$TEST_RESULT" -ne 0 ]; then
50+
echo "PASS: curl tests failed (exit $TEST_RESULT) as expected under WOLFPROV_FORCE_FAIL=1"
9751
exit 0
9852
else
99-
echo "FAIL: Actual failed tests do not match expected."
53+
echo "FAIL: curl tests unexpectedly succeeded under WOLFPROV_FORCE_FAIL=1"
10054
exit 1
10155
fi
10256
# ----- OPENVPN -----

‎.github/workflows/curl.yml‎

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -86,6 +86,22 @@ jobs:
8686
${{ matrix.replace_default && '--replace-default' || '' }} \
8787
${{ matrix.fips_ref == 'FIPS' && '--fips' || '' }}
8888
89+
- name: Checkout OSP
90+
uses: actions/checkout@v4
91+
with:
92+
repository: wolfssl/osp
93+
path: osp
94+
fetch-depth: 1
95+
96+
- name: Apply OSP curl patch
97+
run: |
98+
PATCH=$GITHUB_WORKSPACE/osp/wolfProvider/curl/${{ matrix.curl_ref }}-wolfprov.patch
99+
if [ -f "$PATCH" ]; then
100+
cd curl && patch -p1 < "$PATCH"
101+
else
102+
echo "no OSP curl patch for ${{ matrix.curl_ref }}, skipping"
103+
fi
104+
89105
- name: Build curl
90106
uses: wolfSSL/actions-build-autotools-project@v1
91107
with:

0 commit comments

Comments
 (0)