Skip to content

Commit 7610b85

Browse files
BlackhexBlackhex
committed
Add workflow for mingw-w64-gcc package testing
1 parent a112439 commit 7610b85

File tree

5 files changed

+301
-8
lines changed

5 files changed

+301
-8
lines changed

‎.github/scripts/build-package.sh‎

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,15 +9,18 @@ PACKAGE_REPOSITORY=$1
99
CLEAN_BUILD=${CLEAN_BUILD:-0}
1010
INSTALL_PACKAGE=${INSTALL_PACKAGE:-0}
1111
NO_EXTRACT=${NO_EXTRACT:-0}
12+
NO_CHECK=${NO_CHECK:-1}
13+
NO_ARCHIVE=${NO_ARCHIVE:-0}
1214

1315
ARGUMENTS="--syncdeps \
1416
--rmdeps \
1517
--noconfirm \
1618
--noprogressbar \
17-
--nocheck \
1819
--skippgpcheck \
1920
--force \
2021
$([ "$NO_EXTRACT" = 1 ] && echo "--noextract" || echo "") \
22+
$([ "$NO_CHECK" = 1 ] && echo "--nocheck " || echo "") \
23+
$([ "$NO_ARCHIVE" = 1 ] && echo "--noarchive" || echo "") \
2124
$([ "$CLEAN_BUILD" = 1 ] && echo "--cleanbuild" || echo "") \
2225
$([ "$INSTALL_PACKAGE" = 1 ] && echo "--install" || echo "")"
2326

‎.github/scripts/patch-dejagnu.sh‎

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,14 @@
1+
#!/bin/bash
2+
3+
set -e # exit on error
4+
set -x # echo on
5+
set -o pipefail # fail of any command in pipeline is an error
6+
7+
DIR="`dirname ${BASH_SOURCE[0]}`/../.."
8+
DIR=`realpath $DIR`
9+
10+
pushd /
11+
echo "::group::Patch Dejagnu"
12+
patch -p1 -b -i "$DIR/patches/dejagnu/0001-local-exec.patch"
13+
echo "::endgroup::"
14+
popd

‎.github/workflows/build-and-test-mingw-w64-gcc.yml‎

Lines changed: 78 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,78 @@
1+
name: Build and test mingw-w64-gcc
2+
3+
on:
4+
pull_request:
5+
workflow_dispatch:
6+
inputs:
7+
packages_repository:
8+
description: "MSYS2 packages repository to build from"
9+
type: string
10+
default: "Windows-on-ARM-Experiments/MINGW-packages"
11+
packages_branch:
12+
description: "MSYS2 packages branch to build from"
13+
type: string
14+
default: "woarm64"
15+
arch:
16+
description: 'Architecture that should be built and tested'
17+
required: false
18+
default: 'aarch64'
19+
tag:
20+
description: 'Tag to use for the artifact'
21+
required: true
22+
gcc_module:
23+
description: 'GCC module to test'
24+
required: false
25+
default: 'gcc-c'
26+
gcc_test_filter:
27+
description: 'GCC test filter'
28+
required: false
29+
default: 'compile.exp=103818.c'
30+
workflow_call:
31+
inputs:
32+
packages_repository:
33+
type: string
34+
packages_branch:
35+
type: string
36+
arch:
37+
type: string
38+
tag:
39+
type: string
40+
gcc_module:
41+
type: string
42+
gcc_test_filter:
43+
type: string
44+
45+
jobs:
46+
build-and-test-mingw-w64-gcc:
47+
name: Build and test mingw-w64-gcc
48+
uses: ./.github/workflows/build-package.yml
49+
with:
50+
package_name: mingw-w64-gcc
51+
packages_repository: ${{ inputs.packages_repository || 'Windows-on-ARM-Experiments/MINGW-packages' }}
52+
packages_branch: ${{ inputs.packages_branch || 'woarm64' }}
53+
runner_arch: ${{ inputs.arch || 'aarch64' }}
54+
cross: false
55+
check: true
56+
check_module: ${{ inputs.gcc_module || '' }}
57+
check_filter: ${{ inputs.gcc_test_filter || '' }}
58+
59+
create-summary:
60+
needs: build-and-test-mingw-w64-gcc
61+
name: Create summary
62+
runs-on: ubuntu-latest
63+
64+
steps:
65+
- name: Checkout mingw-woarm64-build repository
66+
uses: actions/checkout@v4
67+
with:
68+
repository: Windows-on-ARM-Experiments/mingw-woarm64-build
69+
70+
- name: Download test results artifacts
71+
uses: actions/download-artifact@v4
72+
with:
73+
name: mingw-w64-gcc-test-results
74+
path: ${{ github.workspace }}/test-results
75+
76+
- name: Create summary
77+
run: |
78+
.github/scripts/toolchain/create-gcc-summary.sh ${{ github.workspace }}/test-results >> $GITHUB_STEP_SUMMARY

