summaryrefslogtreecommitdiffstats
path: root/Tests/RunCMake
diff options
context:
space:
mode:
authorMartin Duffy <martin.duffy@kitware.com>2023-11-13 01:01:30 (GMT)
committerBrad King <brad.king@kitware.com>2023-11-13 16:11:18 (GMT)
commit27244a8f7385b97c38052495495a1e5aca11c485 (patch)
tree7374be606cdc332bb583ea3ca866bfd1166f8ac8 /Tests/RunCMake
parentd36d2b9253d53060c34e3a215a1e8ae8c60bdfdd (diff)
downloadCMake-27244a8f7385b97c38052495495a1e5aca11c485.zip
CMake-27244a8f7385b97c38052495495a1e5aca11c485.tar.gz
CMake-27244a8f7385b97c38052495495a1e5aca11c485.tar.bz2
cmGeneratorExpressionNode: Fix short-circuit logic
Fix logic added by commit 634079b86d (cmGeneratorExpressionEvaluator: Short-circuit boolean operators, 2023-09-11, v3.28.0-rc1~47^2) and add missing test cases. Fixes: #25412
Diffstat (limited to 'Tests/RunCMake')
-rw-r--r--Tests/RunCMake/GeneratorExpressionShortCircuit/GoodAND.cmake3
-rw-r--r--Tests/RunCMake/GeneratorExpressionShortCircuit/GoodOR.cmake2
2 files changed, 5 insertions, 0 deletions
diff --git a/Tests/RunCMake/GeneratorExpressionShortCircuit/GoodAND.cmake b/Tests/RunCMake/GeneratorExpressionShortCircuit/GoodAND.cmake
index 26bcaba..1827343 100644
--- a/Tests/RunCMake/GeneratorExpressionShortCircuit/GoodAND.cmake
+++ b/Tests/RunCMake/GeneratorExpressionShortCircuit/GoodAND.cmake
@@ -1,4 +1,7 @@
set(error $<0>)
add_custom_target(check ALL COMMAND check
$<AND:0,${error}>
+ $<AND:0,1,${error}>
+ $<AND:1,0,${error}>
+ $<AND:0,0,${error}>
)
diff --git a/Tests/RunCMake/GeneratorExpressionShortCircuit/GoodOR.cmake b/Tests/RunCMake/GeneratorExpressionShortCircuit/GoodOR.cmake
index b574937..db2fd52 100644
--- a/Tests/RunCMake/GeneratorExpressionShortCircuit/GoodOR.cmake
+++ b/Tests/RunCMake/GeneratorExpressionShortCircuit/GoodOR.cmake
@@ -1,4 +1,6 @@
set(error $<0>)
add_custom_target(check ALL COMMAND check
$<OR:1,${error}>
+ $<OR:0,1,${error}>
+ $<OR:1,0,${error}>
)