smallsolar
/
libkiwix
mirror of https://github.com/kiwix/libkiwix.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #362 from kiwix/build_ci_bionic

This commit is contained in:
Matthieu Gautier 2020-06-09 12:13:34 +02:00 committed by GitHub
parent fd62acd232 157d1664cf
commit 6c49c7ee0a
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 21 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
.github/workflows/ci.yml vendored
View File

@ -53,30 +53,41 @@ jobs:
strategy: strategy:
fail-fast: false fail-fast: false
matrix: matrix:
target: name:
- native_static - native_static
- native_dyn - native_dyn
- native_dyn_bionic
- android_arm - android_arm
- android_arm64 - android_arm64
- win32_static - win32_static
- win32_dyn - win32_dyn
include: include:
- target: native_static - name: native_static
target: native_static
image_variant: xenial image_variant: xenial
lib_postfix: '/x86_64-linux-gnu' lib_postfix: '/x86_64-linux-gnu'
- target: native_dyn - name: native_dyn
target: native_dyn
image_variant: xenial image_variant: xenial
lib_postfix: '/x86_64-linux-gnu' lib_postfix: '/x86_64-linux-gnu'
- target: android_arm - name: native_dyn_bionic
target: native_dyn
image_variant: bionic
lib_postfix: '/x86_64-linux-gnu'
- name: android_arm
target: android_arm
image_variant: xenial image_variant: xenial
lib_postfix: '/x86_64-linux-gnu' lib_postfix: '/x86_64-linux-gnu'
- target: android_arm64 - name: android_arm64
target: android_arm64
image_variant: xenial image_variant: xenial
lib_postfix: '/x86_64-linux-gnu' lib_postfix: '/x86_64-linux-gnu'
- target: win32_static - name: win32_static
target: win32_static
image_variant: f31 image_variant: f31
lib_postfix: '64' lib_postfix: '64'
- target: win32_dyn - name: win32_dyn
target: win32_dyn
image_variant: f31 image_variant: f31
lib_postfix: '64' lib_postfix: '64'
env: env:
@ -147,6 +158,6 @@ jobs:
curl https://codecov.io/bash -o codecov.sh curl https://codecov.io/bash -o codecov.sh
bash codecov.sh -n "${OS_NAME}_${{matrix.target}}" -Z bash codecov.sh -n "${OS_NAME}_${{matrix.target}}" -Z
rm codecov.sh rm codecov.sh
if: startsWith(matrix.target, 'native_') if: startsWith(matrix.target, 'native_') && matrix.image_variant == 'xenial'
env: env:
CODECOV_TOKEN: ${{ secrets.CODECOV_TOKEN }} CODECOV_TOKEN: ${{ secrets.CODECOV_TOKEN }}

4
test/server.cpp
View File

@ -438,7 +438,7 @@ TEST_F(ServerTest, ValidSingleRangeByteRangeRequestsAreHandledProperly)
const auto p = zfs1_->GET(url, { {"Range", "bytes=0-10"} } ); const auto p = zfs1_->GET(url, { {"Range", "bytes=0-10"} } );
EXPECT_EQ(206, p->status); EXPECT_EQ(206, p->status);
EXPECT_EQ("bytes 0-10/20077", p->get_header_value("Content-Range")); EXPECT_EQ("bytes 0-10/20077", p->get_header_value("Content-Range"));
EXPECT_EQ(11, p->body.size()); EXPECT_EQ(11U, p->body.size());
EXPECT_EQ(full->body.substr(0, 11), p->body); EXPECT_EQ(full->body.substr(0, 11), p->body);
EXPECT_EQ("bytes", p->get_header_value("Accept-Ranges")); EXPECT_EQ("bytes", p->get_header_value("Accept-Ranges"));
} }
@ -447,7 +447,7 @@ TEST_F(ServerTest, ValidSingleRangeByteRangeRequestsAreHandledProperly)
const auto p = zfs1_->GET(url, { {"Range", "bytes=123-456"} } ); const auto p = zfs1_->GET(url, { {"Range", "bytes=123-456"} } );
EXPECT_EQ(206, p->status); EXPECT_EQ(206, p->status);
EXPECT_EQ("bytes 123-456/20077", p->get_header_value("Content-Range")); EXPECT_EQ("bytes 123-456/20077", p->get_header_value("Content-Range"));
EXPECT_EQ(334, p->body.size()); EXPECT_EQ(334U, p->body.size());
EXPECT_EQ(full->body.substr(123, 334), p->body); EXPECT_EQ(full->body.substr(123, 334), p->body);
EXPECT_EQ("bytes", p->get_header_value("Accept-Ranges")); EXPECT_EQ("bytes", p->get_header_value("Accept-Ranges"));
} }