‎.github/workflows/build-package.yml‎

Lines changed: 46 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -18,34 +18,56 @@ on:
1818
description: "Architecture to build on"
1919
type: string
2020
default: "x86_64"
21+
cross:
22+
description: "Use MSYS2 -> MINGW cross-compiler"
23+
type: boolean
24+
default: false
2125
needs:
2226
description: "Parent workflow job dependencies"
2327
type: string
2428
dependencies:
2529
description: "Install additional dependencies"
2630
type: string
2731
default: ""
32+
check:
33+
description: "Enable check step after the package is built"
34+
type: boolean
35+
default: false
36+
check_module:
37+
description: "Module to test"
38+
type: string
39+
default: ""
40+
check_filter:
41+
description: "Test filter"
42+
type: string
43+
default: ""
2844

2945
defaults:
3046
run:
3147
shell: msys2 {0}
3248

3349
env:
3450
GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
35-
CROSS_BUILD: ${{ inputs.runner_arch == 'aarch64' && '1' || '0' }}
51+
CROSS_BUILD: ${{ inputs.cross && '1' || '0' }}
3652
CLEAN_BUILD: 1
53+
NO_CHECK: ${{ inputs.check && '0' || '1' }}
54+
NO_ARCHIVE: ${{ inputs.check && '1' || '0' }}
55+
MODULE: ${{ inputs.check_module }}
56+
FILTER: ${{ inputs.check_filter }}
3757

3858
jobs:
3959
build:
4060
name: Build ${{ inputs.package_name }}
4161
runs-on: >-
4262
${{ fromJson(inputs.runner_arch == 'aarch64'
4363
&& '["Windows", "ARM64", "Blackhex"]'
44-
|| '["windows-latest"]') }}
64+
|| (inputs.check && '["Windows", "X64", "GCC"]' || '["windows-latest"]')
65+
) }}
66+
timeout-minutes: ${{ inputs.check && 720 || 180 }}
4567

4668
steps:
4769
- name: Kill hanging processes
48-
if: ${{ inputs.runner_arch == 'aarch64' }}
70+
if: ${{ inputs.runner_arch == 'aarch64' || inputs.check }}
4971
shell: powershell
5072
run: |
5173
tasklist
@@ -62,7 +84,7 @@ jobs:
6284
git config --global core.longpaths true
6385
6486
- name: Fix $PATH
65-
if: ${{ inputs.runner_arch == 'aarch64' }}
87+
if: ${{ inputs.runner_arch == 'aarch64' || inputs.check }}
6688
shell: powershell
6789
run: |
6890
Write-Output "GITHUB_PATH: $env:GITHUB_PATH"
@@ -120,8 +142,11 @@ jobs:
120142
mingw-w64-x86_64-jq \
121143
base-devel \
122144
${{ contains(inputs.packages_repository, 'MINGW')
123-
&& 'mingw-w64-cross-mingwarm64-gcc mingw-w64-cross-mingwarm64-windows-default-manifest mingw-w64-x86_64-gcc-libs'
124-
|| '' }} \
145+
&& (inputs.cross
146+
&& 'mingw-w64-cross-mingwarm64-gcc mingw-w64-cross-mingwarm64-windows-default-manifest mingw-w64-x86_64-gcc-libs'
147+
|| 'mingw-w64-aarch64-gcc')
148+
|| '' }} \
149+
${{ inputs.check && 'dejagnu' || ''}} \
125150
${{ inputs.dependencies }}
126151
127152
- name: Download artifacts
@@ -139,6 +164,11 @@ jobs:
139164
run: |
140165
`cygpath "${{ github.workspace }}"`/.github/scripts/pthread-headers-hack-before.sh
141166
167+
- name: Patch Dejagnu
168+
if: ${{ inputs.check }}
169+
run: |
170+
`cygpath "${{ github.workspace }}"`/.github/scripts/patch-dejagnu.sh
171+
142172
- name: Setup MINGWARM64 environment
143173
if: ${{ inputs.runner_arch == 'aarch64' }}
144174
run: |
@@ -156,7 +186,7 @@ jobs:
156186
key: ${{ inputs.package_name }}-ccache-${{ steps.enable-ccache.outputs.timestamp }}
157187
restore-keys: ${{ inputs.package_name }}-
158188

