RepoMirrors
/
go-ceph
mirror of https://github.com/ceph/go-ceph
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

cutil: enable PtrGuard by default 

Signed-off-by: Sven Anderson <sven@redhat.com>
This commit is contained in:
Sven Anderson 2022-04-27 00:22:02 +02:00 committed by mergify[bot]
parent a54c6e74e3
commit 05b4e70014
6 changed files with 13 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
.devcontainer/devcontainer.json
View File

@ -22,8 +22,8 @@
"GODEBUG": "cgocheck=2", "GODEBUG": "cgocheck=2",
"CEPH_CONF": "/ceph_a/ceph.conf", "CEPH_CONF": "/ceph_a/ceph.conf",
}, },
"go.buildTags": "ptrguard", "go.buildTags": "",
"go.testTags": "ptrguard", "go.testTags": "",
"go.testFlags": [ "go.testFlags": [
"-v", "-v",
"-count=1" "-count=1"

4
.github/workflows/main.yml vendored
View File

@ -42,8 +42,8 @@ jobs:
- uses: actions/checkout@v2 - uses: actions/checkout@v2
- name: Run tests - name: Run tests
run: make test-containers-test "CEPH_VERSION=${{ matrix.ceph_version }}" "RESULTS_DIR=$PWD/_results" run: make test-containers-test "CEPH_VERSION=${{ matrix.ceph_version }}" "RESULTS_DIR=$PWD/_results"
- name: Run tests with ptrguard - name: Run tests without ptrguard
run: make test-containers-test "CEPH_VERSION=${{ matrix.ceph_version }}" "USE_PTRGUARD=true" "RESULTS_DIR=$PWD/_results" run: make test-containers-test "CEPH_VERSION=${{ matrix.ceph_version }}" "NO_PTRGUARD=true" "RESULTS_DIR=$PWD/_results"
- name: Clean up test containers - name: Clean up test containers
run: make test-containers-clean "CEPH_VERSION=${{ matrix.ceph_version }}" run: make test-containers-clean "CEPH_VERSION=${{ matrix.ceph_version }}"
- name: Archive coverage results - name: Archive coverage results

6
Makefile
View File

@ -41,9 +41,9 @@ TEST_CTR_NET=.run.test_ceph_net
# the name of the image plus ceph version as tag # the name of the image plus ceph version as tag
CI_IMAGE_TAG=$(CI_IMAGE_NAME):$(CEPH_VERSION) CI_IMAGE_TAG=$(CI_IMAGE_NAME):$(CEPH_VERSION)
ifneq ($(USE_PTRGUARD),) ifneq ($(NO_PTRGUARD),)
CONTAINER_OPTS += -e USE_PTRGUARD=true CONTAINER_OPTS += -e NO_PTRGUARD=true
BUILD_TAGS := $(BUILD_TAGS),ptrguard BUILD_TAGS := $(BUILD_TAGS),no_ptrguard
endif endif
ifneq ($(NO_PREVIEW),) ifneq ($(NO_PREVIEW),)

4
entrypoint.sh
View File

@ -308,8 +308,8 @@ if [ -n "${CEPH_VERSION}" ]; then
add_build_tag "${CEPH_VERSION}" add_build_tag "${CEPH_VERSION}"
fi fi
if [ -n "${USE_PTRGUARD}" ]; then if [ -n "${NO_PTRGUARD}" ]; then
add_build_tag "ptrguard" add_build_tag "no_ptrguard"
fi fi
if [ -z "${NO_PREVIEW}" ]; then if [ -z "${NO_PREVIEW}" ]; then

4
internal/cutil/sync_buffer.go
View File

@ -1,5 +1,5 @@
//go:build ptrguard //go:build !no_ptrguard
// +build ptrguard // +build !no_ptrguard
package cutil package cutil

4
internal/cutil/sync_buffer_memcpy.go
View File

@ -1,5 +1,5 @@
//go:build !ptrguard //go:build no_ptrguard
// +build !ptrguard // +build no_ptrguard
package cutil package cutil