| 1 |
commit: a06cdf4161b4dae04afb2cb5e2487df8c9c83147 |
| 2 |
Author: Davide Pesavento <pesa <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Mon Apr 30 03:05:07 2018 +0000 |
| 4 |
Commit: Davide Pesavento <pesa <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Mon Apr 30 03:09:32 2018 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a06cdf41 |
| 7 |
|
| 8 |
dev-util/qbs: fix and reenable TestApi tests |
| 9 |
|
| 10 |
Package-Manager: Portage-2.3.31, Repoman-2.3.9 |
| 11 |
|
| 12 |
dev-util/qbs/qbs-1.11.0.ebuild | 8 +++----- |
| 13 |
1 file changed, 3 insertions(+), 5 deletions(-) |
| 14 |
|
| 15 |
diff --git a/dev-util/qbs/qbs-1.11.0.ebuild b/dev-util/qbs/qbs-1.11.0.ebuild |
| 16 |
index bfadc6296da..4971aeed820 100644 |
| 17 |
--- a/dev-util/qbs/qbs-1.11.0.ebuild |
| 18 |
+++ b/dev-util/qbs/qbs-1.11.0.ebuild |
| 19 |
@@ -53,9 +53,6 @@ src_prepare() { |
| 20 |
|
| 21 |
echo "SUBDIRS = $(usex test auto '')" >> tests/tests.pro |
| 22 |
|
| 23 |
- # since 1.10, TestApi is either broken or requires more configuration |
| 24 |
- sed -i -e '/\<api\>/ d' tests/auto/auto.pro || die |
| 25 |
- |
| 26 |
# skip several tests that fail and/or have additional deps |
| 27 |
sed -i \ |
| 28 |
-e 's/findArchiver("7z")/""/' `# requires p7zip, fails` \ |
| 29 |
@@ -86,9 +83,10 @@ src_test() { |
| 30 |
|
| 31 |
export HOME=${T} |
| 32 |
export LD_LIBRARY_PATH=${S}/$(get_libdir) |
| 33 |
+ export QBS_AUTOTEST_PROFILE=autotests |
| 34 |
|
| 35 |
- "${S}"/bin/qbs-setup-toolchains /usr/bin/gcc gcc || die |
| 36 |
- "${S}"/bin/qbs-setup-qt "$(qt5_get_bindir)/qmake" qbs_autotests || die |
| 37 |
+ "${S}"/bin/qbs-setup-toolchains --detect || die |
| 38 |
+ "${S}"/bin/qbs-setup-qt "$(qt5_get_bindir)/qmake" autotests || die |
| 39 |
|
| 40 |
einfo "Running autotests" |
Archives