159-
- name: Build ${{ inputs.package_name }}
189+
- name: Build ${{ inputs.check && 'and test' || '' }} ${{ inputs.package_name }}
160190
working-directory: ${{ github.workspace }}/packages/${{ inputs.package_name }}
161191
run: |
162192
`cygpath "${{ github.workspace }}"`/.github/scripts/build-package.sh ${{ inputs.packages_repository }}
@@ -169,12 +199,21 @@ jobs:
169199
key: ${{ inputs.package_name }}-ccache-${{ steps.enable-ccache.outputs.timestamp }}
170200

171201
- name: Upload ${{ inputs.package_name }}
202+
if: ${{ !inputs.check }}
172203
uses: actions/upload-artifact@v4
173204
with:
174205
name: ${{ inputs.package_name }}
175206
retention-days: 7
176207
path: ${{ github.workspace }}/packages/${{ inputs.package_name }}/*.pkg.tar.zst
177208

209+
- name: Upload ${{ inputs.package_name }} test results
210+
if: ${{ inputs.check }}
211+
uses: actions/upload-artifact@v4
212+
with:
213+
name: ${{ inputs.package_name }}-test-results
214+
retention-days: 14
215+
path: ${{ github.workspace }}/packages/${{ inputs.package_name }}/src/test-results
216+
178217
- name: Upload build folder
179218
if: failure()
180219
uses: actions/upload-artifact@v4

‎patches/dejagnu/0001-local-exec.patch‎

Lines changed: 159 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,159 @@
1+
--- a/usr/share/dejagnu/remote.exp
2+
+++ b/usr/share/dejagnu/remote.exp
3+
@@ -164,14 +164,7 @@
4+
# ignore SIGHUP.
5+
global errorInfo
6+
if { $inp eq "" && $outp eq "" } {
7+
- set id -1
8+
- set result [catch "eval spawn -ignore SIGHUP \{${commandline}\}" pid]
9+
- if { $result == 0 } {
10+
- set result2 0
11+
- } else {
12+
- set pid 0
13+
- set result2 5
14+
- }
15+
+ set status [catch "exec timeout -k 5 10 $commandline" output]
16+
} else {
17+
# Use a command pipeline with open.
18+
if { $inp ne "" } {
19+
@@ -205,78 +198,80 @@
20+
}
21+
set pid [pid $id]
22+
set result [catch "spawn -ignore SIGHUP -leaveopen $id" result2]
23+
- }
24+
- # Prepend "-" to each pid, to generate the "process group IDs" needed by
25+
- # kill.
26+
- set pgid "-[join $pid { -}]"
27+
- verbose "pid is $pid $pgid"
28+
- if { $result != 0 || $result2 != 0 } {
29+
- # This shouldn't happen.
30+
- if {[info exists errorInfo]} {
31+
- set foo $errorInfo
32+
- } else {
33+
- set foo ""
34+
+
35+
+ # Prepend "-" to each pid, to generate the "process group IDs" needed by
36+
+ # kill.
37+
+ set pgid "-[join $pid { -}]"
38+
+ verbose "pid is $pid $pgid"
39+
+ if { $result != 0 || $result2 != 0 } {
40+
+ # This shouldn't happen.
41+
+ if {[info exists errorInfo]} {
42+
+ set foo $errorInfo
43+
+ } else {
44+
+ set foo ""
45+
+ }
46+
+ verbose "spawn -open $id failed, $result $result2, $foo"
47+
+ catch "close $id"
48+
+ return [list -1 "spawn failed"]
49+
}
50+
- verbose "spawn -open $id failed, $result $result2, $foo"
51+
- catch "close $id"
52+
- return [list -1 "spawn failed"]
53+
- }
54+
55+
- set got_eof 0
56+
- set output ""
57+
+ set got_eof 0
58+
+ set output ""
59+
60+
- # Wait for either $timeout seconds to elapse, or for the program to
61+
- # exit.
62+
- expect {
63+
- -i $spawn_id -timeout $timeout -re ".+" {
64+
- append output $expect_out(buffer)
65+
- exp_continue -continue_timer
66+
- }
67+
- timeout {
68+
- warning "program timed out"
69+
- }
70+
- eof {
71+
- set got_eof 1
72+
+ # Wait for either $timeout seconds to elapse, or for the program to
73+
+ # exit.
74+
+ expect {
75+
+ -i $spawn_id -timeout $timeout -re ".+" {
76+
+ append output $expect_out(buffer)
77+
+ exp_continue -continue_timer
78+
+ }
79+
+ timeout {
80+
+ warning "program timed out"
81+
+ }
82+
+ eof {
83+
+ set got_eof 1
84+
+ }
85+
}
86+
- }
87+
88+
- # If we didn't get EOF, we have to kill the poor defenseless program.
89+
- if { $got_eof } {
90+
- set pid -1
91+
- }
92+
- set r2 [close_wait_program $spawn_id $pid wres]
93+
- if { $id > 0 } {
94+
- if { $pid > 0 } {
95+
- # If timed-out, don't wait for all the processes associated
96+
- # with the pipeline to terminate as a stuck one would cause
97+
- # us to hang.
98+
- catch {fconfigure $id -blocking false}
99+
+ # If we didn't get EOF, we have to kill the poor defenseless program.
100+
+ if { $got_eof } {
101+
+ set pid -1
102+
}
103+
- set r2 [catch "close $id" res]
104+
- } else {
105+
- verbose "waitres is $wres" 2
106+
- if { $r2 == 0 } {
107+
- set r2 [lindex $wres 3]
108+
- if { [llength $wres] > 4 } {
109+
- if { [lindex $wres 4] eq "CHILDKILLED" } {
110+
- set r2 1
111+
- }
112+
+ set r2 [close_wait_program $spawn_id $pid wres]
113+
+ if { $id > 0 } {
114+
+ if { $pid > 0 } {
115+
+ # If timed-out, don't wait for all the processes associated
116+
+ # with the pipeline to terminate as a stuck one would cause
117+
+ # us to hang.
118+
+ catch {fconfigure $id -blocking false}
119+
}
120+
- if { $r2 != 0 } {
121+
- set res $wres
122+
+ set r2 [catch "close $id" res]
123+
+ } else {
124+
+ verbose "waitres is $wres" 2
125+
+ if { $r2 == 0 } {
126+
+ set r2 [lindex $wres 3]
127+
+ if { [llength $wres] > 4 } {
128+
+ if { [lindex $wres 4] eq "CHILDKILLED" } {
129+
+ set r2 1
130+
+ }
131+
+ }
132+
+ if { $r2 != 0 } {
133+
+ set res $wres
134+
+ } else {
135+
+ set res ""
136+
+ }
137+
} else {
138+
- set res ""
139+
+ set res "wait failed"
140+
}
141+
+ }
142+
+ if { $r2 != 0 || $res ne "" || ! $got_eof } {
143+
+ verbose "close result is $res"
144+
+ set status 1
145+
} else {
146+
- set res "wait failed"
147+
+ set status 0
148+
}
149+
}
150+
- if { $r2 != 0 || $res ne "" || ! $got_eof } {
151+
- verbose "close result is $res"
152+
- set status 1
153+
- } else {
154+
- set status 0
155+
- }
156+
+
157+
verbose "output is $output status $status"
158+
if { $outp eq "" || $outp eq "|& cat" } {
159+
return [list $status $output]

0 commit comments

Comments
 (0)