From bd68df090525ef33481650c81b6348808d20028b Mon Sep 17 00:00:00 2001 From: Mikolaj Boc Date: Fri, 10 Mar 2023 12:33:23 +0100 Subject: [PATCH] Adapt qt_process_qlalr for test batching Calling qt_process_qlalr with a skipped/batched target name results in an error. Do the same as for other helper functions and handle these two cases. Task-number: QTBUG-109786 Change-Id: I774b148989a25d01bdf724e69a722aae132389ee Reviewed-by: Joerg Bornemann --- cmake/QtLalrHelpers.cmake | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/cmake/QtLalrHelpers.cmake b/cmake/QtLalrHelpers.cmake index 8f7c6d785d1..a63d8e95041 100644 --- a/cmake/QtLalrHelpers.cmake +++ b/cmake/QtLalrHelpers.cmake @@ -35,6 +35,15 @@ function(qt_process_qlalr consuming_target input_file_list flags) return() endif() + qt_internal_is_skipped_test(skipped ${consuming_target}) + if(skipped) + return() + endif() + qt_internal_is_in_test_batch(in_batch ${consuming_target}) + if(in_batch) + _qt_internal_test_batch_target_name(consuming_target) + endif() + foreach(input_file ${input_file_list}) file(STRINGS ${input_file} input_file_lines) qt_qlalr_find_option_in_list("${input_file_lines}" "^%parser(.+)" "parser")