Siteshwar Vashisht
4 years ago
parent
20f16f4f92
commit
2beca886db
@ -1,27 +0,0 @@
|
||||
From 955c0003ca923dea76e9c953cda871d4209f028b Mon Sep 17 00:00:00 2001
|
||||
From: Fabian Homborg <FHomborg@gmail.com>
|
||||
Date: Tue, 2 Mar 2021 15:27:13 +0100
|
||||
Subject: [PATCH] fd_monitor: Explicity include <thread>
|
||||
|
||||
Might fix issues with gcc 11.0.1.
|
||||
|
||||
See #7764.
|
||||
---
|
||||
src/fd_monitor.cpp | 1 +
|
||||
1 file changed, 1 insertion(+)
|
||||
|
||||
diff --git a/src/fd_monitor.cpp b/src/fd_monitor.cpp
|
||||
index a55e9c55f..2ed2ca4de 100644
|
||||
--- a/src/fd_monitor.cpp
|
||||
+++ b/src/fd_monitor.cpp
|
||||
@@ -4,6 +4,7 @@
|
||||
#include "fd_monitor.h"
|
||||
|
||||
#include <cstring>
|
||||
+#include <thread> //this_thread::sleep_for
|
||||
|
||||
#include "flog.h"
|
||||
#include "io.h"
|
||||
--
|
||||
2.29.2
|
||||
|
||||
@ -1,49 +0,0 @@
|
||||
From 29ebd4a5ff5c0a0eefe802a4bcaa8ef32cc5795a Mon Sep 17 00:00:00 2001
|
||||
From: Fabian Homborg <FHomborg@gmail.com>
|
||||
Date: Sat, 13 Mar 2021 17:22:35 +0100
|
||||
Subject: [PATCH] tests: Don't break when a file unexpectedly exists
|
||||
|
||||
Creating a file called "xfoo" could break the highlight tests because
|
||||
we'd suddenly get a color with valid_path set to true.
|
||||
|
||||
So what we do is simply compare foreground/background and forced
|
||||
underline, but only check for path validity if we're expecting a valid
|
||||
path.
|
||||
|
||||
If we're not expecting a valid path, we don't fail whether it is there
|
||||
or not.
|
||||
|
||||
This means that we can't check for a non-valid path, but we don't
|
||||
currently do that anyway and we can just burn that bridge when we get
|
||||
to it.
|
||||
|
||||
cc @siteshwar @krobelus, who both came across this
|
||||
---
|
||||
src/fish_tests.cpp | 11 ++++++++++-
|
||||
1 file changed, 10 insertions(+), 1 deletion(-)
|
||||
|
||||
diff --git a/src/fish_tests.cpp b/src/fish_tests.cpp
|
||||
index 5f57f9e64..3f7777138 100644
|
||||
--- a/src/fish_tests.cpp
|
||||
+++ b/src/fish_tests.cpp
|
||||
@@ -5386,7 +5386,16 @@ static void test_highlighting() {
|
||||
// Hackish space handling. We don't care about the colors in spaces.
|
||||
if (text.at(i) == L' ') continue;
|
||||
|
||||
- if (expected_colors.at(i) != colors.at(i)) {
|
||||
+ auto e = expected_colors.at(i);
|
||||
+ auto c = colors.at(i);
|
||||
+ // Compare the colors, but don't care about pathness
|
||||
+ // unless we're asking for a valid path.
|
||||
+ //
|
||||
+ // That way stray files in the build directory don't break the test.
|
||||
+ if (e.foreground != c.foreground
|
||||
+ || e.background != c.background
|
||||
+ || e.force_underline != c.force_underline
|
||||
+ || (e.valid_path && !c.valid_path)) {
|
||||
const wcstring spaces(i, L' ');
|
||||
err(L"Wrong color in test at index %lu in text (expected %#x, actual "
|
||||
L"%#x):\n%ls\n%ls^",
|
||||
--
|
||||
2.29.2
|
||||
|
||||
@ -1,2 +1,2 @@
|
||||
SHA512 (fish-3.2.0.tar.xz.asc) = cfa8f3f0463fc60e340ddf17848f5ef94acbb8aece0a5629a4cb846affbaa563052ae65e0505fb3c632136a1cc771023496720e6a28a94122dd133221cbe7072
|
||||
SHA512 (fish-3.2.0.tar.xz) = 4525b8dd991179f77a298080d389813d1da8557bd394d174ded9238570715137e3aeec009d123811b34c07856d5f7cbe0ad35dc599d748f8f305036c3b74face
|
||||
SHA512 (fish-3.2.1.tar.xz.asc) = b87622b3f0e761e555611c6fc0bb5d11028e240add7f15320101fd117bda2113d937218ba79b58d7674780a4f246e8da3c2a093ecb08da77d7f7e2df3b6ea62a
|
||||
SHA512 (fish-3.2.1.tar.xz) = bf565bac93e7d163af5253b4053f9c9e760508b929624440fd8a160504a127c34013882576293c72a47ce7f285f87e0b594d61d7cebcefcc3be4e92c572926bc
|
||||
|
||||
Loading…
Reference in new issue