mirror of
https://github.com/wpilibsuite/allwpilib
synced 2026-06-20 00:51:42 +00:00
[build] Upgrade CI to clang-format 10.0 (#1961)
MacOS no longer ships 6.0, and Arch Linux's mesa GPU drivers are no longer compatible with LLVM 6.0.
This commit is contained in:
@@ -1,5 +1,5 @@
|
||||
/*----------------------------------------------------------------------------*/
|
||||
/* Copyright (c) 2019 FIRST. All Rights Reserved. */
|
||||
/* Copyright (c) 2019-2020 FIRST. All Rights Reserved. */
|
||||
/* Open Source Software - may be modified and shared by FRC teams. The code */
|
||||
/* must be accompanied by the FIRST BSD license file in the root directory of */
|
||||
/* the project. */
|
||||
@@ -129,9 +129,9 @@ TEST_F(ButtonTest, AndTest) {
|
||||
bool pressed2 = false;
|
||||
WaitUntilCommand command([&finished] { return finished; });
|
||||
|
||||
(Trigger([&pressed1] { return pressed1; }) &&
|
||||
Trigger([&pressed2] { return pressed2; }))
|
||||
.WhenActive(&command);
|
||||
(Trigger([&pressed1] { return pressed1; }) && Trigger([&pressed2] {
|
||||
return pressed2;
|
||||
})).WhenActive(&command);
|
||||
pressed1 = true;
|
||||
scheduler.Run();
|
||||
EXPECT_FALSE(scheduler.IsScheduled(&command));
|
||||
@@ -148,18 +148,18 @@ TEST_F(ButtonTest, OrTest) {
|
||||
WaitUntilCommand command1([&finished] { return finished; });
|
||||
WaitUntilCommand command2([&finished] { return finished; });
|
||||
|
||||
(Trigger([&pressed1] { return pressed1; }) ||
|
||||
Trigger([&pressed2] { return pressed2; }))
|
||||
.WhenActive(&command1);
|
||||
(Trigger([&pressed1] { return pressed1; }) || Trigger([&pressed2] {
|
||||
return pressed2;
|
||||
})).WhenActive(&command1);
|
||||
pressed1 = true;
|
||||
scheduler.Run();
|
||||
EXPECT_TRUE(scheduler.IsScheduled(&command1));
|
||||
|
||||
pressed1 = false;
|
||||
|
||||
(Trigger([&pressed1] { return pressed1; }) ||
|
||||
Trigger([&pressed2] { return pressed2; }))
|
||||
.WhenActive(&command2);
|
||||
(Trigger([&pressed1] { return pressed1; }) || Trigger([&pressed2] {
|
||||
return pressed2;
|
||||
})).WhenActive(&command2);
|
||||
pressed2 = true;
|
||||
scheduler.Run();
|
||||
EXPECT_TRUE(scheduler.IsScheduled(&command2));
|
||||
|
||||
Reference in New Issue
Block a user