From 76ff97811abf5a4eaede6303e25ff9582302e436 Mon Sep 17 00:00:00 2001 From: Axel Boldt-Christmas Date: Tue, 15 Apr 2025 05:11:40 +0000 Subject: [PATCH] 8354510: Skipped gtest cause test failure Reviewed-by: rehn, erikj --- make/RunTests.gmk | 21 ++++++++++----------- 1 file changed, 10 insertions(+), 11 deletions(-) diff --git a/make/RunTests.gmk b/make/RunTests.gmk index 7aa0082e0ae..80c1ff99b2e 100644 --- a/make/RunTests.gmk +++ b/make/RunTests.gmk @@ -534,22 +534,21 @@ define SetupRunGtestTestBody $$(eval $1_PASSED := $$(shell $$(AWK) '/\[ PASSED \] .* tests?./ \ { print $$$$4 }' $$($1_RESULT_FILE))) \ $$(if $$($1_PASSED), , $$(eval $1_PASSED := 0)) \ - $$(eval $1_SKIPPED := $$(shell $$(AWK) \ - '/YOU HAVE [0-9]+ DISABLED TEST/ { \ - if (match($$$$0, /[0-9]+/, arr)) { \ - print arr[0]; \ - found=1; \ - } \ - } \ - END { if (!found) print 0; }' \ - $$($1_RESULT_FILE))) \ + $$(eval $1_GTEST_DISABLED := $$(shell $$(AWK) '/YOU HAVE .* DISABLED TEST/ \ + { print $$$$3 }' $$($1_RESULT_FILE))) \ + $$(if $$($1_GTEST_DISABLED), , $$(eval $1_GTEST_DISABLED := 0)) \ + $$(eval $1_GTEST_SKIPPED := $$(shell $$(AWK) '/\[ SKIPPED \] .* tests?.*/ \ + { print $$$$4 }' $$($1_RESULT_FILE))) \ + $$(if $$($1_GTEST_SKIPPED), , $$(eval $1_GTEST_SKIPPED := 0)) \ + $$(eval $1_SKIPPED := $$(shell \ + $$(EXPR) $$($1_GTEST_DISABLED) + $$($1_GTEST_SKIPPED))) \ $$(eval $1_FAILED := $$(shell $$(AWK) '/\[ FAILED \] .* tests?, \ listed below/ { print $$$$4 }' $$($1_RESULT_FILE))) \ $$(if $$($1_FAILED), , $$(eval $1_FAILED := 0)) \ $$(eval $1_ERROR := $$(shell \ - $$(EXPR) $$($1_RUN) - $$($1_PASSED) - $$($1_FAILED))) \ + $$(EXPR) $$($1_RUN) - $$($1_PASSED) - $$($1_FAILED) - $$($1_GTEST_SKIPPED))) \ $$(eval $1_TOTAL := $$(shell \ - $$(EXPR) $$($1_RUN) + $$($1_SKIPPED))) \ + $$(EXPR) $$($1_RUN) + $$($1_GTEST_DISABLED))) \ , \ $$(eval $1_PASSED := 0) \ $$(eval $1_FAILED := 0) \