Fix: test_benchmark: do not match "CPU(s) scaling MHz:"

[lttng-ust.git] / tests / unit / ust-elf / ust-elf.c

diff --git a/tests/unit/ust-elf/ust-elf.c b/tests/unit/ust-elf/ust-elf.c
index 241028195d7624fe1d47cc8844109250c06f91a2..7e924a9099b563852a8d7875e0983e19e16beb00 100644 (file)
--- a/tests/unit/ust-elf/ust-elf.c
+++ b/tests/unit/ust-elf/ust-elf.c
@@ -1,28 +1,17 @@
 /*
- * Copyright (C) 2015  Antoine Busque <abusque@efficios.com>
+ * SPDX-License-Identifier: LGPL-2.1-or-later
  *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2.1 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301 USA
+ * Copyright (C) 2015 Antoine Busque <abusque@efficios.com>
  */
 
+#include <inttypes.h>
 #include <limits.h>
 #include <stdint.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
 
-#include <lttng/ust-elf.h>
+#include "common/elf.h"
 #include "tap.h"
 
 #define NUM_ARCH 4
@@ -88,7 +77,7 @@ void test_elf(const char *test_dir, const char *arch, uint64_t exp_memsz,
        ret = lttng_ust_elf_get_memsz(elf, &memsz);
        ok(ret == 0, "lttng_ust_elf_get_memsz returned successfully");
        ok(memsz == exp_memsz,
-               "memsz - expected: %lu, got: %lu",
+               "memsz - expected: %" PRIu64 ", got: %" PRIu64,
                exp_memsz, memsz);
 
        ret = lttng_ust_elf_get_build_id(elf, &build_id, &build_id_len,
@@ -96,7 +85,7 @@ void test_elf(const char *test_dir, const char *arch, uint64_t exp_memsz,
        ok(ret == 0, "lttng_ust_elf_get_build_id returned successfully");
        ok(has_build_id == 1, "build id marked as found");
        ok(build_id_len == BUILD_ID_LEN,
-               "build_id_len - expected: %u, got: %u",
+               "build_id_len - expected: %u, got: %zu",
                BUILD_ID_LEN, build_id_len);
        ok(memcmp(build_id, exp_build_id, build_id_len) == 0,
                "build_id has expected value");