Simplify xvfb-run invocation

Instead of sed'ing %meson_test to remove newlines, just use 'eval' to
concatenate all of %meson_test commands together.
This commit is contained in:
Kalev Lember 2021-01-26 14:13:58 +01:00
parent 47d2f8285f
commit 147b42535d

View File

@ -5,7 +5,7 @@
Name: gjs Name: gjs
Version: 1.67.1 Version: 1.67.1
Release: 2%{?dist} Release: 3%{?dist}
Summary: Javascript Bindings for GNOME Summary: Javascript Bindings for GNOME
# The following files contain code from Mozilla which # The following files contain code from Mozilla which
@ -73,9 +73,7 @@ the functionality of the installed gjs package.
%meson_install %meson_install
%check %check
# we need to do this as meson_test macro begins with newline character xvfb-run -s "-screen 0 1600x1200x24" eval "%meson_test"
TEST_CMD="%meson_test"
xvfb-run -s "-screen 0 1600x1200x24" `echo $TEST_CMD | grep -v -e "^$"`
%files %files
%license COPYING %license COPYING
@ -100,6 +98,9 @@ xvfb-run -s "-screen 0 1600x1200x24" `echo $TEST_CMD | grep -v -e "^$"`
%{_datadir}/installed-tests/ %{_datadir}/installed-tests/
%changelog %changelog
* Tue Jan 26 2021 Kalev Lember <klember@redhat.com> - 1.67.1-3
- Simplify xvfb-run invocation
* Tue Jan 26 2021 Frantisek Zatloukal <fzatlouk@redhat.com> - 1.67.1-2 * Tue Jan 26 2021 Frantisek Zatloukal <fzatlouk@redhat.com> - 1.67.1-2
- Enable tests during rpmbuild - Enable tests during rpmbuild