Skip to content

Commit

Permalink
update ERROR to info to avoid exit the test early
Browse files Browse the repository at this point in the history
  • Loading branch information
sophia-guo committed Dec 5, 2024
1 parent 1d1ef2f commit 1774f39
Showing 1 changed file with 9 additions and 5 deletions.
14 changes: 9 additions & 5 deletions test/system/reproducibleCompare/reproducible.mk
Original file line number Diff line number Diff line change
Expand Up @@ -14,9 +14,11 @@
ifndef SBOM_FILE
SBOM_FILE := $(shell ls $(TEST_ROOT)/../jdkbinary/ | grep "sbom" | grep -v "metadata")
ifeq ($(strip $(SBOM_FILE)),)
$(error ERROR! NO SBOM_FILE AVAILABLE)
endif
SBOM_FILE := $(TEST_ROOT)/../jdkbinary/$(SBOM_FILE)
$(info ERROR! NO SBOM_FILE AVAILABLE)
SBOM_FILE :=
else
SBOM_FILE := $(TEST_ROOT)/../jdkbinary/$(SBOM_FILE)
endif
endif

ifndef JDK_FILE
Expand All @@ -25,12 +27,14 @@ ifndef JDK_FILE
JDK_FILE := $(shell find $(TEST_ROOT)/../jdkbinary/ -type f -name '*-jdk_*.zip')
endif
ifeq ($(strip $(JDK_FILE)),)
$(error ERROR! NO JDK_FILE AVAILABLE)
$(info ERROR! NO JDK_FILE AVAILABLE)
endif
endif

ifneq (,$(findstring linux,$(SPEC)))
SBOM_FILE := $(subst $(TEST_ROOT)/../jdkbinary,/home/jenkins/test,$(SBOM_FILE))
ifneq ($(strip $(SBOM_FILE)),)
SBOM_FILE := $(subst $(TEST_ROOT)/../jdkbinary,/home/jenkins/test,$(SBOM_FILE))
endif
endif

RM_DEBUGINFO := $(shell find $(TEST_JDK_HOME) -type f -name "*.debuginfo" -delete)

0 comments on commit 1774f39

Please sign in to comment.