From 63a1ec6e7c08fc21d5cded734637eeb80147079f Mon Sep 17 00:00:00 2001
From: Severin Gehwolf <sgehwolf@openjdk.org>
Date: Wed, 11 May 2022 08:49:30 +0000
Subject: [PATCH] 8286430: make test TEST="gtest:<sometag>" exits with error
 when it shouldn't

Reviewed-by: ihse, erikj
---
 make/RunTests.gmk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/make/RunTests.gmk b/make/RunTests.gmk
index 732b8775d89..349d442f90f 100644
--- a/make/RunTests.gmk
+++ b/make/RunTests.gmk
@@ -524,7 +524,7 @@ define SetupRunGtestTestBody
 	    $$(subst $$(TOPDIR)/, , $$($1_TEST_RESULTS_DIR))))
 	$$(if $$(wildcard $$($1_RESULT_FILE)), \
 	  $$(eval $1_TOTAL := $$(shell $$(AWK) '/==========.* tests? from .* \
-	      test cases? ran/ { print $$$$2 }' $$($1_RESULT_FILE))) \
+	      test (cases?|suites?) ran/ { print $$$$2 }' $$($1_RESULT_FILE))) \
 	  $$(if $$($1_TOTAL), , $$(eval $1_TOTAL := 0)) \
 	  $$(eval $1_PASSED := $$(shell $$(AWK) '/\[  PASSED  \] .* tests?./ \
 	      { print $$$$4 }' $$($1_RESULT_FILE))) \