shaba/systemd
1
0
Fork 0
mirror of https://github.com/systemd/systemd.git synced 2025-08-25 13:49:55 +03:00
Code Activity

Merge pull request #18470 from mrc0mmand/ci-clang-12

Browse Source 
ci: run build test with clang-12 as well
This commit is contained in:
Luca Boccassi
2021-02-09 13:06:40 +00:00
committed by GitHub
parent 5bbf331434 8762049792
commit 0f15cb2243
3 changed files with 12 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
.github/workflows/build_test.yml vendored
View File

@ -21,6 +21,7 @@ jobs:
- { COMPILER: "gcc", COMPILER_VERSION: "10" } - { COMPILER: "gcc", COMPILER_VERSION: "10" }
- { COMPILER: "clang", COMPILER_VERSION: "10" } - { COMPILER: "clang", COMPILER_VERSION: "10" }
- { COMPILER: "clang", COMPILER_VERSION: "11" } - { COMPILER: "clang", COMPILER_VERSION: "11" }
- { COMPILER: "clang", COMPILER_VERSION: "12" }
env: ${{ matrix.env }} env: ${{ matrix.env }}
steps: steps:
- name: Repository checkout - name: Repository checkout

4
src/shared/dissect-image.c
View File

@ -2214,8 +2214,8 @@ int dissected_image_acquire_metadata(DissectedImage *m) {
[META_HOSTNAME] = "/etc/hostname\0", [META_HOSTNAME] = "/etc/hostname\0",
[META_MACHINE_ID] = "/etc/machine-id\0", [META_MACHINE_ID] = "/etc/machine-id\0",
[META_MACHINE_INFO] = "/etc/machine-info\0", [META_MACHINE_INFO] = "/etc/machine-info\0",
[META_OS_RELEASE] = "/etc/os-release\0" [META_OS_RELEASE] = ("/etc/os-release\0"
"/usr/lib/os-release\0", "/usr/lib/os-release\0"),
}; };
_cleanup_strv_free_ char **machine_info = NULL, **os_release = NULL; _cleanup_strv_free_ char **machine_info = NULL, **os_release = NULL;

18
src/xdg-autostart-generator/test-xdg-autostart.c
View File

@ -37,17 +37,17 @@ static void test_xdg_format_exec_start(void) {
} }
static const char* const xdg_desktop_file[] = { static const char* const xdg_desktop_file[] = {
"[Desktop Entry]\n" ("[Desktop Entry]\n"
"Exec\t =\t /bin/sleep 100\n" /* Whitespace Before/After = must be ignored */ "Exec\t =\t /bin/sleep 100\n" /* Whitespace Before/After = must be ignored */
"OnlyShowIn = A;B;\n" "OnlyShowIn = A;B;\n"
"NotShowIn=C;;D\\\\\\;;E\n", /* "C", "", "D\;", "E" */ "NotShowIn=C;;D\\\\\\;;E\n"), /* "C", "", "D\;", "E" */
"[Desktop Entry]\n" ("[Desktop Entry]\n"
"Exec=a\n" "Exec=a\n"
"Exec=b\n", "Exec=b\n"),
"[Desktop Entry]\n" ("[Desktop Entry]\n"
"Hidden=\t true\n", "Hidden=\t true\n"),
}; };
static void test_xdg_desktop_parse(unsigned i, const char *s) { static void test_xdg_desktop_parse(unsigned i, const char *s) {