Skip to content

Commit caf12d9

Browse files
authored
Merge pull request #174 from muzarski/fix-build-it-condition-in-ci
makefile: fix rebuild IT binary condition
2 parents e4396cd + ed2ed65 commit caf12d9

File tree

1 file changed

+2
-6
lines changed

1 file changed

+2
-6
lines changed

Makefile

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -60,10 +60,6 @@ ifndef CASSANDRA_VERSION
6060
CASSANDRA_VERSION := 3.11.17
6161
endif
6262

63-
ifndef DONT_REBUILD_INTEGRATION_BIN
64-
DONT_REBUILD_INTEGRATION_BIN := ${EMPTY}
65-
endif
66-
6763
CURRENT_DIR := $(dir $(abspath $(lastword $(MAKEFILE_LIST))))
6864
BUILD_DIR := "${CURRENT_DIR}build"
6965
INTEGRATION_TEST_BIN := ${BUILD_DIR}/cassandra-integration-tests
@@ -171,7 +167,7 @@ download-ccm-cassandra-image: install-ccm-if-missing
171167
@rm -rf /tmp/download-cassandra.ccm
172168

173169
run-test-integration-scylla: prepare-integration-test download-ccm-scylla-image
174-
ifeq ($(DONT_REBUILD_INTEGRATION_BIN), $(EMPTY))
170+
ifdef DONT_REBUILD_INTEGRATION_BIN
175171
run-test-integration-scylla: build-integration-test-bin-if-missing
176172
else
177173
run-test-integration-scylla: build-integration-test-bin
@@ -180,7 +176,7 @@ endif
180176
valgrind --error-exitcode=123 --leak-check=full --errors-for-leak-kinds=definite build/cassandra-integration-tests --scylla --version=${SCYLLA_VERSION} --category=CASSANDRA --verbose=ccm --gtest_filter="${SCYLLA_TEST_FILTER}"
181177

182178
run-test-integration-cassandra: prepare-integration-test download-ccm-cassandra-image install-java8-if-missing
183-
ifeq ($(DONT_REBUILD_INTEGRATION_BIN), $(EMPTY))
179+
ifdef DONT_REBUILD_INTEGRATION_BIN
184180
run-test-integration-cassandra: build-integration-test-bin-if-missing
185181
else
186182
run-test-integration-cassandra: build-integration-test-bin

0 commit comments

Comments
 (0)