JBR-5445 JBRApiTest test fails on development builds

This commit is contained in:
Maxim Kartashev
2023-03-29 17:38:09 +04:00
committed by jbrbot
parent b5cf09c586
commit 1971246aa4
2 changed files with 3 additions and 3 deletions

View File

@@ -42,7 +42,7 @@ JBR_API_GENSRC_FILES := $(foreach f, $(call FindFiles, $(JBR_API_SRC_DIR)), \
$(JBR_API_GENSRC_DIR)/$(call RelativePath, $f, $(JBR_API_SRC_DIR)))
ifeq ($(JBR_API_JBR_VERSION),)
JBR_API_JBR_VERSION := <DEVELOPMENT>
JBR_API_JBR_VERSION := DEVELOPMENT
JBR_API_FAIL_ON_HASH_MISMATCH := false
else
.PHONY: $(JBR_API_VERSION_PROPERTIES)
@@ -90,4 +90,4 @@ ifneq ($(JBR_API_CONF_FILE),)
$(ECHO) "SOURCES_JAR=$(JBR_API_OUTPUT_DIR)/jbr-api-sources.jar" >> $(JBR_API_CONF_FILE)
jbr-api: $(JBR_API_CONF_FILE)
.PHONY: $(JBR_API_CONF_FILE)
endif
endif

View File

@@ -37,7 +37,7 @@ import java.util.Objects;
public class JBRApiTest {
public static void main(String[] args) throws Exception {
if (!JBR.getApiVersion().matches("\\w+\\.\\d+\\.\\d+\\.\\d+")) throw new Error("Invalid JBR API version");
if (!JBR.getApiVersion().matches("\\w+\\.\\d+\\.\\d+\\.\\d+")) throw new Error("Invalid JBR API version: " + JBR.getApiVersion());
if (!JBR.isAvailable()) throw new Error("JBR API is not available");
checkMetadata();
testServices();