parted/libparted-dasd-add-test-cases-for-the-new-fdasd-func.patch

From c11f5c005270d24bc3905ab3b743e96fc1a9a507 Mon Sep 17 00:00:00 2001
From: Wang Dong <dongdwdw@linux.vnet.ibm.com>
Date: Thu, 20 Apr 2017 10:20:07 +0200
Subject: [PATCH] libparted/dasd: add test cases for the new fdasd functions

The test case uses a temporary file in libparted/tests under
Check framwork.It can be issued by "make check" in the test dir.

Signed-off-by: Wang Dong <dongdwdw@linux.vnet.ibm.com>
Signed-off-by: Hendrik Brueckner <brueckner@linux.vnet.ibm.com>
---
 libparted/tests/t4000-volser.sh |  20 +++++
 libparted/tests/volser.c        | 188 ++++++++++++++++++++++++++++++++++++++++
 2 files changed, 208 insertions(+)
 create mode 100755 libparted/tests/t4000-volser.sh
 create mode 100644 libparted/tests/volser.c

diff --git a/libparted/tests/t4000-volser.sh b/libparted/tests/t4000-volser.sh
new file mode 100755
index 0000000..89688ba
--- /dev/null
+++ b/libparted/tests/t4000-volser.sh
@@ -0,0 +1,20 @@
+#!/bin/sh
+
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 3 of the License, or
+# (at your option) any later version.
+
+# This program 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 General Public License for more details.
+
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+. "${top_srcdir=../..}/tests/init.sh"; path_prepend_ .
+
+volser || fail=1
+
+Exit $fail
diff --git a/libparted/tests/volser.c b/libparted/tests/volser.c
new file mode 100644
index 0000000..9063821
--- /dev/null
+++ b/libparted/tests/volser.c
@@ -0,0 +1,188 @@
+/*
+ * Author: Wang Dong <dongdwdw@cn.ibm.com>
+ */
+
+#include <config.h>
+#include <unistd.h>
+#include <check.h>
+
+#include <parted/vtoc.h>
+#include <parted/device.h>
+#include <parted/fdasd.h>
+#include <parted/vtoc.h>
+#include "../arch/linux.h"
+#include "common.h"
+#include "progname.h"
+
+/* set dasd first */
+static char vol_devno[7] = {0};
+static char *tmp_disk;
+static int fd;
+
+static PedDisk *disk;
+static struct fdasd_anchor anc;
+static fdasd_anchor_t *anchor = &anc;
+static LinuxSpecific *arch_specific;
+
+/* set the enviroment */
+static void set_test (void)
+{
+        PedDevice *dev;
+        PedDiskType *type;
+        type = ped_disk_type_get ("dasd");
+
+        tmp_disk = _create_disk (20*1024*1024);
+        fail_if (tmp_disk == NULL, "Failed to create temporary disk");
+        dev = ped_device_get (tmp_disk);
+        if (dev == NULL)
+                return;
+
+        disk = _create_disk_label (dev, type);
+        if (!ped_device_open (disk->dev))
+                return;
+
+        fdasd_initialize_anchor (anchor);
+        arch_specific = LINUX_SPECIFIC (disk->dev);
+        fd = arch_specific->fd;
+        if (!fdasd_get_geometry (dev, anchor, fd))
+                return;
+
+        fdasd_check_volume (anchor, fd);
+        sprintf (vol_devno, "0X%04x", anchor->devno);
+        ck_assert (strlen (vol_devno) == VOLSER_LENGTH);
+}
+
+static void free_test (void)
+{
+        ped_device_close (disk->dev);
+        ped_device_destroy (disk->dev);
+        unlink (tmp_disk);
+        free (tmp_disk);
+        fdasd_cleanup (anchor);
+}
+
+/* Test with default volser */
+START_TEST (test_get_volser)
+{
+        char volser[7] = {0};
+        fdasd_change_volser (anchor, vol_devno);
+        fdasd_write_labels (anchor, fd);
+
+        fdasd_get_volser (anchor, volser, fd);
+        ck_assert (!strcmp (volser, vol_devno));
+}
+END_TEST
+
+START_TEST (test_check_volser)
+{
+        char vol[7] = {0};
+        char vol_long[] = "abcdefg";
+        char vol_short[] = "ab_c   ";
+        char vol_null[] = "      ";
+        char *vol_input = NULL;
+
+        vol_input = vol_long;
+        fdasd_check_volser (vol_input, anchor->devno);
+        ck_assert(!strcmp (vol_input, "ABCDEF"));
+
+        vol_input = vol_short;
+        fdasd_check_volser (vol_input, anchor->devno);
+        ck_assert (!strcmp (vol_input, "ABC"));
+
+        vol_input = vol_null;
+        fdasd_check_volser (vol_input, anchor->devno);
+        ck_assert (!strcmp (vol_input, vol_devno));
+}
+END_TEST
+
+START_TEST (test_change_volser)
+{
+
+        char vol[] = "000000";
+        char volser[7] = {0};
+
+        fdasd_change_volser (anchor, vol);
+        fdasd_write_labels (anchor, fd);
+
+        fdasd_get_volser (anchor, volser, fd);
+        ck_assert (!strcmp (volser, vol));
+}
+END_TEST
+
+/*
+ * fdsad_recreate_vtoc recreate the VTOC with existing one.
+ * So the partition information should be not changed after recreating
+ * VTOC.
+*/
+START_TEST (test_reuse_vtoc)
+{
+        ds5ext_t before;
+        ds5ext_t after;
+
+        memcpy (&before, &anchor->f5->DS5AVEXT, sizeof(ds5ext_t));
+
+        if (anchor->fspace_trk) {
+                fdasd_reuse_vtoc (anchor);
+                memcpy (&after, &anchor->f5->DS5AVEXT, sizeof(ds5ext_t));
+                if ((before.t != after.t) && (before.fc != after.fc) && (before.ft != after.ft))
+                        ck_abort ();
+        } else {
+                fdasd_reuse_vtoc (anchor);
+                memcpy (&after, &anchor->f5->DS5AVEXT, sizeof(ds5ext_t));
+                if ((before.t != after.t) && (before.fc != after.fc) && (before.ft != after.ft))
+                        ck_abort ();
+        }
+}
+END_TEST
+
+int main (int argc, char **argv)
+{
+
+        set_program_name (argv[0]);
+
+#if defined __s390__ || defined __s390x__
+
+        int number_failed = 0;
+
+        Suite *suite = suite_create ("Volser");
+
+        TCase *tcase_get = tcase_create ("Get");
+        TCase *tcase_check = tcase_create ("Check");
+        TCase *tcase_change = tcase_create ("Change");
+        TCase *tcase_vtoc = tcase_create ("Vtoc");
+
+        ped_exception_set_handler (_test_exception_handler);
+
+        tcase_add_checked_fixture (tcase_check, set_test, free_test);
+        tcase_add_test (tcase_check, test_check_volser);
+        tcase_set_timeout (tcase_check, 0);
+        suite_add_tcase (suite, tcase_check);
+
+        tcase_add_checked_fixture (tcase_change, set_test, free_test);
+        tcase_add_test (tcase_change, test_change_volser);
+        tcase_set_timeout (tcase_change, 0);
+        suite_add_tcase (suite, tcase_change);
+
+        tcase_add_checked_fixture (tcase_get, set_test, free_test);
+        tcase_add_test (tcase_get, test_get_volser);
+        tcase_set_timeout (tcase_get, 0);
+        suite_add_tcase (suite, tcase_get);
+
+        tcase_add_checked_fixture (tcase_vtoc, set_test, free_test);
+        tcase_add_test (tcase_vtoc, test_reuse_vtoc);
+        tcase_set_timeout (tcase_vtoc, 0);
+        suite_add_tcase (suite, tcase_vtoc);
+
+        SRunner *srunner = srunner_create (suite);
+        /* When to debug, uncomment this line */
+        /* srunner_set_fork_status (srunner, CK_NOFORK); */
+
+        srunner_run_all (srunner, CK_VERBOSE);
+
+        number_failed = srunner_ntests_failed (srunner);
+        srunner_free (srunner);
+        return (number_failed == 0) ? EXIT_SUCCESS : EXIT_FAILURE;
+
+#endif
+	return 0;
+}
-- 
2.16.4

