Merge pull request #543 from jdmpapin/version-exit-status

Ensure test-image-openj9 target fails when java -version fails
ibmruntimes · Jan 23, 2023 · 409e6dd · 409e6dd
2 parents f135fcb + 9a5a931
commit 409e6dd
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/closed/custom/Main.gmk b/closed/custom/Main.gmk
@@ -1,5 +1,5 @@
 # ===========================================================================
-# (c) Copyright IBM Corp. 2017, 2022 All Rights Reserved
+# (c) Copyright IBM Corp. 2017, 2023 All Rights Reserved
 # ===========================================================================
 # This code is free software; you can redistribute it and/or modify it
 # under the terms of the GNU General Public License version 2 only, as
@@ -78,7 +78,7 @@ ifeq ($(call isTargetOs, linux), true)
 endif
 	@+$(OPENJ9_MAKE) openj9_test_image
 ifneq ($(COMPILE_TYPE), cross)
-	$(JDK_OUTPUTDIR)/bin/java -version 2>&1 | $(TEE) $(TEST_IMAGE_DIR)/openj9/java-version.txt
+	rc=0; $(JDK_OUTPUTDIR)/bin/java -version >$(TEST_IMAGE_DIR)/openj9/java-version.txt 2>&1 || rc="$$?"; $(CAT) $(TEST_IMAGE_DIR)/openj9/java-version.txt; exit "$$rc"
 endif
 
 test-image : test-image-openj9