From 8dca80b3c693f219cc06710bfeb5cfcb443249900bc9f7c592fb53f3f81f746f Mon Sep 17 00:00:00 2001 From: "Dr. Werner Fink" Date: Thu, 21 Jan 2021 08:16:50 +0000 Subject: [PATCH] Accepting request 865077 from home:Andreas_Schwab:Factory - Don't skip test for qemu builds OBS-URL: https://build.opensuse.org/request/show/865077 OBS-URL: https://build.opensuse.org/package/show/Base:System/ncurses?expand=0&rev=523 --- ncurses.changes | 5 +++++ ncurses.spec | 12 ++++++------ 2 files changed, 11 insertions(+), 6 deletions(-) diff --git a/ncurses.changes b/ncurses.changes index b22bf8d..087f8a0 100644 --- a/ncurses.changes +++ b/ncurses.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Wed Jan 20 20:43:02 UTC 2021 - Andreas Schwab + +- Don't skip test for qemu builds + ------------------------------------------------------------------- Mon Jan 11 07:24:25 UTC 2021 - Dr. Werner Fink diff --git a/ncurses.spec b/ncurses.spec index 2c0efc1..42edb7f 100644 --- a/ncurses.spec +++ b/ncurses.spec @@ -67,9 +67,9 @@ Obsoletes: ncurses-64bit Version: 6.2.%{patchlvl} Release: 0 Summary: Terminal control library -#Git: http://ncurses.scripts.mit.edu License: MIT Group: System/Base +#Git: http://ncurses.scripts.mit.edu URL: http://www.invisible-island.net/ncurses/ncurses.html Source0: ftp://ftp.invisible-island.net/ncurses/ncurses-6.2.tar.gz Source1: ncurses-6.2-patches.tar.bz2 @@ -641,8 +641,8 @@ mv tack-* tack # # Some tests # -%if 0%{?qemu_user_space_build:1}%{?_crossbuild} - echo "Skipping tests due to running under QEMU / cross-building" +%if 0%{?_crossbuild} + echo "Skipping tests due to cross-building" %else # # Check for tack program on base of above ncurses @@ -786,8 +786,8 @@ includedir5=%{_incdir}/ncurses5' "$pc" # # Some tests # -%if 0%{?qemu_user_space_build:1}%{?_crossbuild} || 0%{?suse_version} <= 1500 - echo "Skipping tests due to running under QEMU / cross-building" +%if 0%{?_crossbuild} || 0%{?suse_version} <= 1500 + echo "Skipping tests due to cross-building" %else # # Make the test suite for ncurses6 @@ -1088,7 +1088,7 @@ includedir5=%{_incdir}/ncurses5' "$pc" # cp -p pc/*.pc %{buildroot}%{_libdir}/pkgconfig/ -%if 0%{?qemu_user_space_build:1}%{?_crossbuild} +%if 0%{?_crossbuild} # No test here %else %check