aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAvatar Bryan Ƙstergaard <kloeri@exherbo.org> 2009-05-30 21:19:32 +0000
committerAvatar Ciaran McCreesh <ciaran.mccreesh@googlemail.com> 2009-05-31 00:06:57 +0100
commitd6168040a50fef5a457a3dca1cff89124cc997cc (patch)
tree87cd8e614f45d36373cb23401abcb8567c3b7fd3
parent35de93d04942375791298cde7f76bf48ac87f5b1 (diff)
downloadpaludis-d6168040a50fef5a457a3dca1cff89124cc997cc.tar.gz
paludis-d6168040a50fef5a457a3dca1cff89124cc997cc.tar.xz
Rename slow_test to expensive_test.
-rw-r--r--paludis/elike_choices-fwd.hh2
-rw-r--r--paludis/elike_choices.cc24
-rw-r--r--paludis/elike_choices.hh4
-rw-r--r--paludis/repositories/e/e_repository_TEST_phases.cc16
-rwxr-xr-xpaludis/repositories/e/e_repository_TEST_phases_setup.sh16
-rw-r--r--paludis/repositories/e/eapi.cc2
-rw-r--r--paludis/repositories/e/eapi.hh4
-rw-r--r--paludis/repositories/e/eapis/0.conf2
-rw-r--r--paludis/repositories/e/eapis/exheres-0.conf6
-rw-r--r--paludis/repositories/e/eapis/paludis-1.conf2
-rw-r--r--paludis/repositories/e/ebuild/exheres-0/Makefile.am2
-rw-r--r--paludis/repositories/e/ebuild/exheres-0/src_test_expensive.bash (renamed from paludis/repositories/e/ebuild/exheres-0/src_test_slow.bash)16
-rw-r--r--paludis/repositories/e/ebuild_entries.cc4
-rw-r--r--paludis/repositories/e/ebuild_id.cc14
14 files changed, 57 insertions, 57 deletions
diff --git a/paludis/elike_choices-fwd.hh b/paludis/elike_choices-fwd.hh
index 644c1b1..fe50faf 100644
--- a/paludis/elike_choices-fwd.hh
+++ b/paludis/elike_choices-fwd.hh
@@ -30,7 +30,7 @@ namespace paludis
struct ELikeSplitChoiceValue;
struct ELikeOptionalTestsChoiceValue;
struct ELikeRecommendedTestsChoiceValue;
- struct ELikeSlowTestsChoiceValue;
+ struct ELikeExpensiveTestsChoiceValue;
const ChoicePrefixName canonical_build_options_prefix() PALUDIS_VISIBLE PALUDIS_ATTRIBUTE((warn_unused_result));
const std::string canonical_build_options_raw_name() PALUDIS_VISIBLE PALUDIS_ATTRIBUTE((warn_unused_result));
diff --git a/paludis/elike_choices.cc b/paludis/elike_choices.cc
index d7251d6..f7e42b5 100644
--- a/paludis/elike_choices.cc
+++ b/paludis/elike_choices.cc
@@ -283,61 +283,61 @@ paludis::canonical_build_options_human_name()
}
const UnprefixedChoiceName
-ELikeSlowTestsChoiceValue::canonical_unprefixed_name()
+ELikeExpensiveTestsChoiceValue::canonical_unprefixed_name()
{
- return UnprefixedChoiceName("slow_tests");
+ return UnprefixedChoiceName("expensive_tests");
}
const ChoiceNameWithPrefix
-ELikeSlowTestsChoiceValue::canonical_name_with_prefix()
+ELikeExpensiveTestsChoiceValue::canonical_name_with_prefix()
{
return ChoiceNameWithPrefix(stringify(canonical_build_options_prefix()) + ":" + stringify(canonical_unprefixed_name()));
}
-ELikeSlowTestsChoiceValue::ELikeSlowTestsChoiceValue(const std::tr1::shared_ptr<const PackageID> & id,
+ELikeExpensiveTestsChoiceValue::ELikeExpensiveTestsChoiceValue(const std::tr1::shared_ptr<const PackageID> & id,
const Environment * const env, const std::tr1::shared_ptr<const Choice> & choice) :
_enabled(env->want_choice_enabled(id, choice, canonical_unprefixed_name()).is_true())
{
}
const UnprefixedChoiceName
-ELikeSlowTestsChoiceValue::unprefixed_name() const
+ELikeExpensiveTestsChoiceValue::unprefixed_name() const
{
return canonical_unprefixed_name();
}
const ChoiceNameWithPrefix
-ELikeSlowTestsChoiceValue::name_with_prefix() const
+ELikeExpensiveTestsChoiceValue::name_with_prefix() const
{
return canonical_name_with_prefix();
}
bool
-ELikeSlowTestsChoiceValue::enabled() const
+ELikeExpensiveTestsChoiceValue::enabled() const
{
return _enabled;
}
bool
-ELikeSlowTestsChoiceValue::enabled_by_default() const
+ELikeExpensiveTestsChoiceValue::enabled_by_default() const
{
return false;
}
bool
-ELikeSlowTestsChoiceValue::locked() const
+ELikeExpensiveTestsChoiceValue::locked() const
{
return false;
}
const std::string
-ELikeSlowTestsChoiceValue::description() const
+ELikeExpensiveTestsChoiceValue::description() const
{
- return "Run tests considered by the package to be useful, but slow";
+ return "Run tests considered by the package to be useful, but expensive";
}
bool
-ELikeSlowTestsChoiceValue::explicitly_listed() const
+ELikeExpensiveTestsChoiceValue::explicitly_listed() const
{
return true;
}
diff --git a/paludis/elike_choices.hh b/paludis/elike_choices.hh
index ecc783e..fb59838 100644
--- a/paludis/elike_choices.hh
+++ b/paludis/elike_choices.hh
@@ -116,14 +116,14 @@ namespace paludis
static const ChoiceNameWithPrefix canonical_name_with_prefix() PALUDIS_ATTRIBUTE((warn_unused_result));
};
- class PALUDIS_VISIBLE ELikeSlowTestsChoiceValue :
+ class PALUDIS_VISIBLE ELikeExpensiveTestsChoiceValue :
public ChoiceValue
{
private:
const bool _enabled;
public:
- ELikeSlowTestsChoiceValue(const std::tr1::shared_ptr<const PackageID> &,
+ ELikeExpensiveTestsChoiceValue(const std::tr1::shared_ptr<const PackageID> &,
const Environment * const env, const std::tr1::shared_ptr<const Choice> &);
virtual const UnprefixedChoiceName unprefixed_name() const PALUDIS_ATTRIBUTE((warn_unused_result));
diff --git a/paludis/repositories/e/e_repository_TEST_phases.cc b/paludis/repositories/e/e_repository_TEST_phases.cc
index aca1607..3c1e252 100644
--- a/paludis/repositories/e/e_repository_TEST_phases.cc
+++ b/paludis/repositories/e/e_repository_TEST_phases.cc
@@ -88,13 +88,13 @@ namespace
{
const std::string test;
const bool expect_pass;
- const bool expect_slow_test;
+ const bool expect_expensive_test;
PhasesTest(const std::string & s, const bool p, const bool t) :
TestCase("ever " + s),
test(s),
expect_pass(p),
- expect_slow_test(t)
+ expect_expensive_test(t)
{
}
@@ -168,7 +168,7 @@ namespace
&env, UserPackageDepSpecOptions())), MatchPackageOptions()))]->last());
TEST_CHECK(id);
TEST_CHECK_EQUAL(!! id->choices_key()->value()->find_by_name_with_prefix(
- ChoiceNameWithPrefix("build_options:slow_tests")), expect_slow_test);
+ ChoiceNameWithPrefix("build_options:expensive_tests")), expect_expensive_test);
if (expect_pass)
id->perform_action(action);
@@ -180,20 +180,20 @@ namespace
namespace test_cases
{
- PhasesTest test_no("no-slow-test", true, false);
- PhasesTest test_pass("slow-test", true, true);
- PhasesTest test_fail("slow-test-fail", true, true);
+ PhasesTest test_no("no-expensive-test", true, false);
+ PhasesTest test_pass("expensive-test", true, true);
+ PhasesTest test_fail("expensive-test-fail", true, true);
struct TestFailEnabled : PhasesTest
{
TestFailEnabled() :
- PhasesTest("slow-test-fail", false, true)
+ PhasesTest("expensive-test-fail", false, true)
{
}
void extra_settings(TestEnvironment & env)
{
- env.set_want_choice_enabled(ChoicePrefixName("build_options"), UnprefixedChoiceName("slow_tests"), true);
+ env.set_want_choice_enabled(ChoicePrefixName("build_options"), UnprefixedChoiceName("expensive_tests"), true);
}
} test_fail_enabled;
}
diff --git a/paludis/repositories/e/e_repository_TEST_phases_setup.sh b/paludis/repositories/e/e_repository_TEST_phases_setup.sh
index 7c0de76..12f622e 100755
--- a/paludis/repositories/e/e_repository_TEST_phases_setup.sh
+++ b/paludis/repositories/e/e_repository_TEST_phases_setup.sh
@@ -29,8 +29,8 @@ LINGUAS="en en_GB en_GB@UTF-8"
USERLAND="GNU"
OPTIONS="weasel spinach"
END
-mkdir -p "packages/cat/no-slow-test"
-cat <<'END' > packages/cat/no-slow-test/no-slow-test-1.0.exheres-0 || exit 1
+mkdir -p "packages/cat/no-expensive-test"
+cat <<'END' > packages/cat/no-expensive-test/no-expensive-test-1.0.exheres-0 || exit 1
DESCRIPTION="foo"
SUMMARY="foo"
HOMEPAGE="http://example.com/"
@@ -40,8 +40,8 @@ MYOPTIONS="spork"
LICENCES="GPL-2"
PLATFORMS="test"
END
-mkdir -p "packages/cat/slow-test"
-cat <<'END' > packages/cat/slow-test/slow-test-1.0.exheres-0 || exit 1
+mkdir -p "packages/cat/expensive-test"
+cat <<'END' > packages/cat/expensive-test/expensive-test-1.0.exheres-0 || exit 1
DESCRIPTION="foo"
SUMMARY="foo"
HOMEPAGE="http://example.com/"
@@ -51,12 +51,12 @@ MYOPTIONS="spork"
LICENCES="GPL-2"
PLATFORMS="test"
-src_test_slow() {
+src_test_expensive() {
true
}
END
-mkdir -p "packages/cat/slow-test-fail"
-cat <<'END' > packages/cat/slow-test-fail/slow-test-fail-1.0.exheres-0 || exit 1
+mkdir -p "packages/cat/expensive-test-fail"
+cat <<'END' > packages/cat/expensive-test-fail/expensive-test-fail-1.0.exheres-0 || exit 1
DESCRIPTION="foo"
SUMMARY="foo"
HOMEPAGE="http://example.com/"
@@ -66,7 +66,7 @@ MYOPTIONS="spork"
LICENCES="GPL-2"
PLATFORMS="test"
-src_test_slow() {
+src_test_expensive() {
die
}
END
diff --git a/paludis/repositories/e/eapi.cc b/paludis/repositories/e/eapi.cc
index 8a78e8a..2d0080c 100644
--- a/paludis/repositories/e/eapi.cc
+++ b/paludis/repositories/e/eapi.cc
@@ -238,9 +238,9 @@ namespace
{
return make_shared_ptr(new EAPIChoicesOptions(make_named_values<EAPIChoicesOptions>(
value_for<n::fancy_test_flag>(check_get(k, "fancy_test_flag")),
+ value_for<n::has_expensive_tests>(destringify_key<bool>(k, "has_expensive_tests")),
value_for<n::has_optional_tests>(destringify_key<bool>(k, "has_optional_tests")),
value_for<n::has_recommended_tests>(destringify_key<bool>(k, "has_recommended_tests")),
- value_for<n::has_slow_tests>(destringify_key<bool>(k, "has_slow_tests")),
value_for<n::use_expand_separator>(destringify_key<char>(k, "use_expand_separator"))
)));
}
diff --git a/paludis/repositories/e/eapi.hh b/paludis/repositories/e/eapi.hh
index d26e979..e9452fc 100644
--- a/paludis/repositories/e/eapi.hh
+++ b/paludis/repositories/e/eapi.hh
@@ -103,9 +103,9 @@ namespace paludis
struct failure_is_fatal;
struct fancy_test_flag;
struct flat_list_index;
+ struct has_expensive_tests;
struct has_optional_tests;
struct has_recommended_tests;
- struct has_slow_tests;
struct homepage;
struct ignore_pivot_env_functions;
struct ignore_pivot_env_variables;
@@ -265,9 +265,9 @@ namespace paludis
struct EAPIChoicesOptions
{
NamedValue<n::fancy_test_flag, std::string> fancy_test_flag;
+ NamedValue<n::has_expensive_tests, bool> has_expensive_tests;
NamedValue<n::has_optional_tests, bool> has_optional_tests;
NamedValue<n::has_recommended_tests, bool> has_recommended_tests;
- NamedValue<n::has_slow_tests, bool> has_slow_tests;
NamedValue<n::use_expand_separator, char> use_expand_separator;
};
diff --git a/paludis/repositories/e/eapis/0.conf b/paludis/repositories/e/eapis/0.conf
index 21c7878..3f17d5b 100644
--- a/paludis/repositories/e/eapis/0.conf
+++ b/paludis/repositories/e/eapis/0.conf
@@ -25,7 +25,7 @@ userpriv_cannot_use_root = false
has_optional_tests = true
has_recommended_tests = false
-has_slow_tests = false
+has_expensive_tests = false
fancy_test_flag = test
vdb_from_env_variables = \
diff --git a/paludis/repositories/e/eapis/exheres-0.conf b/paludis/repositories/e/eapis/exheres-0.conf
index 0838c5c..03a2a94 100644
--- a/paludis/repositories/e/eapis/exheres-0.conf
+++ b/paludis/repositories/e/eapis/exheres-0.conf
@@ -29,7 +29,7 @@ ignore_pivot_env_variables =
userpriv_cannot_use_root = true
has_optional_tests = false
has_recommended_tests = true
-has_slow_tests = true
+has_expensive_tests = true
vdb_from_env_variables = \
CATEGORY CHOST DEPENDENCIES SUMMARY EAPI \
@@ -114,7 +114,7 @@ ebuild_functions = \
builtin_saveenv builtin_tidyup builtin_variable \
pkg_config pkg_info pkg_nofetch pkg_postinst pkg_postrm \
pkg_preinst pkg_prerm pkg_pretend pkg_setup pkg_bad_options \
- src_compile src_configure src_install src_prepare src_test src_test_slow src_unpack
+ src_compile src_configure src_install src_prepare src_test src_test_expensive src_unpack
ebuild_install = \
skipname=killold : killold ; \
@@ -125,7 +125,7 @@ ebuild_install = \
skipname=configure skipifno=*sources,unpack,prepare,configure sandbox userpriv clearenv : loadenv configure saveenv ; \
skipname=compile skipifno=*sources,unpack,prepare,configure,compile sandbox userpriv clearenv : loadenv compile saveenv ; \
skipname=test skipifno=*sources,unpack,prepare,configure,compile,test sandbox userpriv clearenv recommended_tests : loadenv test saveenv ; \
- skipname=test_slow skipifno=*sources,unpack,prepare,configure,compile,test_slow sandbox userpriv clearenv slow_tests : loadenv test_slow saveenv ; \
+ skipname=test_expensive skipifno=*sources,unpack,prepare,configure,compile,test_expensive sandbox userpriv clearenv expensive_tests : loadenv test_expensive saveenv ; \
skipname=install skipifno=*sources,unpack,prepare,configure,compile,test,install sandbox clearenv : loadenv install saveenv ; \
skipname=strip strip : ; \
skipname=preinst skipifno=preinst sandbox clearenv prepost : loadenv preinst saveenv ; \
diff --git a/paludis/repositories/e/eapis/paludis-1.conf b/paludis/repositories/e/eapis/paludis-1.conf
index c2a13e1..8d2bd2d 100644
--- a/paludis/repositories/e/eapis/paludis-1.conf
+++ b/paludis/repositories/e/eapis/paludis-1.conf
@@ -26,7 +26,7 @@ ignore_pivot_env_functions =
userpriv_cannot_use_root = false
has_optional_tests = false
has_recommended_tests = true
-has_slow_tests = false
+has_expensive_tests = false
no_s_workdir_fallback = false
vdb_from_env_variables = \
diff --git a/paludis/repositories/e/ebuild/exheres-0/Makefile.am b/paludis/repositories/e/ebuild/exheres-0/Makefile.am
index c22f0d3..a4084d9 100644
--- a/paludis/repositories/e/ebuild/exheres-0/Makefile.am
+++ b/paludis/repositories/e/ebuild/exheres-0/Makefile.am
@@ -38,7 +38,7 @@ libexecprogexheres_SCRIPTS = \
src_configure.bash \
src_install.bash \
src_test.bash \
- src_test_slow.bash \
+ src_test_expensive.bash \
src_prepare.bash \
src_unpack.bash
diff --git a/paludis/repositories/e/ebuild/exheres-0/src_test_slow.bash b/paludis/repositories/e/ebuild/exheres-0/src_test_expensive.bash
index e68c3fb..4144715 100644
--- a/paludis/repositories/e/ebuild/exheres-0/src_test_slow.bash
+++ b/paludis/repositories/e/ebuild/exheres-0/src_test_expensive.bash
@@ -20,17 +20,17 @@
# this program; if not, write to the Free Software Foundation, Inc., 59 Temple
# Place, Suite 330, Boston, MA 02111-1307 USA
-default_src_test_slow()
+default_src_test_expensive()
{
:
}
-src_test_slow()
+src_test_expensive()
{
default "$@"
}
-exheres_internal_test_slow()
+exheres_internal_test_expensive()
{
local old_sandbox_predict="${SANDBOX_PREDICT}"
[[ -z "${PALUDIS_DO_NOTHING_SANDBOXY}" ]] && SANDBOX_PREDICT="${SANDBOX_PREDICT+${SANDBOX_PREDICT}:}/"
@@ -43,12 +43,12 @@ exheres_internal_test_slow()
cd "${WORKBASE}" || die "cd to \${WORKBASE} (\"${WORKBASE}\") failed"
fi
- if hasq "test_slow" ${SKIP_FUNCTIONS} ; then
- ebuild_section "Skipping src_test_slow (SKIP_FUNCTIONS)"
+ if hasq "test_expensive" ${SKIP_FUNCTIONS} ; then
+ ebuild_section "Skipping src_test_expensive (SKIP_FUNCTIONS)"
else
- ebuild_section "Starting src_test_slow"
- src_test_slow
- ebuild_section "Done src_test_slow"
+ ebuild_section "Starting src_test_expensive"
+ src_test_expensive
+ ebuild_section "Done src_test_expensive"
fi
export PALUDIS_EXTRA_DIE_MESSAGE="${save_PALUDIS_EXTRA_DIE_MESSAGE}"
diff --git a/paludis/repositories/e/ebuild_entries.cc b/paludis/repositories/e/ebuild_entries.cc
index 5a28504..bda1732 100644
--- a/paludis/repositories/e/ebuild_entries.cc
+++ b/paludis/repositories/e/ebuild_entries.cc
@@ -770,10 +770,10 @@ EbuildEntries::install(const std::tr1::shared_ptr<const ERepositoryID> & id,
if (choice && ! choice->enabled())
continue;
}
- else if (phase->option("slow_tests"))
+ else if (phase->option("expensive_tests"))
{
std::tr1::shared_ptr<const ChoiceValue> choice(id->choices_key()->value()->find_by_name_with_prefix(
- ELikeSlowTestsChoiceValue::canonical_name_with_prefix()));
+ ELikeExpensiveTestsChoiceValue::canonical_name_with_prefix()));
if (choice && ! choice->enabled())
continue;
}
diff --git a/paludis/repositories/e/ebuild_id.cc b/paludis/repositories/e/ebuild_id.cc
index 1a3fa0a..19aea57 100644
--- a/paludis/repositories/e/ebuild_id.cc
+++ b/paludis/repositories/e/ebuild_id.cc
@@ -1339,29 +1339,29 @@ EbuildID::add_build_options(const std::tr1::shared_ptr<Choices> & choices) const
if (may_be_unrestricted_test)
build_options->add(make_shared_ptr(new ELikeRecommendedTestsChoiceValue(shared_from_this(), _imp->environment, build_options)));
- /* slow_tests */
- if (eapi()->supported()->choices_options()->has_slow_tests())
+ /* expensive_tests */
+ if (eapi()->supported()->choices_options()->has_expensive_tests())
{
if (! _imp->defined_phases)
throw InternalError(PALUDIS_HERE, "bug! no defined_phases yet");
- bool has_slow_test_phase(false);
+ bool has_expensive_test_phase(false);
EAPIPhases phases(_imp->eapi->supported()->ebuild_phases()->ebuild_install());
for (EAPIPhases::ConstIterator phase(phases.begin_phases()), phase_end(phases.end_phases()) ;
phase != phase_end ; ++phase)
{
- if (phase->option("slow_tests"))
+ if (phase->option("expensive_tests"))
{
if (_imp->defined_phases->value()->end() != _imp->defined_phases->value()->find(phase->equal_option("skipname")))
{
- has_slow_test_phase = true;
+ has_expensive_test_phase = true;
break;
}
}
}
- if (has_slow_test_phase)
- build_options->add(make_shared_ptr(new ELikeSlowTestsChoiceValue(shared_from_this(), _imp->environment, build_options)));
+ if (has_expensive_test_phase)
+ build_options->add(make_shared_ptr(new ELikeExpensiveTestsChoiceValue(shared_from_this(), _imp->environment, build_options)));
}
/* split, strip */