Skip to content

Commit ca85b5f

Browse files
committed
Add static build for CI/CD to run testcases which need private interface functions.
1 parent 3225f13 commit ca85b5f

File tree

2 files changed

+29
-14
lines changed

2 files changed

+29
-14
lines changed

.gitlab-ci.yml

+5
Original file line numberDiff line numberDiff line change
@@ -30,6 +30,11 @@ cmake-makefiles-current:
3030
script:
3131
- sh build/gitlab-ci cmake "Unix Makefiles" Release
3232

33+
cmake-makefiles-current-static:
34+
stage: build
35+
script:
36+
- sh build/gitlab-ci cmake "Unix Makefiles" Release static
37+
3338
cmake-ninja-current:
3439
stage: build
3540
script:

build/gitlab-ci

+24-14
Original file line numberDiff line numberDiff line change
@@ -46,24 +46,34 @@ cmake_build()
4646
mkdir cmake-build
4747
cd cmake-build
4848
opts="-Dfatal-warnings=ON"
49-
echo "Running cmake -G "$1" -DCMAKE_BUILD_TYPE="$2" -DCMAKE_INSTALL_PREFIX=../cmake-install ${opts} .."
50-
cmake -G "$1" -DCMAKE_BUILD_TYPE="$2" -DCMAKE_INSTALL_PREFIX=../cmake-install ${opts} ..
49+
para3=`echo "$3" | sed 's/./\L&/g'`
50+
if [ "$para3" = "static" ]; then
51+
opts2="-DBUILD_SHARED_LIBS:BOOL=OFF"
52+
else
53+
opts2=""
54+
fi
55+
echo "Running cmake -G "$1" -DCMAKE_BUILD_TYPE="$2" -DCMAKE_INSTALL_PREFIX=../cmake-install ${opts} ${opts2} .."
56+
cmake -G "$1" -DCMAKE_BUILD_TYPE="$2" -DCMAKE_INSTALL_PREFIX=../cmake-install ${opts} ${opts2} ..
5157
$COVERITY_BUILD cmake --build .
5258
cmake --build . --target install
5359
ctest -V
5460
cd ..
55-
# Build test project using find_package(Tiff CONFIG)
56-
mkdir cmake-test-build
57-
cd cmake-test-build
58-
cmake -G "$1" -DCMAKE_BUILD_TYPE="$2" "-DTiff_DIR=$PWD/../cmake-install/lib/cmake/tiff" -S ../build/test_cmake -B .
59-
cmake --build .
60-
cd ..
61-
mkdir cmake-test-no-target-build
62-
cd cmake-test-no-target-build
63-
cmake -G "$1" -DCMAKE_BUILD_TYPE="$2" "-DTiff_DIR=$PWD/../cmake-install/lib/cmake/tiff" -S ../build/test_cmake_no_target -B .
64-
cmake --build .
65-
# Return to cmake-build for coverity_build()
66-
cd ../cmake-build
61+
if [ "$para3" = "static" ]; then
62+
echo No test project build for STATIC CI/CD build - skipped -.
63+
else
64+
# Build test project using find_package(Tiff CONFIG)
65+
mkdir cmake-test-build
66+
cd cmake-test-build
67+
cmake -G "$1" -DCMAKE_BUILD_TYPE="$2" "-DTiff_DIR=$PWD/../cmake-install/lib/cmake/tiff" -S ../build/test_cmake -B .
68+
cmake --build .
69+
cd ..
70+
mkdir cmake-test-no-target-build
71+
cd cmake-test-no-target-build
72+
cmake -G "$1" -DCMAKE_BUILD_TYPE="$2" "-DTiff_DIR=$PWD/../cmake-install/lib/cmake/tiff" -S ../build/test_cmake_no_target -B .
73+
cmake --build .
74+
# Return to cmake-build for coverity_build()
75+
cd ../cmake-build
76+
fi
6777
}
6878

6979
# Static-analysis with coverity

0 commit comments

Comments
 (0)