From 571e078406b59e8dcf02db3e8fe28d8eb4d2cef0 Mon Sep 17 00:00:00 2001
From: Wang Dong <dongdwdw@linux.vnet.ibm.com>
Date: Wed, 26 Oct 2016 04:22:49 +0200
Subject: [PATCH] libparted/dasd: add test cases for the new fdasd functions

The test case uses a temporary file in libparted/tests under
Check framwork. It can be issued by "make check" in the test dir.

Signed-off-by: Wang Dong <dongdwdw@linux.vnet.ibm.com>
Signed-off-by: Hendrik Brueckner <brueckner@linux.vnet.ibm.com>
Signed-off-by: Brian C. Lane <bcl@redhat.com>
---
 libparted/tests/Makefile.am | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/libparted/tests/Makefile.am b/libparted/tests/Makefile.am
index c7c10a9..9689fb3 100644
--- a/libparted/tests/Makefile.am
+++ b/libparted/tests/Makefile.am
@@ -3,9 +3,9 @@
 #
 # This file may be modified and/or distributed without restriction.
 
-TESTS = t1000-label.sh t2000-disk.sh t2100-zerolen.sh t3000-symlink.sh
+TESTS = t1000-label.sh t2000-disk.sh t2100-zerolen.sh t3000-symlink.sh t4000-volser.sh
 EXTRA_DIST = $(TESTS)
-check_PROGRAMS = label disk zerolen symlink
+check_PROGRAMS = label disk zerolen symlink volser
 AM_CFLAGS = $(WARN_CFLAGS) $(WERROR_CFLAGS)
 
 LDADD = \
@@ -23,6 +23,7 @@ label_SOURCES = common.h common.c label.c
 disk_SOURCES  = common.h common.c disk.c
 zerolen_SOURCES = common.h common.c zerolen.c
 symlink_SOURCES = common.h common.c symlink.c
+volser_SOURCES = common.h common.c volser.c
 
 # Arrange to symlink to tests/init.sh.
 CLEANFILES = init.sh
-- 
2.16.4