diff options
author | Daiki Ueno <ueno@unixuser.org> | 2018-06-12 14:42:43 +0000 |
---|---|---|
committer | Daiki Ueno <ueno@unixuser.org> | 2018-06-12 14:42:43 +0000 |
commit | 2a26b20ab61919fee8b4d0ffae5e18303e41501c (patch) | |
tree | 68a2f15deb254b1eae393285698bd5af9871aa4d | |
parent | 1c83f5bf6d3fdb646d31d4ac4f0f38c8f5e1ac9d (diff) | |
parent | 660b125cd8f4e44128eafbbe9fda42bdc08d9fd3 (diff) | |
download | gnome-keyring-2a26b20ab61919fee8b4d0ffae5e18303e41501c.tar.gz |
Merge branch 'wip/dueno/gitlab-ci' into 'master'
build: Enable gitlab-ci
See merge request GNOME/gnome-keyring!1
-rw-r--r-- | .gitlab-ci.yml | 83 | ||||
-rw-r--r-- | pkcs11/wrap-layer/gkm-wrap-layer.c | 4 |
2 files changed, 85 insertions, 2 deletions
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml new file mode 100644 index 00000000..c4c8ea6a --- /dev/null +++ b/.gitlab-ci.yml @@ -0,0 +1,83 @@ +stages: + - build + - deploy + +variables: + DEPENDENCIES: dbus-x11 gcc gnome-common gtk-doc make openssh python redhat-rpm-config + +fedora:Werror: + image: fedora:rawhide + stage: build + before_script: + - dnf install -y 'dnf-command(builddep)' + - dnf builddep -y gnome-keyring + - dnf install -y $DEPENDENCIES + - dbus-uuidgen --ensure + script: + - ./autogen.sh --disable-dependency-tracking --enable-gtk-doc --enable-strict CFLAGS="-Wno-error=deprecated-declarations" + - make -j$(nproc) V=1 + - eval `dbus-launch --sh-syntax` + - make -j$(nproc) V=1 distcheck + +fedora:asan: + image: fedora:rawhide + stage: build + before_script: + - dnf install -y 'dnf-command(builddep)' + - dnf builddep -y gnome-keyring + - dnf install -y $DEPENDENCIES libasan + - dbus-uuidgen --ensure + script: + - ./autogen.sh --disable-dependency-tracking CFLAGS='-fsanitize=address -g -fno-common -U_FORTIFY_SOURCE' CXXFLAGS='-fsanitize=address -g -fno-common -U_FORTIFY_SOURCE' LDFLAGS='-fsanitize=address -g -fno-common -U_FORTIFY_SOURCE' LIBS='-lasan -ldl -lpthread' + - make -j$(nproc) V=1 + - eval `dbus-launch --sh-syntax` + - LSAN_OPTIONS=exitcode=0 make -j$(nproc) V=1 DISABLE_HARD_ERRORS=1 XFAIL_TESTS="\$(JS_TESTS) \$(PY_TESTS)" check + artifacts: + paths: + - test-suite.log + +fedora:ubsan: + image: fedora:rawhide + stage: build + before_script: + - dnf install -y 'dnf-command(builddep)' + - dnf builddep -y gnome-keyring + - dnf install -y $DEPENDENCIES libubsan + - dbus-uuidgen --ensure + script: + - ./autogen.sh --disable-dependency-tracking CFLAGS='-fsanitize=undefined -g -fno-common -U_FORTIFY_SOURCE' CXXFLAGS='-fsanitize=undefined -g -fno-common -U_FORTIFY_SOURCE' LDFLAGS='-fsanitize=undefined -g -fno-common -U_FORTIFY_SOURCE' LIBS='-lubsan -ldl -lpthread' + - make -j$(nproc) V=1 + - eval `dbus-launch --sh-syntax` + - make -j$(nproc) V=1 check + artifacts: + paths: + - test-suite.log + +fedora:coverage: + image: fedora:rawhide + stage: build + before_script: + - dnf install -y 'dnf-command(builddep)' + - dnf builddep -y gnome-keyring + - dnf install -y $DEPENDENCIES lcov + - dbus-uuidgen --ensure + script: + - ./autogen.sh --disable-dependency-tracking --enable-coverage + - make -j$(nproc) V=1 + - eval `dbus-launch --sh-syntax` + - make -j$(nproc) V=1 check + - make coverage + coverage: '/^\s+lines.+:\s+([\d.]+\%)\s+/' + artifacts: + name: "gnome-keyring-${CI_JOB_NAME}-${CI_COMMIT_REF_NAME}" + paths: + - build/coverage/ + +pages: + stage: deploy + script: + - mkdir -p public + - mv build/coverage public/coverage + artifacts: + paths: + - public diff --git a/pkcs11/wrap-layer/gkm-wrap-layer.c b/pkcs11/wrap-layer/gkm-wrap-layer.c index aa02e6ad..cd1bf314 100644 --- a/pkcs11/wrap-layer/gkm-wrap-layer.c +++ b/pkcs11/wrap-layer/gkm-wrap-layer.c @@ -280,8 +280,8 @@ wrap_C_GetInfo (CK_INFO_PTR info) info->libraryVersion.major = LIBRARY_VERSION_MAJOR; info->libraryVersion.minor = LIBRARY_VERSION_MINOR; info->flags = 0; - strncpy ((char*)info->manufacturerID, MANUFACTURER_ID, 32); - strncpy ((char*)info->libraryDescription, LIBRARY_DESCRIPTION, 32); + memcpy ((char*)info->manufacturerID, MANUFACTURER_ID, 32); + memcpy ((char*)info->libraryDescription, LIBRARY_DESCRIPTION, 32); return CKR_OK; } |