summaryrefslogtreecommitdiffstats
path: root/Tests
diff options
context:
space:
mode:
authorBrad King <brad.king@kitware.com>2021-10-14 11:51:20 (GMT)
committerKitware Robot <kwrobot@kitware.com>2021-10-14 11:51:31 (GMT)
commitf40380077ec8a82b5e87041b3411fd172c9af661 (patch)
tree603723796bf0f0faaad45a2d3ce50c975187a754 /Tests
parentfb358544843a56d433a40862faa397a2b0e1f460 (diff)
parent09f4edbcefe02239dd175daf198aeac42c3c8bb8 (diff)
downloadCMake-f40380077ec8a82b5e87041b3411fd172c9af661.zip
CMake-f40380077ec8a82b5e87041b3411fd172c9af661.tar.gz
CMake-f40380077ec8a82b5e87041b3411fd172c9af661.tar.bz2
Merge topic 'clang-warnings'
09f4edbcef Fix Clang -Wbitwise-instead-of-logical warnings Acked-by: Kitware Robot <kwrobot@kitware.com> Acked-by: buildbot <buildbot@kitware.com> Merge-request: !6623
Diffstat (limited to 'Tests')
-rw-r--r--Tests/CMakeLib/testUVRAII.cxx13
1 files changed, 9 insertions, 4 deletions
diff --git a/Tests/CMakeLib/testUVRAII.cxx b/Tests/CMakeLib/testUVRAII.cxx
index 7d21959..fd88e24 100644
--- a/Tests/CMakeLib/testUVRAII.cxx
+++ b/Tests/CMakeLib/testUVRAII.cxx
@@ -221,10 +221,15 @@ static bool testLoopDestructor()
int testUVRAII(int, char** const)
{
- if ((testAsyncShutdown() &&
- testAsyncDtor() & testAsyncMove() & testCrossAssignment() &
- testAllMoves() & testLoopReset() & testLoopDestructor()) == 0) {
+ if (!testAsyncShutdown()) {
return -1;
}
- return 0;
+ bool passed = true;
+ passed = testAsyncDtor() && passed;
+ passed = testAsyncMove() && passed;
+ passed = testCrossAssignment() && passed;
+ passed = testAllMoves() && passed;
+ passed = testLoopReset() && passed;
+ passed = testLoopDestructor() && passed;
+ return passed ? 0 : -1;
}