Movatterモバイル変換

[0]ホーム
URL:

Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

 Sign up
Appearance settings

Commitd9b5e2f

Browse files
committed
meson: ci: ensure tests are built before running them
Meson 1.7 stopped building all the dependencies of tests as part of thedefault build target. But it does breaks CI because we only built the defaulttarget before running the test, and ran the tests with --no-rebuild.The simplest fix would be to remove --no-rebuild from MTEST_ARGS, but it seemsbetter to explicitly build the test dependencies, so compiler warnings /errors are visible as part of the build step.Discussion:https://postgr.es/m/CAGECzQSvM3iSDmjF+=Kof5an6jN8UbkP_4cKKT9w6GZavmb5yQ@mail.gmail.comBackpatch: 16-, where meson was added
1 parentad80e58 commitd9b5e2f

File tree

1 file changed

+10
-7
lines changed

1 file changed

+10
-7
lines changed

‎.cirrus.tasks.yml

Lines changed: 10 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,9 @@ env:
1717
CHECK:check-world PROVE_FLAGS=$PROVE_FLAGS
1818
CHECKFLAGS:-Otarget
1919
PROVE_FLAGS:--timer
20+
# Build test dependencies as part of the build step, to see compiler
21+
# errors/warnings in one place.
22+
MBUILD_TARGET:all testprep
2023
MTEST_ARGS:--print-errorlogs --no-rebuild -C build
2124
PGCTLTIMEOUT:120# avoids spurious failures during parallel tests
2225
TEMP_CONFIG:${CIRRUS_WORKING_DIR}/src/tools/ci/pg_ci_base.conf
@@ -99,7 +102,7 @@ task:
99102
EOF
100103
build_script:|
101104
su postgres <<-EOF
102-
ninja -C build -j${BUILD_JOBS}
105+
ninja -C build -j${BUILD_JOBS} ${MBUILD_TARGET}
103106
EOF
104107
upload_caches:ccache
105108

@@ -176,7 +179,7 @@ task:
176179
-Dextra_lib_dirs=/usr/local/lib -Dextra_include_dirs=/usr/local/include/ \
177180
build
178181
EOF
179-
build_script:su postgres -c 'ninja -C build -j${BUILD_JOBS}'
182+
build_script:su postgres -c 'ninja -C build -j${BUILD_JOBS} ${MBUILD_TARGET}'
180183
upload_caches:ccache
181184

182185
test_world_script:|
@@ -378,8 +381,8 @@ task:
378381
build-32
379382
EOF
380383
381-
build_script:su postgres -c 'ninja -C build -j${BUILD_JOBS}'
382-
build_32_script:su postgres -c 'ninja -C build-32 -j${BUILD_JOBS}'
384+
build_script:su postgres -c 'ninja -C build -j${BUILD_JOBS} ${MBUILD_TARGET}'
385+
build_32_script:su postgres -c 'ninja -C build-32 -j${BUILD_JOBS} ${MBUILD_TARGET}'
383386

384387
upload_caches:ccache
385388

@@ -498,7 +501,7 @@ task:
498501
-DPG_TEST_EXTRA="$PG_TEST_EXTRA" \
499502
build
500503
501-
build_script:ninja -C build -j${BUILD_JOBS}
504+
build_script:ninja -C build -j${BUILD_JOBS} ${MBUILD_TARGET}
502505
upload_caches:ccache
503506

504507
test_world_script:|
@@ -571,7 +574,7 @@ task:
571574
572575
build_script:|
573576
vcvarsall x64
574-
ninja -C build
577+
ninja -C build %MBUILD_TARGET%
575578
576579
check_world_script:|
577580
vcvarsall x64
@@ -629,7 +632,7 @@ task:
629632
%BASH% -c "meson setup -Ddebug=true -Doptimization=g -Dcassert=true -Db_pch=true -Dnls=disabled -DTAR=%TAR% build"
630633
631634
build_script:|
632-
%BASH% -c "ninja -C build"
635+
%BASH% -c "ninja -C build ${MBUILD_TARGET}"
633636
634637
upload_caches:ccache
635638

0 commit comments

Comments
 (0)
[8]ページ先頭
©2009-2025 Movatter.jp