From 0b414e4a8ff5ec9ffd37e1b7d82b92cb297b1a7f Mon Sep 17 00:00:00 2001 From: Devin Papineau Date: Wed, 14 Dec 2022 09:53:48 -0500 Subject: [PATCH] Fail test-image-openj9 target when java -version fails Previously, the exit status would come from tee, which succeeded. --- closed/make/Main.gmk | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/closed/make/Main.gmk b/closed/make/Main.gmk index d73fff3230e..3da60a897a3 100644 --- a/closed/make/Main.gmk +++ b/closed/make/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 @@ -63,7 +63,7 @@ test-image : test-image-openj9 test-image-openj9 : images @+$(MAKE) $(MAKE_ARGS) -f $(SRC_ROOT)/closed/TestImage.gmk ifneq ($(COMPILE_TYPE), cross) - $(JRE_IMAGE_DIR)/bin/java -version 2>&1 | $(TEE) $(IMAGES_OUTPUTDIR)/test/openj9/java-version.txt + rc=0; $(JRE_IMAGE_DIR)/bin/java -version >$(IMAGES_OUTPUTDIR)/test/openj9/java-version.txt 2>&1 || rc="$$?"; $(CAT) $(IMAGES_OUTPUTDIR)/test/openj9/java-version.txt; exit "$$rc" endif clean-docs : clean-openj9-only-docs