From: Zac Medico Date: Thu, 25 Jul 2013 20:37:23 +0000 (-0700) Subject: test_doebuild_fd_pipes: bsd compat X-Git-Tag: v2.2.0_alpha189~5 X-Git-Url: http://git.tremily.us/gitweb.cgi?a=commitdiff_plain;h=3283b779608f35982792f95b9d8415a892dfb346;p=portage.git test_doebuild_fd_pipes: bsd compat --- diff --git a/pym/portage/tests/ebuild/test_doebuild_fd_pipes.py b/pym/portage/tests/ebuild/test_doebuild_fd_pipes.py index 91c5bd649..61392dd54 100644 --- a/pym/portage/tests/ebuild/test_doebuild_fd_pipes.py +++ b/pym/portage/tests/ebuild/test_doebuild_fd_pipes.py @@ -52,6 +52,14 @@ class DoebuildFdPipesTestCase(TestCase): } } + # Override things that may be unavailable, or may have portability + # issues when running tests in exotic environments. + # prepstrip - bug #447810 (bash read builtin EINTR problem) + true_symlinks = ("find", "prepstrip", "sed", "scanelf") + true_binary = portage.process.find_binary("true") + self.assertEqual(true_binary is None, False, + "true command not found") + playground = ResolverPlayground(ebuilds=ebuilds) try: QueryCommand._db = playground.trees @@ -68,6 +76,14 @@ class DoebuildFdPipesTestCase(TestCase): settings['PORTAGE_PYTHON'] = portage._python_interpreter settings['PORTAGE_QUIET'] = "1" + fake_bin = os.path.join(settings["EPREFIX"], "bin") + portage.util.ensure_dirs(fake_bin) + for x in true_symlinks: + os.symlink(true_binary, os.path.join(fake_bin, x)) + + settings["__PORTAGE_TEST_PATH_OVERRIDE"] = fake_bin + settings.backup_changes("__PORTAGE_TEST_PATH_OVERRIDE") + cpv = 'app-misct/foo-1' metadata = dict(zip(Package.metadata_keys, portdb.aux_get(cpv, Package.metadata_keys)))