From d1f2d1b989114b867a3051093298215e61ad432f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Thomas=20Wei=C3=9Fschuh?= Date: Wed, 7 Aug 2024 09:52:32 +0200 Subject: [PATCH 1/5] run-all --- .github/workflows/cibuild.yml | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/.github/workflows/cibuild.yml b/.github/workflows/cibuild.yml index 2aacc49d1e8..e0f0b09ea11 100644 --- a/.github/workflows/cibuild.yml +++ b/.github/workflows/cibuild.yml @@ -245,6 +245,4 @@ jobs: - name: Check run: | source .github/workflows/openwrt-sdk-env.sh ~/${{ env.OPENWRT_SDK }} - if [[ "$OPENWRT_TARGET" = "x86" ]]; then - .github/workflows/cibuild.sh CHECK - fi + .github/workflows/cibuild.sh CHECK From 4c0b1941451d7722c267f130dde4f2b7d2e1208c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Thomas=20Wei=C3=9Fschuh?= Date: Wed, 7 Aug 2024 09:56:23 +0200 Subject: [PATCH 2/5] binfmt --- .github/workflows/cibuild.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.github/workflows/cibuild.yml b/.github/workflows/cibuild.yml index e0f0b09ea11..c7c70696568 100644 --- a/.github/workflows/cibuild.yml +++ b/.github/workflows/cibuild.yml @@ -215,6 +215,8 @@ jobs: uses: actions/checkout@v1 - name: Ubuntu setup run: sudo -E .github/workflows/cibuild-setup-ubuntu.sh + - name: Install qemu-user + run: sudo -E apt-get install qemu-user-binfmt - name: OpenWrt environment run: | OPENWRT_RELEASE=23.05.4 From a20d4aa15ee2194d8d315bd526b8b076f5a658fc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Thomas=20Wei=C3=9Fschuh?= Date: Wed, 7 Aug 2024 10:09:34 +0200 Subject: [PATCH 3/5] qemu_user --- .github/workflows/cibuild.yml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/.github/workflows/cibuild.yml b/.github/workflows/cibuild.yml index c7c70696568..9209b80713d 100644 --- a/.github/workflows/cibuild.yml +++ b/.github/workflows/cibuild.yml @@ -246,5 +246,8 @@ jobs: .github/workflows/cibuild.sh MAKE - name: Check run: | + if [[ "$OPENWRT_TARGET" != "x86" ]]; then + export QEMU_USER=1 + fi source .github/workflows/openwrt-sdk-env.sh ~/${{ env.OPENWRT_SDK }} .github/workflows/cibuild.sh CHECK From 0d7ed21feac13e57faaefb21b76b9583b61b1bc9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Thomas=20Wei=C3=9Fschuh?= Date: Wed, 7 Aug 2024 10:20:13 +0200 Subject: [PATCH 4/5] setarch --- tests/ts/misc/setarch | 1 + 1 file changed, 1 insertion(+) diff --git a/tests/ts/misc/setarch b/tests/ts/misc/setarch index e7b6ff34c1a..502f39caf2e 100755 --- a/tests/ts/misc/setarch +++ b/tests/ts/misc/setarch @@ -20,6 +20,7 @@ ts_init "$*" ts_check_test_command "$TS_CMD_SETARCH" ts_skip_docker +ts_skip_qemu_user ARCH=$(uname -m) From 11b5c29820b132f0095f70cfdf1504b24da396f8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Thomas=20Wei=C3=9Fschuh?= Date: Wed, 7 Aug 2024 18:42:48 +0200 Subject: [PATCH 5/5] timeout --- tests/ts/lsfd/column-ainodeclass | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/ts/lsfd/column-ainodeclass b/tests/ts/lsfd/column-ainodeclass index ab2abebd6ad..e8bc5873174 100755 --- a/tests/ts/lsfd/column-ainodeclass +++ b/tests/ts/lsfd/column-ainodeclass @@ -33,7 +33,7 @@ EXPR="(FD == 3)" for C in pidfd inotify; do ts_init_subtest $C { - coproc MKFDS { "$TS_HELPER_MKFDS" $C $FD ; } + coproc MKFDS { timeout 60s "$TS_HELPER_MKFDS" $C $FD ; } if read -r -u "${MKFDS[0]}" PID; then ${TS_CMD_LSFD} -n -o ASSOC,STTYPE,AINODECLASS -p "${PID}" -Q "${EXPR}" echo "$C"':ASSOC,STTYPE,AINODECLASS': $?