From 25439fbe5d107fea583540bd7e4fa22f5c7db28b7d701ff14ee37a41a5780b0a Mon Sep 17 00:00:00 2001 From: Thorsten Kukuk Date: Wed, 8 Jul 2020 07:52:43 +0000 Subject: [PATCH] Accepting request 819364 from home:coolo:branches:openSUSE:Factory - Enable testsuite and package it for later rerun (for QA, jsc#CAR-15) OBS-URL: https://build.opensuse.org/request/show/819364 OBS-URL: https://build.opensuse.org/package/show/Base:System/busybox?expand=0&rev=67 --- busybox.changes | 6 ++++++ busybox.spec | 34 ++++++++++++++++++++++++++++++++++ 2 files changed, 40 insertions(+) diff --git a/busybox.changes b/busybox.changes index 8e888ab..9fc9fda 100644 --- a/busybox.changes +++ b/busybox.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Wed Jul 8 07:26:14 UTC 2020 - Stephan Kulow + +- Enable testsuite and package it for later rerun (for QA, + jsc#CAR-15) + ------------------------------------------------------------------- Fri Apr 17 09:46:21 UTC 2020 - Thorsten Kukuk diff --git a/busybox.spec b/busybox.spec index edce1b5..9142dab 100644 --- a/busybox.spec +++ b/busybox.spec @@ -34,6 +34,8 @@ Patch0: busybox-no-stime.patch Patch100: busybox.install.patch Provides: useradd_or_adduser_dep BuildRequires: glibc-devel-static +# for test suite +BuildRequires: zip %description BusyBox combines tiny versions of many common UNIX utilities into a @@ -53,6 +55,20 @@ Group: System/Base BusyBox combines tiny versions of many common UNIX utilities into a single executable. +%package testsuite +Summary: Testsuite of busybox +Group: Development/Testing +Requires: %{name} = %{version} +Requires: zip + +%description testsuite +Using this package you can test the busybox build on different kernels and glibc. +It needs to run with permission to the current directory, so either copy it away +as is or run as root: + +cd /usr/share/busybox/testsuite +PATH=/usr/share/busybox:$PATH SKIP_KNOWN_BUGS=1 ./runtest + %prep %setup -q %patch0 -p1 @@ -89,6 +105,19 @@ install -d %{buildroot}%{_sysconfdir} install -m 0644 %{SOURCE4} %{buildroot}%{_sysconfdir}/ install -d %{buildroot}%{_mandir}/man1 install -m 644 docs/BusyBox.1 %{buildroot}%{_mandir}/man1 +cp %{SOURCE2} %{buildroot}%{_datadir}/busybox/.config +ln -s %_bindir/busybox %{buildroot}%{_datadir}/busybox/busybox +cp -a testsuite %{buildroot}%{_datadir}/busybox/testsuite + +%check +export KCONFIG_NOTIMESTAMP=KCONFIG_NOTIMESTAMP +export BUILD_VERBOSE=2 +export CFLAGS="%{optflags} -fno-strict-aliasing -I/usr/include/tirpc" +export CC="gcc" +export HOSTCC=gcc +export SKIP_KNOWN_BUGS=1 +export SKIP_INTERNET_TESTS=1 +make -e %{?_smp_mflags} test %files %license LICENSE @@ -100,6 +129,11 @@ install -m 644 docs/BusyBox.1 %{buildroot}%{_mandir}/man1 %dir %{_datadir}/busybox %{_datadir}/busybox/busybox.links +%files testsuite +%{_datadir}/busybox/busybox +%{_datadir}/busybox/.config +%{_datadir}/busybox/testsuite + %files static %license LICENSE %{_bindir}/busybox-static