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

Ensure test-image-openj9 target fails when java -version fails
ibmruntimes · Jan 23, 2023 · b399e86 · b399e86
2 parents 9496bc7 + 22b0ac1
commit b399e86
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, 2021 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
@@ -76,7 +76,7 @@ ALL_TARGETS += debug-image
 test-image-openj9 : exploded-image
  @+$(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
 
 ALL_TARGETS += test-image-openj9