8000 gitlab-ci: Also test modules which are disabled by default · GNOME/libxslt@04a38be · GitHub
[go: up one dir, main page]

Skip to content

Commit 04a38be

Browse files
committed
gitlab-ci: Also test modules which are disabled by default
1 parent 09b4191 commit 04a38be

File tree

3 files changed

+6
-3
lines changed

3 files changed

+6
-3
lines changed

.gitlab-ci.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,8 @@
11
.test:
22
# Reuse libxml2 image
33
image: registry.gitlab.gnome.org/gnome/libxml2
4+
variables:
5+
BASE_CONFIG: "--with-crypto --with-modules --with-debug --with-debugger"
46
script:
57
- sh .gitlab-ci/test.sh
68

@@ -67,8 +69,6 @@ mingw:w64-x86_64:shared:
6769

6870
.cmake:linux:
6971
image: registry.gitlab.gnome.org/gnome/libxml2
70-
variables:
71-
CMAKE_OPTIONS: -DLIBXSLT_WITH_CRYPTO=ON
7272
script:
7373
- sh .gitlab-ci/test_cmake.sh
7474
artifacts:

.gitlab-ci/test.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,6 @@ sh ../autogen.sh \
1414
--with-crypto \
1515
--with-plugins \
1616
--with-libxml-src=../libxml2 \
17-
$CONFIG
17+
$BASE_CONFIG $CONFIG
1818
make -j$(nproc) V=1 CFLAGS="$CFLAGS -Werror"
1919
make -s CFLAGS="$CFLAGS -Werror" check

.gitlab-ci/test_cmake.sh

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,10 @@ cmake "$@" \
1919
-DCMAKE_INSTALL_PREFIX=libxslt-install \
2020
-DCMAKE_BUILD_TYPE=RelWithDebInfo \
2121
-DCMAKE_C_FLAGS='-Werror' \
22+
-DLIBXSLT_WITH_CRYPTO=ON \
2223
-DLIBXSLT_WITH_MODULES=ON \
24+
-DLIBXSLT_WITH_DEBUG=ON \
25+
-DLIBXSLT_WITH_DEBUGGER=ON \
2326
$CMAKE_OPTIONS \
2427
-S . -B libxslt-build
2528
cmake --build libxslt-build --target install

0 commit comments

Comments
 (0)
0