diff options
| author |  Bo Ørsted Andresen <bo.andresen@zlin.dk>
| 2010-10-21 09:51:03 +0000 |
|---|---|---|
| committer |  Bo Ørsted Andresen <zlin@exherbo.org>
| 2010-11-12 19:55:02 +0000 |
| commit | 8028ac94fa53ad82757c017a3f94d218f33f9057 (patch) | |
| tree | 1435da57a129dfc59074aa3a46afd5cba3965ed2 | |
| parent | 7123cc1484e653234ffcd95a0b9ef918bb800223 (diff) | |
| download | paludis-8028ac94fa53ad82757c017a3f94d218f33f9057.tar.gz paludis-8028ac94fa53ad82757c017a3f94d218f33f9057.tar.xz | |
Fix dot and plus exlibs tests.
| -rw-r--r-- | paludis/repositories/e/e_repository_TEST_exlibs.cc | 4 | ||||
| -rw-r--r-- | paludis/repositories/e/ebuild/exheres-0/exlib_functions.bash | 4 |
2 files changed, 5 insertions, 3 deletions
diff --git a/paludis/repositories/e/e_repository_TEST_exlibs.cc b/paludis/repositories/e/e_repository_TEST_exlibs.cc index 9c6bb898d..dc889d0e4 100644 --- a/paludis/repositories/e/e_repository_TEST_exlibs.cc +++ b/paludis/repositories/e/e_repository_TEST_exlibs.cc @@ -200,8 +200,8 @@ namespace test_cases ExlibsTest test_noarray_bad("noarray-bad", unsupported); ExlibsTest test_scalar_required("scalar-required", unsupported); ExlibsTest test_array_required("array-required", unsupported); - ExlibsTest test_exlib_dot_with_exparam("exlib-dot-with-exparam", unsupported); - ExlibsTest test_exlib_plus_with_exparam("exlib-plus-with-exparam", unsupported); + ExlibsTest test_exlib_dot_with_exparam("exlib-dot-with-exparam", success); + ExlibsTest test_exlib_plus_with_exparam("exlib-plus-with-exparam", success); ExlibsTest test_illegal_in_global_scope("illegal-in-global-scope", unsupported); ExlibsTest test_illegal_in_global_scope_in_func("illegal-in-global-scope-in-func", success); ExlibsTest test_called_cross_phase("called-cross-phase", throws_InstallActionError); diff --git a/paludis/repositories/e/ebuild/exheres-0/exlib_functions.bash b/paludis/repositories/e/ebuild/exheres-0/exlib_functions.bash index ef05b9daa..25119134d 100644 --- a/paludis/repositories/e/ebuild/exheres-0/exlib_functions.bash +++ b/paludis/repositories/e/ebuild/exheres-0/exlib_functions.bash @@ -130,7 +130,9 @@ myexparam() fi fi - ${bool} && ! has "${!v}" true false && die "exparam ${1%%=*} for exlib ${CURRENT_EXLIB} must be 'true' or 'false'" + if ${bool} && ! has "${!v}" true false; then + die "exparam ${1%%=*} for ${CURRENT_EXLIB}.exlib must be 'true' or 'false'" + fi } require() |