mirror of https://github.com/ceph/go-ceph
cutil: enable PtrGuard by default
Signed-off-by: Sven Anderson <sven@redhat.com>
This commit is contained in:
parent
a54c6e74e3
commit
05b4e70014
|
@ -22,8 +22,8 @@
|
|||
"GODEBUG": "cgocheck=2",
|
||||
"CEPH_CONF": "/ceph_a/ceph.conf",
|
||||
},
|
||||
"go.buildTags": "ptrguard",
|
||||
"go.testTags": "ptrguard",
|
||||
"go.buildTags": "",
|
||||
"go.testTags": "",
|
||||
"go.testFlags": [
|
||||
"-v",
|
||||
"-count=1"
|
||||
|
|
|
@ -42,8 +42,8 @@ jobs:
|
|||
- uses: actions/checkout@v2
|
||||
- name: Run tests
|
||||
run: make test-containers-test "CEPH_VERSION=${{ matrix.ceph_version }}" "RESULTS_DIR=$PWD/_results"
|
||||
- name: Run tests with ptrguard
|
||||
run: make test-containers-test "CEPH_VERSION=${{ matrix.ceph_version }}" "USE_PTRGUARD=true" "RESULTS_DIR=$PWD/_results"
|
||||
- name: Run tests without ptrguard
|
||||
run: make test-containers-test "CEPH_VERSION=${{ matrix.ceph_version }}" "NO_PTRGUARD=true" "RESULTS_DIR=$PWD/_results"
|
||||
- name: Clean up test containers
|
||||
run: make test-containers-clean "CEPH_VERSION=${{ matrix.ceph_version }}"
|
||||
- name: Archive coverage results
|
||||
|
|
6
Makefile
6
Makefile
|
@ -41,9 +41,9 @@ TEST_CTR_NET=.run.test_ceph_net
|
|||
# the name of the image plus ceph version as tag
|
||||
CI_IMAGE_TAG=$(CI_IMAGE_NAME):$(CEPH_VERSION)
|
||||
|
||||
ifneq ($(USE_PTRGUARD),)
|
||||
CONTAINER_OPTS += -e USE_PTRGUARD=true
|
||||
BUILD_TAGS := $(BUILD_TAGS),ptrguard
|
||||
ifneq ($(NO_PTRGUARD),)
|
||||
CONTAINER_OPTS += -e NO_PTRGUARD=true
|
||||
BUILD_TAGS := $(BUILD_TAGS),no_ptrguard
|
||||
endif
|
||||
|
||||
ifneq ($(NO_PREVIEW),)
|
||||
|
|
|
@ -308,8 +308,8 @@ if [ -n "${CEPH_VERSION}" ]; then
|
|||
add_build_tag "${CEPH_VERSION}"
|
||||
fi
|
||||
|
||||
if [ -n "${USE_PTRGUARD}" ]; then
|
||||
add_build_tag "ptrguard"
|
||||
if [ -n "${NO_PTRGUARD}" ]; then
|
||||
add_build_tag "no_ptrguard"
|
||||
fi
|
||||
|
||||
if [ -z "${NO_PREVIEW}" ]; then
|
||||
|
|
|
@ -1,5 +1,5 @@
|
|||
//go:build ptrguard
|
||||
// +build ptrguard
|
||||
//go:build !no_ptrguard
|
||||
// +build !no_ptrguard
|
||||
|
||||
package cutil
|
||||
|
||||
|
|
|
@ -1,5 +1,5 @@
|
|||
//go:build !ptrguard
|
||||
// +build !ptrguard
|
||||
//go:build no_ptrguard
|
||||
// +build no_ptrguard
|
||||
|
||||
package cutil
|
||||
|
||||
|
|
Loading…
Reference in New Issue