Skip to content

Commit

Permalink
*/*: [QA] Remove redundant || die on virtx
Browse files Browse the repository at this point in the history
* `virtx` never required `|| die` to begin with.

Closes: gentoo#13954
Signed-off-by: David Seifert <[email protected]>
  • Loading branch information
SoapGentoo committed Dec 12, 2019
1 parent 944b0fa commit 76c0a78
Show file tree
Hide file tree
Showing 81 changed files with 81 additions and 81 deletions.
2 changes: 1 addition & 1 deletion app-accessibility/at-spi2-atk/at-spi2-atk-2.30.1.ebuild
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ multilib_src_compile() {
}

multilib_src_test() {
virtx dbus-run-session meson test -C "${BUILD_DIR}" || die 'tests failed'
virtx dbus-run-session meson test -C "${BUILD_DIR}"
}

multilib_src_install() {
Expand Down
2 changes: 1 addition & 1 deletion app-accessibility/at-spi2-atk/at-spi2-atk-2.32.0.ebuild
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ multilib_src_compile() {
}

multilib_src_test() {
virtx dbus-run-session meson test -C "${BUILD_DIR}" || die 'tests failed'
virtx dbus-run-session meson test -C "${BUILD_DIR}"
}

multilib_src_install() {
Expand Down
2 changes: 1 addition & 1 deletion app-accessibility/at-spi2-atk/at-spi2-atk-2.34.0.ebuild
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ multilib_src_compile() {
}

multilib_src_test() {
virtx dbus-run-session meson test -C "${BUILD_DIR}" || die 'tests failed'
virtx dbus-run-session meson test -C "${BUILD_DIR}"
}

multilib_src_install() {
Expand Down
2 changes: 1 addition & 1 deletion dev-libs/gjs/gjs-1.56.2.ebuild
Original file line number Diff line number Diff line change
Expand Up @@ -63,5 +63,5 @@ src_install() {
}

src_test() {
virtx dbus-run-session emake check || die
virtx dbus-run-session emake check
}
2 changes: 1 addition & 1 deletion dev-libs/libunique/libunique-1.1.6-r2.ebuild
Original file line number Diff line number Diff line change
Expand Up @@ -60,5 +60,5 @@ src_configure() {
src_test() {
cd "${S}/tests"
cp "${FILESDIR}/run-tests" . || die "Unable to cp \${FILESDIR}/run-tests"
virtx emake -f run-tests || die "Tests failed"
virtx emake -f run-tests
}
2 changes: 1 addition & 1 deletion dev-libs/libunique/libunique-3.0.2-r1.ebuild
Original file line number Diff line number Diff line change
Expand Up @@ -42,5 +42,5 @@ src_configure() {
src_test() {
cd "${S}/tests"
cp "${FILESDIR}/run-tests" . || die "Unable to cp \${FILESDIR}/run-tests"
virtx emake -f run-tests || die "Tests failed"
virtx emake -f run-tests
}
2 changes: 1 addition & 1 deletion dev-perl/Tk/Tk-804.34.0.ebuild
Original file line number Diff line number Diff line change
Expand Up @@ -60,5 +60,5 @@ src_prepare() {
mv "${T}/stash/testimg.jpg" "${S}/JPEG/jpeg/testimg.jpg" || die "can't restore testimg.jpg"
}
src_test() {
virtx perl-module_src_test || die "src_test failed"
virtx perl-module_src_test
}
2 changes: 1 addition & 1 deletion dev-python/astroml/astroml-0.3.ebuild
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ S="${WORKDIR}/${MYP}"
DOCS=( CHANGES.rst README.rst )

python_test() {
virtx nosetests --verbose || die
virtx nosetests --verbose
}

python_install_all() {
Expand Down
2 changes: 1 addition & 1 deletion dev-python/cairocffi/cairocffi-0.8.0.ebuild
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@ python_compile_all() {
}

python_test() {
virtx py.test -v --pyargs cairocffi || die "testsuite failed under ${EPYTHON}"
virtx py.test -v --pyargs cairocffi
}

python_install_all() {
Expand Down
2 changes: 1 addition & 1 deletion dev-python/cairocffi/cairocffi-0.9.0.ebuild
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@ python_compile_all() {
}

python_test() {
virtx py.test -v --pyargs cairocffi -o addopts= || die "testsuite failed under ${EPYTHON}"
virtx py.test -v --pyargs cairocffi -o addopts=
}

python_install_all() {
Expand Down
2 changes: 1 addition & 1 deletion dev-python/cairocffi/cairocffi-1.0.2.ebuild
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,7 @@ python_compile_all() {
}

python_test() {
virtx py.test -v --pyargs cairocffi || die "testsuite failed under ${EPYTHON}"
virtx py.test -v --pyargs cairocffi
}

python_install_all() {
Expand Down
2 changes: 1 addition & 1 deletion dev-python/cliff/cliff-2.12.0-r2.ebuild
Original file line number Diff line number Diff line change
Expand Up @@ -50,5 +50,5 @@ RDEPEND="
python_test() {
stestr init || die "stestr init failed under ${EPYTHON}"
# needs outside access, so blacklist the test
virtx stestr run --black-regex cliff.tests.test_app.TestIO.test_writer_encoding || die "stestr run failed under ${EPYTHON}"
virtx stestr run --black-regex cliff.tests.test_app.TestIO.test_writer_encoding
}
2 changes: 1 addition & 1 deletion dev-python/fonttools/fonttools-3.44.0.ebuild
Original file line number Diff line number Diff line change
Expand Up @@ -50,5 +50,5 @@ python_prepare_all() {

python_test() {
# virtualx used when matplotlib is installed causing plot module tests to run
virtx pytest -vv Tests fontTools || die "pytest failed"
virtx pytest -vv Tests fontTools
}
2 changes: 1 addition & 1 deletion dev-python/fonttools/fonttools-4.0.1.ebuild
Original file line number Diff line number Diff line change
Expand Up @@ -47,5 +47,5 @@ python_prepare_all() {

python_test() {
# virtualx used when matplotlib is installed causing plot module tests to run
virtx pytest -vv Tests fontTools || die "pytest failed"
virtx pytest -vv Tests fontTools
}
2 changes: 1 addition & 1 deletion dev-python/fonttools/fonttools-4.1.0.ebuild
Original file line number Diff line number Diff line change
Expand Up @@ -47,5 +47,5 @@ python_prepare_all() {

python_test() {
# virtualx used when matplotlib is installed causing plot module tests to run
virtx pytest -vv Tests fontTools || die "pytest failed"
virtx pytest -vv Tests fontTools
}
Original file line number Diff line number Diff line change
Expand Up @@ -41,5 +41,5 @@ DEPEND="
python_test() {
cd "${BUILD_DIR}"/lib || die
echo "backend: Agg" > matplotlibrc
virtx py.test || die
virtx py.test
}
2 changes: 1 addition & 1 deletion dev-python/matplotlib2tikz/matplotlib2tikz-0.6.18.ebuild
Original file line number Diff line number Diff line change
Expand Up @@ -34,5 +34,5 @@ RESTRICT="test"

python_test() {
local -x MPLBACKEND=Agg
virtx py.test -v || die "Tests failed with ${EPYTHON}"
virtx py.test -v
}
2 changes: 1 addition & 1 deletion dev-python/networkx/networkx-1.11-r1.ebuild
Original file line number Diff line number Diff line change
Expand Up @@ -62,7 +62,7 @@ python_compile_all() {
}

python_test() {
virtx nosetests -vv || die
virtx nosetests -vv
}

python_install_all() {
Expand Down
2 changes: 1 addition & 1 deletion dev-python/networkx/networkx-1.11.ebuild
Original file line number Diff line number Diff line change
Expand Up @@ -62,7 +62,7 @@ python_compile_all() {
}

python_test() {
virtx nosetests -vv || die
virtx nosetests -vv
}

python_install_all() {
Expand Down
2 changes: 1 addition & 1 deletion dev-python/networkx/networkx-2.1.ebuild
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@ PATCHES=(
)

python_test() {
virtx nosetests -vv || die
virtx nosetests -vv
}

python_install_all() {
Expand Down
2 changes: 1 addition & 1 deletion dev-python/networkx/networkx-2.2.ebuild
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,7 @@ PATCHES=(
)

python_test() {
virtx nosetests -vv || die
virtx nosetests -vv
}

python_install_all() {
Expand Down
2 changes: 1 addition & 1 deletion dev-python/networkx/networkx-2.4.ebuild
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@ PATCHES=(
)

python_test() {
virtx nosetests -vv || die
virtx nosetests -vv
}

python_install_all() {
Expand Down
2 changes: 1 addition & 1 deletion dev-python/notify2/notify2-0.3.1-r1.ebuild
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ IUSE="examples"
RDEPEND="dev-python/dbus-python[${PYTHON_USEDEP}]"

python_test() {
virtx ${EPYTHON} test_notify2.py || die
virtx ${EPYTHON} test_notify2.py
}

python_install_all() {
Expand Down
2 changes: 1 addition & 1 deletion dev-python/notify2/notify2-0.3.1.ebuild
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ IUSE="examples"
RDEPEND="dev-python/dbus-python[${PYTHON_USEDEP}]"

python_test() {
virtx ${EPYTHON} test_notify2.py || die
virtx ${EPYTHON} test_notify2.py
}

python_install_all() {
Expand Down
2 changes: 1 addition & 1 deletion dev-python/notify2/notify2-0.3.ebuild
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ IUSE="examples"
RDEPEND="dev-python/dbus-python[${PYTHON_USEDEP}]"

python_test() {
virtx ${EPYTHON} test_notify2.py || die
virtx ${EPYTHON} test_notify2.py
}

python_install_all() {
Expand Down
2 changes: 1 addition & 1 deletion dev-python/pandas/pandas-0.19.1.ebuild
Original file line number Diff line number Diff line change
Expand Up @@ -118,7 +118,7 @@ python_compile_all() {
if use doc; then
cd "${BUILD_DIR}"/lib || die
cp -ar "${S}"/doc . && cd doc || die
LANG=C PYTHONPATH=. virtx ${EPYTHON} make.py html || die
LANG=C PYTHONPATH=. virtx ${EPYTHON} make.py html
fi
}

Expand Down
2 changes: 1 addition & 1 deletion dev-python/pandas/pandas-0.23.4.ebuild
Original file line number Diff line number Diff line change
Expand Up @@ -130,7 +130,7 @@ python_compile_all() {
if use doc; then
cd "${BUILD_DIR}"/lib || die
cp -ar "${S}"/doc . && cd doc || die
LANG=C PYTHONPATH=. virtx ${EPYTHON} make.py html || die
LANG=C PYTHONPATH=. virtx ${EPYTHON} make.py html
fi
}

Expand Down
2 changes: 1 addition & 1 deletion dev-python/pandas/pandas-0.24.2.ebuild
Original file line number Diff line number Diff line change
Expand Up @@ -126,7 +126,7 @@ python_compile_all() {
if use doc; then
cd "${BUILD_DIR}"/lib || die
cp -ar "${S}"/doc . && cd doc || die
LANG=C PYTHONPATH=. virtx ${EPYTHON} make.py html || die
LANG=C PYTHONPATH=. virtx ${EPYTHON} make.py html
fi
}

Expand Down
2 changes: 1 addition & 1 deletion dev-python/pandas/pandas-9999.ebuild
Original file line number Diff line number Diff line change
Expand Up @@ -128,7 +128,7 @@ python_compile_all() {
if use doc; then
cd "${BUILD_DIR}"/lib || die
cp -ar "${S}"/doc . && cd doc || die
LANG=C PYTHONPATH=. virtx ${EPYTHON} make.py html || die
LANG=C PYTHONPATH=. virtx ${EPYTHON} make.py html
fi
}

Expand Down
2 changes: 1 addition & 1 deletion dev-python/pytest-mpl/pytest-mpl-0.8.ebuild
Original file line number Diff line number Diff line change
Expand Up @@ -27,5 +27,5 @@ DEPEND="${RDEPEND}

python_test() {
echo "backend : Agg" > "${T}"/matplotlibrc || die
MPLCONFIGDIR="${T}" virtx py.test -v || die
MPLCONFIGDIR="${T}" virtx py.test -v
}
2 changes: 1 addition & 1 deletion dev-python/rpy/rpy-2.9.0.ebuild
Original file line number Diff line number Diff line change
Expand Up @@ -48,5 +48,5 @@ python_compile() {

python_test() {
cd "${BUILD_DIR}"/lib || die
virtx "${EPYTHON}" -m 'rpy2.tests' || die
virtx "${EPYTHON}" -m 'rpy2.tests'
}
2 changes: 1 addition & 1 deletion dev-python/seaborn/seaborn-0.7.1.ebuild
Original file line number Diff line number Diff line change
Expand Up @@ -35,5 +35,5 @@ python_test() {
cat > matplotlibrc <<- EOF || die
backend : Agg
EOF
virtx nosetests --verbosity=3 || die
virtx nosetests --verbosity=3
}
2 changes: 1 addition & 1 deletion dev-python/seaborn/seaborn-0.8.1.ebuild
Original file line number Diff line number Diff line change
Expand Up @@ -35,5 +35,5 @@ python_test() {
cat > matplotlibrc <<- EOF || die
backend : Agg
EOF
virtx nosetests --verbosity=3 || die
virtx nosetests --verbosity=3
}
2 changes: 1 addition & 1 deletion dev-python/seaborn/seaborn-0.9.0.ebuild
Original file line number Diff line number Diff line change
Expand Up @@ -35,5 +35,5 @@ python_test() {
cat > matplotlibrc <<- EOF || die
backend : Agg
EOF
virtx nosetests --verbosity=3 || die
virtx nosetests --verbosity=3
}
2 changes: 1 addition & 1 deletion dev-python/statsmodels/statsmodels-0.8.0.ebuild
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,7 @@ python_compile_all() {

python_test() {
cd "${BUILD_DIR}" || die
virtx nosetests -v || die
virtx nosetests -v
}

python_install_all() {
Expand Down
2 changes: 1 addition & 1 deletion dev-python/wxpython/wxpython-4.0.6.ebuild
Original file line number Diff line number Diff line change
Expand Up @@ -86,5 +86,5 @@ python_install() {
}

python_test() {
virtx pytest -vv unittests || die "Test failed with ${EPYTHON}"
virtx pytest -vv unittests
}
2 changes: 1 addition & 1 deletion dev-python/xcffib/xcffib-0.8.1.ebuild
Original file line number Diff line number Diff line change
Expand Up @@ -35,5 +35,5 @@ DEPEND="
PATCHES=( "${FILESDIR}"/${PN}-0.4.2-test-imports.patch )

python_test() {
virtx nosetests -d -v || die
virtx nosetests -d -v
}
2 changes: 1 addition & 1 deletion dev-ruby/capybara/capybara-2.18.0.ebuild
Original file line number Diff line number Diff line change
Expand Up @@ -46,5 +46,5 @@ all_ruby_prepare() {
}

each_ruby_test() {
virtx ${RUBY} -Ilib -S rspec-3 spec || die "Tests failed."
virtx ${RUBY} -Ilib -S rspec-3 spec
}
2 changes: 1 addition & 1 deletion dev-ruby/capybara/capybara-3.26.0.ebuild
Original file line number Diff line number Diff line change
Expand Up @@ -57,5 +57,5 @@ all_ruby_prepare() {
}

each_ruby_test() {
virtx ${RUBY} -Ilib -S rspec-3 spec || die "Tests failed."
virtx ${RUBY} -Ilib -S rspec-3 spec
}
2 changes: 1 addition & 1 deletion dev-ruby/capybara/capybara-3.27.0.ebuild
Original file line number Diff line number Diff line change
Expand Up @@ -56,5 +56,5 @@ all_ruby_prepare() {
}

each_ruby_test() {
virtx ${RUBY} -Ilib -S rspec-3 spec || die "Tests failed."
virtx ${RUBY} -Ilib -S rspec-3 spec
}
2 changes: 1 addition & 1 deletion dev-ruby/capybara/capybara-3.28.0.ebuild
Original file line number Diff line number Diff line change
Expand Up @@ -56,5 +56,5 @@ all_ruby_prepare() {
}

each_ruby_test() {
virtx ${RUBY} -Ilib -S rspec-3 spec || die "Tests failed."
virtx ${RUBY} -Ilib -S rspec-3 spec
}
2 changes: 1 addition & 1 deletion dev-ruby/capybara/capybara-3.29.0.ebuild
Original file line number Diff line number Diff line change
Expand Up @@ -56,5 +56,5 @@ all_ruby_prepare() {
}

each_ruby_test() {
virtx ${RUBY} -Ilib -S rspec-3 spec || die "Tests failed."
virtx ${RUBY} -Ilib -S rspec-3 spec
}
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ each_ruby_compile() {
}

each_ruby_test() {
virtx ${RUBY} test/run-test.rb || die
virtx ${RUBY} test/run-test.rb
}

each_ruby_install() {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ each_ruby_compile() {
}

each_ruby_test() {
virtx ${RUBY} test/run-test.rb || die
virtx ${RUBY} test/run-test.rb
}

each_ruby_install() {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ each_ruby_compile() {
}

each_ruby_test() {
virtx ${RUBY} test/run-test.rb || die
virtx ${RUBY} test/run-test.rb
}

each_ruby_install() {
Expand Down
2 changes: 1 addition & 1 deletion dev-ruby/ruby-clutter-gtk/ruby-clutter-gtk-3.3.2.ebuild
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@ each_ruby_compile() {
}

each_ruby_test() {
virtx ${RUBY} test/run-test.rb || die
virtx ${RUBY} test/run-test.rb
}

each_ruby_install() {
Expand Down
2 changes: 1 addition & 1 deletion dev-ruby/ruby-clutter-gtk/ruby-clutter-gtk-3.3.6.ebuild
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@ each_ruby_compile() {
}

each_ruby_test() {
virtx ${RUBY} test/run-test.rb || die
virtx ${RUBY} test/run-test.rb
}

each_ruby_install() {
Expand Down
2 changes: 1 addition & 1 deletion dev-ruby/ruby-clutter-gtk/ruby-clutter-gtk-3.3.7.ebuild
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@ each_ruby_compile() {
}

each_ruby_test() {
virtx ${RUBY} test/run-test.rb || die
virtx ${RUBY} test/run-test.rb
}

each_ruby_install() {
Expand Down
2 changes: 1 addition & 1 deletion dev-ruby/ruby-clutter/ruby-clutter-3.3.2.ebuild
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@ each_ruby_compile() {
}

each_ruby_test() {
virtx ${RUBY} test/run-test.rb || die
virtx ${RUBY} test/run-test.rb
}

each_ruby_install() {
Expand Down
Loading

0 comments on commit 76c0a78

Please sign in to comment.