From 9caf8cccbf64aa0ca50325222dd79392473dc2597061b0215bbafb04901eac9f Mon Sep 17 00:00:00 2001 From: Thomas Renninger Date: Tue, 21 Sep 2021 12:01:38 +0000 Subject: [PATCH 1/2] Accepting request 920256 from home:aschnell:branches:Base:System - run checks during build OBS-URL: https://build.opensuse.org/request/show/920256 OBS-URL: https://build.opensuse.org/package/show/Base:System/parted?expand=0&rev=149 --- parted.changes | 7 +++++++ parted.spec | 5 +++++ tests-disable.patch | 25 +++++++++++++++++++++++++ 3 files changed, 37 insertions(+) create mode 100644 tests-disable.patch diff --git a/parted.changes b/parted.changes index 7c3ca5f..21e90ba 100644 --- a/parted.changes +++ b/parted.changes @@ -1,3 +1,10 @@ +------------------------------------------------------------------- +Mon Sep 20 07:35:15 CEST 2021 - aschnell@suse.com + +- run checks during build +- added patches: + tests-disable.patch + ------------------------------------------------------------------- Mon Jul 26 16:50:36 CEST 2021 - aschnell@suse.com diff --git a/parted.spec b/parted.spec index 3b338e3..e960d6c 100644 --- a/parted.spec +++ b/parted.spec @@ -74,6 +74,7 @@ Patch101: fatresize-fix-getting-dev-name.patch # Tests patches Patch156: tests-add-helper-require_swap_.patch Patch157: tests-add-dev-md-check-to-t6100.patch +Patch158: tests-disable.patch # SUSE tests patches Patch200: tests-adapt-to-SUSE.patch @@ -157,6 +158,7 @@ to develop applications that require these. %patch101 -p1 %patch156 -p1 %patch157 -p1 +%patch158 -p1 %patch200 -p1 %build @@ -170,6 +172,9 @@ AUTOPOINT=true autoreconf --force --install --disable-silent-rules make %{?_smp_mflags} +%check +make check + %install %make_install rm %{buildroot}%{_libdir}/*.la diff --git a/tests-disable.patch b/tests-disable.patch new file mode 100644 index 0000000..56f952b --- /dev/null +++ b/tests-disable.patch @@ -0,0 +1,25 @@ +diff --git a/libparted/tests/Makefile.am b/libparted/tests/Makefile.am +index c92a3a3..915bbc4 100644 +--- a/libparted/tests/Makefile.am ++++ b/libparted/tests/Makefile.am +@@ -3,7 +3,7 @@ + # + # This file may be modified and/or distributed without restriction. + +-TESTS = t1000-label.sh t2000-disk.sh t2100-zerolen.sh t3000-symlink.sh t4000-volser.sh ++TESTS = t1000-label.sh t2000-disk.sh t2100-zerolen.sh t3000-symlink.sh + EXTRA_DIST = $(TESTS) + check_PROGRAMS = label disk zerolen symlink volser + AM_CFLAGS = $(WARN_CFLAGS) $(WERROR_CFLAGS) +diff --git a/tests/Makefile.am b/tests/Makefile.am +index f9340aa..9d0d08f 100644 +--- a/tests/Makefile.am ++++ b/tests/Makefile.am +@@ -60,7 +60,6 @@ TESTS = \ + t3200-resize-partition.sh \ + t3200-type-change.sh \ + t3300-palo-prep.sh \ +- t3310-flags.sh \ + t3400-whole-disk-FAT-partition.sh \ + t4000-sun-raid-type.sh \ + t4001-sun-vtoc.sh \ From e927b6092664ce50515e21cfb45db513cc1342838fdf2de8fdd86dbad8ff9ca0 Mon Sep 17 00:00:00 2001 From: Dirk Mueller Date: Thu, 21 Oct 2021 13:23:47 +0000 Subject: [PATCH 2/2] Accepting request 926197 from home:dimstar:Factory - BuildRequire python3-base: Fix execution of test suite. Otherwise we fail with ./t0282-gpt-move-backup.sh: /usr/bin/python3: bad interpreter: No such file or directory. Base:System is 'masking' this erro due the a project config entry: Preinstall: python38-base. I have no clue why Base:System decides to hack around actual issues in this way, but it is what blocked this parted update from entering Factory for 4 weeks already (as my comments on the SR seem to be simply ignored anyway and nobody seemed to care to fix parted). OBS-URL: https://build.opensuse.org/request/show/926197 OBS-URL: https://build.opensuse.org/package/show/Base:System/parted?expand=0&rev=150 --- parted.changes | 8 ++++++++ parted.spec | 1 + 2 files changed, 9 insertions(+) diff --git a/parted.changes b/parted.changes index 21e90ba..bdf90fc 100644 --- a/parted.changes +++ b/parted.changes @@ -1,3 +1,11 @@ +------------------------------------------------------------------- +Tue Oct 19 09:48:22 UTC 2021 - Dominique Leuenberger + +- BuildRequire python3-base: Fix execution of test suite. Otherwise + we fail with + ./t0282-gpt-move-backup.sh: /usr/bin/python3: bad interpreter: No + such file or directory. + ------------------------------------------------------------------- Mon Sep 20 07:35:15 CEST 2021 - aschnell@suse.com diff --git a/parted.spec b/parted.spec index e960d6c..19015a6 100644 --- a/parted.spec +++ b/parted.spec @@ -88,6 +88,7 @@ BuildRequires: libtool BuildRequires: libuuid-devel BuildRequires: makeinfo BuildRequires: pkg-config +BuildRequires: python3-base BuildRequires: readline-devel PreReq: %install_info_prereq BuildRoot: %{_tmppath}/%{name}-%{version}-build