From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from pigeon.gentoo.org ([208.92.234.80] helo=lists.gentoo.org) by finch.gentoo.org with esmtp (Exim 4.60) (envelope-from ) id 1Qbywc-0005vh-Nn for garchives@archives.gentoo.org; Wed, 29 Jun 2011 17:52:58 +0000 Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 0F5BC1C113; Wed, 29 Jun 2011 17:52:23 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) by pigeon.gentoo.org (Postfix) with ESMTP id C13B51C0EB for ; Wed, 29 Jun 2011 17:52:23 +0000 (UTC) Received: from pelican.gentoo.org (unknown [66.219.59.40]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 304232AC012 for ; Wed, 29 Jun 2011 17:52:23 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by pelican.gentoo.org (Postfix) with ESMTP id 04C0B80048 for ; Wed, 29 Jun 2011 17:52:22 +0000 (UTC) From: "Michał Górny" To: gentoo-commits@lists.gentoo.org Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Michał Górny" Message-ID: <7fe6d28494f540339031150179d4906cf927d1ee.mgorny@gentoo> Subject: [gentoo-commits] proj/pms-test-suite:master commit in: pmstestsuite/library/standard/ X-VCS-Repository: proj/pms-test-suite X-VCS-Files: pmstestsuite/library/standard/depend.py pmstestsuite/library/standard/ext_cases.py pmstestsuite/library/standard/special_vars.py pmstestsuite/library/standard/variable_scope.py pmstestsuite/library/standard/workdir_fallback.py X-VCS-Directories: pmstestsuite/library/standard/ X-VCS-Committer: mgorny X-VCS-Committer-Name: Michał Górny X-VCS-Revision: 7fe6d28494f540339031150179d4906cf927d1ee Date: Wed, 29 Jun 2011 17:52:22 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: quoted-printable X-Archives-Salt: X-Archives-Hash: a3dc02cfd75ce6bbb510cb3db5fe4d1b commit: 7fe6d28494f540339031150179d4906cf927d1ee Author: Micha=C5=82 G=C3=B3rny gentoo org> AuthorDate: Wed Jun 29 17:13:05 2011 +0000 Commit: Micha=C5=82 G=C3=B3rny gentoo org> CommitDate: Wed Jun 29 17:32:35 2011 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=3Dproj/pms-test-suit= e.git;a=3Dcommit;h=3D7fe6d284 Adjust the tests relevant_/supported_eapis. --- pmstestsuite/library/standard/depend.py | 5 ----- pmstestsuite/library/standard/ext_cases.py | 3 +++ pmstestsuite/library/standard/special_vars.py | 6 ++---- pmstestsuite/library/standard/variable_scope.py | 1 - pmstestsuite/library/standard/workdir_fallback.py | 2 +- 5 files changed, 6 insertions(+), 11 deletions(-) diff --git a/pmstestsuite/library/standard/depend.py b/pmstestsuite/libra= ry/standard/depend.py index 3a2bea9..2a3049f 100644 --- a/pmstestsuite/library/standard/depend.py +++ b/pmstestsuite/library/standard/depend.py @@ -8,7 +8,6 @@ from pmstestsuite.library.standard.util import EbuildTouc= her, FailingEbuild class DependTest(DBusEbuildDependencyTestCase): """ DEPEND fulfilling test. """ =20 - relevant_eapis =3D (0,) depend_classes =3D [EbuildToucher] =20 def __init__(self, *args, **kwargs): @@ -20,7 +19,6 @@ class DependTest(DBusEbuildDependencyTestCase): class RDependTest(DBusEbuildDependencyTestCase): """ RDEPEND fulfilling test. """ =20 - relevant_eapis =3D (0,) rdepend_classes =3D [EbuildToucher] =20 def __init__(self, *args, **kwargs): @@ -32,19 +30,16 @@ class RDependTest(DBusEbuildDependencyTestCase): class PDependTest(DBusEbuildDependencyTestCase): """ PDEPEND fulfilling test. """ =20 - relevant_eapis =3D (0,) pdepend_classes =3D [EbuildToucher] =20 class FailingDependTest(DBusEbuildDependencyTestCase): """ Unfulfilled DEPEND test. """ =20 - relevant_eapis =3D (0,) depend_classes =3D [FailingEbuild] expect_failure =3D True =20 class FailingRDependTest(DBusEbuildDependencyTestCase): """ Unfulfilled RDEPEND test. """ =20 - relevant_eapis =3D (0,) depend_classes =3D [FailingEbuild] expect_failure =3D True diff --git a/pmstestsuite/library/standard/ext_cases.py b/pmstestsuite/li= brary/standard/ext_cases.py index d1d5eb6..fef45a1 100644 --- a/pmstestsuite/library/standard/ext_cases.py +++ b/pmstestsuite/library/standard/ext_cases.py @@ -10,6 +10,9 @@ class DBusFetchingEbuildTestCase(DBusEbuildTestCase): sources -- to decrease ${DISTDIR} pollution. """ =20 + # temporary, due to SRC_URI arrow + supported_eapis =3D (2, 3, 4) + def __init__(self, *args, **kwargs): DBusEbuildTestCase.__init__(self, *args, **kwargs) # XXX: switch to a dedicated file without the arrow diff --git a/pmstestsuite/library/standard/special_vars.py b/pmstestsuite= /library/standard/special_vars.py index 2a38897..0279b83 100644 --- a/pmstestsuite/library/standard/special_vars.py +++ b/pmstestsuite/library/standard/special_vars.py @@ -7,8 +7,6 @@ from pmstestsuite.library.standard.dbus_case import DBusE= buildTestCase class InheritedVariableTest(DBusEbuildTestCase): """ INHERITED variable definition test. """ =20 - relevant_eapis =3D (0,) - phase_funcs =3D { 'src_compile': [ 'pms-test-dbus_append_result "${INHERITED}"' @@ -23,7 +21,7 @@ class InheritedVariableTest(DBusEbuildTestCase): class RDependFallbackTest(DBusEbuildTestCase): """ Test whether RDEPEND=3D${DEPEND} fallback works as expected. """ =20 - relevant_eapis =3D (0, 3, 4) + relevant_eapis =3D (3, 4) ebuild_vars =3D { # that one shall be pretty portable 'DEPEND': 'virtual/libc' @@ -39,7 +37,7 @@ class RDependFallbackTest(DBusEbuildTestCase): class DefinedPhasesTest(DBusEbuildTestCase): """ Test whether DEFINED_PHASES are declared in EAPI 4. """ =20 - relevant_eapis =3D (4,) + supported_eapis =3D (4,) phase_funcs =3D { 'pkg_setup': [ ':' diff --git a/pmstestsuite/library/standard/variable_scope.py b/pmstestsui= te/library/standard/variable_scope.py index bd78554..3bd7b94 100644 --- a/pmstestsuite/library/standard/variable_scope.py +++ b/pmstestsuite/library/standard/variable_scope.py @@ -9,7 +9,6 @@ from pmstestsuite.library.standard.dbus_case import DBusE= buildTestCase class VariableScopeTest(DBusEbuildTestCase): """ A test for scoping of variables. """ =20 - relevant_eapis =3D (0,) ebuild_vars =3D { 'GLOBAL_TEST': 'foo' } diff --git a/pmstestsuite/library/standard/workdir_fallback.py b/pmstests= uite/library/standard/workdir_fallback.py index 96cd2e8..d1fdd18 100644 --- a/pmstestsuite/library/standard/workdir_fallback.py +++ b/pmstestsuite/library/standard/workdir_fallback.py @@ -7,7 +7,7 @@ from pmstestsuite.library.standard.ext_cases import DBusF= etchingEbuildTestCase class WorkdirFallbackTest(DBusFetchingEbuildTestCase): """ S=3D${WORKDIR} fallback test. """ =20 - relevant_eapis =3D (2, 4) + relevant_eapis =3D (3, 4) =20 # In order to disallow S=3D${WORKDIR} fallback, we need to: # 1) have something in ${A} (i.e. fetch something),