From: Lennart Poettering <lennart@poettering.net>
Date: Tue, 15 Sep 2020 15:53:32 +0000 (+0200)
Subject: test: remove test-dissect-image
X-Git-Tag: v247-rc1~224^2~3
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=80dd1125c86252c774b1becb4aeb5513c54ef57d;p=thirdparty%2Fsystemd.git

test: remove test-dissect-image

It does pretty much exactly what systemd-dissect does and is a manual
test, hence let's remove it as redundant code.
---

diff --git a/src/test/meson.build b/src/test/meson.build
index 70450ea1c5a..7eb343116ac 100644
--- a/src/test/meson.build
+++ b/src/test/meson.build
@@ -421,11 +421,6 @@ tests += [
          [],
          '', 'manual'],
 
-        [['src/test/test-dissect-image.c'],
-         [],
-         [libblkid],
-         '', 'manual'],
-
         [['src/test/test-signal-util.c'],
          [],
          []],
diff --git a/src/test/test-dissect-image.c b/src/test/test-dissect-image.c
deleted file mode 100644
index fe78216b781..00000000000
--- a/src/test/test-dissect-image.c
+++ /dev/null
@@ -1,51 +0,0 @@
-/* SPDX-License-Identifier: LGPL-2.1+ */
-
-#include <fcntl.h>
-#include <linux/loop.h>
-#include <stdio.h>
-
-#include "dissect-image.h"
-#include "log.h"
-#include "loop-util.h"
-#include "string-util.h"
-#include "tests.h"
-
-int main(int argc, char *argv[]) {
-        _cleanup_(loop_device_unrefp) LoopDevice *d = NULL;
-        _cleanup_(dissected_image_unrefp) DissectedImage *m = NULL;
-        int r, i;
-
-        test_setup_logging(LOG_DEBUG);
-
-        if (argc < 2) {
-                log_error("Requires one command line argument.");
-                return EXIT_FAILURE;
-        }
-
-        r = loop_device_make_by_path(argv[1], O_RDONLY, LO_FLAGS_PARTSCAN, &d);
-        if (r < 0) {
-                log_error_errno(r, "Failed to set up loopback device: %m");
-                return EXIT_FAILURE;
-        }
-
-        r = dissect_image(d->fd, NULL, 0, NULL, NULL, DISSECT_IMAGE_REQUIRE_ROOT|DISSECT_IMAGE_RELAX_VAR_CHECK, &m);
-        if (r < 0) {
-                log_error_errno(r, "Failed to dissect image: %m");
-                return EXIT_FAILURE;
-        }
-
-        for (i = 0; i < _PARTITION_DESIGNATOR_MAX; i++) {
-
-                if (!m->partitions[i].found)
-                        continue;
-
-                printf("Found %s partition, %s of type %s at #%i (%s)\n",
-                       partition_designator_to_string(i),
-                       m->partitions[i].rw ? "writable" : "read-only",
-                       strna(m->partitions[i].fstype),
-                       m->partitions[i].partno,
-                       strna(m->partitions[i].node));
-        }
-
-        return EXIT_SUCCESS;
-}