| Message ID | 20220925113032.1949844-53-bmeng.cn@gmail.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | tests/qtest: Enable running qtest on Windows | expand |
On 25/09/2022 13.30, Bin Meng wrote: > From: Bin Meng <bin.meng@windriver.com> > > When CI fails we don't know what causes the failure. Displaying the > meson test logs can be helpful. > > Signed-off-by: Bin Meng <bin.meng@windriver.com> > --- > > (no changes since v2) > > Changes in v2: > - new patch: Display meson test logs in the Windows CI > > .gitlab-ci.d/windows.yml | 4 ++-- > 1 file changed, 2 insertions(+), 2 deletions(-) > > diff --git a/.gitlab-ci.d/windows.yml b/.gitlab-ci.d/windows.yml > index 9ef4667317..29a3ba04a4 100644 > --- a/.gitlab-ci.d/windows.yml > +++ b/.gitlab-ci.d/windows.yml > @@ -61,7 +61,7 @@ msys2-64bit: > - .\msys64\usr\bin\bash -lc './configure --target-list=x86_64-softmmu > --enable-capstone' > - .\msys64\usr\bin\bash -lc 'make' > - - .\msys64\usr\bin\bash -lc 'make check' > + - .\msys64\usr\bin\bash -lc 'make check || { cat build/meson-logs/testlog.txt; exit 1; } ;' > > msys2-32bit: > extends: .shared_msys2_builder > @@ -94,4 +94,4 @@ msys2-32bit: > - cd output > - ..\msys64\usr\bin\bash -lc "../configure --target-list=ppc64-softmmu" > - ..\msys64\usr\bin\bash -lc 'make' > - - ..\msys64\usr\bin\bash -lc 'make check' > + - ..\msys64\usr\bin\bash -lc 'make check || { cat meson-logs/testlog.txt; exit 1; } ;' Reviewed-by: Thomas Huth <thuth@redhat.com>
diff --git a/.gitlab-ci.d/windows.yml b/.gitlab-ci.d/windows.yml index 9ef4667317..29a3ba04a4 100644 --- a/.gitlab-ci.d/windows.yml +++ b/.gitlab-ci.d/windows.yml @@ -61,7 +61,7 @@ msys2-64bit: - .\msys64\usr\bin\bash -lc './configure --target-list=x86_64-softmmu --enable-capstone' - .\msys64\usr\bin\bash -lc 'make' - - .\msys64\usr\bin\bash -lc 'make check' + - .\msys64\usr\bin\bash -lc 'make check || { cat build/meson-logs/testlog.txt; exit 1; } ;' msys2-32bit: extends: .shared_msys2_builder @@ -94,4 +94,4 @@ msys2-32bit: - cd output - ..\msys64\usr\bin\bash -lc "../configure --target-list=ppc64-softmmu" - ..\msys64\usr\bin\bash -lc 'make' - - ..\msys64\usr\bin\bash -lc 'make check' + - ..\msys64\usr\bin\bash -lc 'make check || { cat meson-logs/testlog.txt; exit 1; } ;'