ci

kasper93 · Jan 1, 2024 · 93926d4 · 93926d4
1 parent 28b21e4
commit 93926d4
Show file tree

Hide file tree

Showing 2 changed files with 26 additions and 24 deletions.
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -215,9 +215,10 @@ jobs:
                 uchardet \
                 v4l_compat \
                 vulkan-headers \
-                wayland-protocols
+                wayland-protocols \
+                gdb
             ./ci/build-freebsd.sh
-            meson test -C build
+            meson test -v -C build
 
   msys2:
     runs-on: windows-latest

diff --git a/common/msg.c b/common/msg.c
@@ -466,7 +466,8 @@ static void dump_stats(struct mp_log *log, int lev, bstr text)
 static void write_term_msg(struct mp_log *log, int lev, bstr text, bstr *out)
 {
     struct mp_log_root *root = log->root;
-    bool print_term = test_terminal_level(log, lev);
+    // bool print_term = test_terminal_level(log, lev);
+    bool print_term = false;
     int fileno = term_msg_fileno(root, lev);
     int term_w = 0, term_h = 0;
     if (print_term && root->isatty[fileno])
@@ -549,27 +550,27 @@ void mp_msg_va(struct mp_log *log, int lev, const char *format, va_list va)
     } else if (lev == MSGL_STATUS && !test_terminal_level(log, lev)) {
         /* discard */
     } else {
-        write_term_msg(log, lev, root->buffer, &root->term_msg);
-
-        root->term_status_msg.len = 0;
-        if (lev != MSGL_STATUS && root->status_line.len && root->status_log &&
-            test_terminal_level(root->status_log, MSGL_STATUS))
-        {
-            write_term_msg(root->status_log, MSGL_STATUS, root->status_line,
-                           &root->term_status_msg);
-        }
-
-        int fileno = term_msg_fileno(root, lev);
-        FILE *stream = fileno == STDERR_FILENO ? stderr : stdout;
-        if (root->term_msg.len) {
-            if (root->term_status_msg.len) {
-                fprintf(stream, "%.*s%.*s", BSTR_P(root->term_msg),
-                        BSTR_P(root->term_status_msg));
-            } else {
-                fprintf(stream, "%.*s", BSTR_P(root->term_msg));
-            }
-            fflush(stream);
-        }
+        // write_term_msg(log, lev, root->buffer, &root->term_msg);
+
+        // root->term_status_msg.len = 0;
+        // if (lev != MSGL_STATUS && root->status_line.len && root->status_log &&
+        //     test_terminal_level(root->status_log, MSGL_STATUS))
+        // {
+        //     write_term_msg(root->status_log, MSGL_STATUS, root->status_line,
+        //                    &root->term_status_msg);
+        // }
+
+        // int fileno = term_msg_fileno(root, lev);
+        // FILE *stream = fileno == STDERR_FILENO ? stderr : stdout;
+        // if (root->term_msg.len) {
+        //     if (root->term_status_msg.len) {
+        //         fprintf(stream, "%.*s%.*s", BSTR_P(root->term_msg),
+        //                 BSTR_P(root->term_status_msg));
+        //     } else {
+        //         fprintf(stream, "%.*s", BSTR_P(root->term_msg));
+        //     }
+        //     fflush(stream);
+        // }
     }
 
     mp_mutex_unlock(&root->lock);