Split out pretty-print.c and move pager.c and main-func.h to shared/
This is high-level functionality, and fits better in shared/ (which is for our executables), than in basic/ (which is also for libraries).
This commit is contained in:
@@ -305,6 +305,10 @@ tests += [
|
||||
[],
|
||||
[]],
|
||||
|
||||
[['src/test/test-pretty-print.c'],
|
||||
[],
|
||||
[]],
|
||||
|
||||
[['src/test/test-uid-range.c'],
|
||||
[],
|
||||
[]],
|
||||
|
||||
@@ -0,0 +1,40 @@
|
||||
/* SPDX-License-Identifier: LGPL-2.1+ */
|
||||
|
||||
#include <stdio.h>
|
||||
|
||||
#include "alloc-util.h"
|
||||
#include "macro.h"
|
||||
#include "pretty-print.h"
|
||||
#include "strv.h"
|
||||
#include "tests.h"
|
||||
|
||||
static void test_terminal_urlify(void) {
|
||||
_cleanup_free_ char *formatted = NULL;
|
||||
|
||||
assert_se(terminal_urlify("https://www.freedesktop.org/wiki/Software/systemd/", "systemd homepage", &formatted) >= 0);
|
||||
printf("Hey, considere visiting the %s right now! It is very good!\n", formatted);
|
||||
|
||||
formatted = mfree(formatted);
|
||||
|
||||
assert_se(terminal_urlify_path("/etc/fstab", "this link to your /etc/fstab", &formatted) >= 0);
|
||||
printf("Or click on %s to have a look at it!\n", formatted);
|
||||
}
|
||||
|
||||
static void test_cat_files(void) {
|
||||
assert_se(cat_files("/no/such/file", NULL, 0) == -ENOENT);
|
||||
assert_se(cat_files("/no/such/file", NULL, CAT_FLAGS_MAIN_FILE_OPTIONAL) == 0);
|
||||
|
||||
if (access("/etc/fstab", R_OK) >= 0)
|
||||
assert_se(cat_files("/etc/fstab", STRV_MAKE("/etc/fstab", "/etc/fstab"), 0) == 0);
|
||||
}
|
||||
|
||||
int main(int argc, char *argv[]) {
|
||||
test_setup_logging(LOG_INFO);
|
||||
|
||||
test_terminal_urlify();
|
||||
test_cat_files();
|
||||
|
||||
print_separator();
|
||||
|
||||
return 0;
|
||||
}
|
||||
@@ -3,6 +3,7 @@
|
||||
#include <stdio.h>
|
||||
|
||||
#include "alloc-util.h"
|
||||
#include "pretty-print.h"
|
||||
#include "string-util.h"
|
||||
#include "terminal-util.h"
|
||||
#include "util.h"
|
||||
|
||||
@@ -6,7 +6,7 @@
|
||||
#include "alloc-util.h"
|
||||
#include "fd-util.h"
|
||||
#include "fileio.h"
|
||||
#include "log.h"
|
||||
#include "tests.h"
|
||||
#include "macro.h"
|
||||
#include "strv.h"
|
||||
#include "terminal-util.h"
|
||||
@@ -55,36 +55,11 @@ static void test_read_one_char(void) {
|
||||
unlink(name);
|
||||
}
|
||||
|
||||
static void test_terminal_urlify(void) {
|
||||
_cleanup_free_ char *formatted = NULL;
|
||||
|
||||
assert_se(terminal_urlify("https://www.freedesktop.org/wiki/Software/systemd/", "systemd homepage", &formatted) >= 0);
|
||||
printf("Hey, considere visiting the %s right now! It is very good!\n", formatted);
|
||||
|
||||
formatted = mfree(formatted);
|
||||
|
||||
assert_se(terminal_urlify_path("/etc/fstab", "this link to your /etc/fstab", &formatted) >= 0);
|
||||
printf("Or click on %s to have a look at it!\n", formatted);
|
||||
}
|
||||
|
||||
static void test_cat_files(void) {
|
||||
assert_se(cat_files("/no/such/file", NULL, 0) == -ENOENT);
|
||||
assert_se(cat_files("/no/such/file", NULL, CAT_FLAGS_MAIN_FILE_OPTIONAL) == 0);
|
||||
|
||||
if (access("/etc/fstab", R_OK) >= 0)
|
||||
assert_se(cat_files("/etc/fstab", STRV_MAKE("/etc/fstab", "/etc/fstab"), 0) == 0);
|
||||
}
|
||||
|
||||
int main(int argc, char *argv[]) {
|
||||
log_parse_environment();
|
||||
log_open();
|
||||
test_setup_logging(LOG_INFO);
|
||||
|
||||
test_default_term_for_tty();
|
||||
test_read_one_char();
|
||||
test_terminal_urlify();
|
||||
test_cat_files();
|
||||
|
||||
print_separator();
|
||||
|
||||
return 0;
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user