|
17 | 17 | CHECK: check-world PROVE_FLAGS=$PROVE_FLAGS
|
18 | 18 | CHECKFLAGS: -Otarget
|
19 | 19 | 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 |
20 | 23 | MTEST_ARGS: --print-errorlogs --no-rebuild -C build
|
21 | 24 | PGCTLTIMEOUT: 120 # avoids spurious failures during parallel tests
|
22 | 25 | TEMP_CONFIG: ${CIRRUS_WORKING_DIR}/src/tools/ci/pg_ci_base.conf
|
|
99 | 102 | EOF
|
100 | 103 | build_script: |
|
101 | 104 | su postgres <<-EOF
|
102 |
| - ninja -C build -j${BUILD_JOBS} |
| 105 | + ninja -C build -j${BUILD_JOBS} ${MBUILD_TARGET} |
103 | 106 | EOF
|
104 | 107 | upload_caches: ccache
|
105 | 108 |
|
@@ -178,7 +181,7 @@ task:
|
178 | 181 | -Dextra_lib_dirs=/usr/local/lib -Dextra_include_dirs=/usr/local/include/ \
|
179 | 182 | build
|
180 | 183 | EOF
|
181 |
| - build_script: su postgres -c 'ninja -C build -j${BUILD_JOBS}' |
| 184 | + build_script: su postgres -c 'ninja -C build -j${BUILD_JOBS} ${MBUILD_TARGET}' |
182 | 185 | upload_caches: ccache
|
183 | 186 |
|
184 | 187 | test_world_script: |
|
@@ -381,8 +384,8 @@ task:
|
381 | 384 | build-32
|
382 | 385 | EOF
|
383 | 386 |
|
384 |
| - build_script: su postgres -c 'ninja -C build -j${BUILD_JOBS}' |
385 |
| - build_32_script: su postgres -c 'ninja -C build-32 -j${BUILD_JOBS}' |
| 387 | + build_script: su postgres -c 'ninja -C build -j${BUILD_JOBS} ${MBUILD_TARGET}' |
| 388 | + build_32_script: su postgres -c 'ninja -C build-32 -j${BUILD_JOBS} ${MBUILD_TARGET}' |
386 | 389 |
|
387 | 390 | upload_caches: ccache
|
388 | 391 |
|
@@ -503,7 +506,7 @@ task:
|
503 | 506 | -Duuid=e2fs -Ddtrace=auto \
|
504 | 507 | build
|
505 | 508 |
|
506 |
| - build_script: ninja -C build -j${BUILD_JOBS} |
| 509 | + build_script: ninja -C build -j${BUILD_JOBS} ${MBUILD_TARGET} |
507 | 510 | upload_caches: ccache
|
508 | 511 |
|
509 | 512 | test_world_script: |
|
@@ -576,7 +579,7 @@ task:
|
576 | 579 |
|
577 | 580 | build_script: |
|
578 | 581 | vcvarsall x64
|
579 |
| - ninja -C build |
| 582 | + ninja -C build %MBUILD_TARGET% |
580 | 583 |
|
581 | 584 | check_world_script: |
|
582 | 585 | vcvarsall x64
|
@@ -634,7 +637,7 @@ task:
|
634 | 637 | %BASH% -c "meson setup -Ddebug=true -Doptimization=g -Dcassert=true -Dinjection_points=true -Db_pch=true -Dnls=disabled -DTAR=%TAR% build"
|
635 | 638 |
|
636 | 639 | build_script: |
|
637 |
| - %BASH% -c "ninja -C build" |
| 640 | + %BASH% -c "ninja -C build ${MBUILD_TARGET}" |
638 | 641 |
|
639 | 642 | upload_caches: ccache
|
640 | 643 |
|
|
0 commit comments