/brz/remove-bazaar

To get this branch, use:
bzr branch http://gegoxaren.bato24.eu/bzr/brz/remove-bazaar

« back to all changes in this revision

Viewing changes to bzrlib/tests/test_setup.py

  • Committer: Canonical.com Patch Queue Manager
  • Date: 2010-11-04 17:22:34 UTC
  • mfrom: (5519.3.1 setup.py-root)
  • Revision ID: pqm@pqm.ubuntu.com-20101104172234-6yoirc0trqsgcj8m
(jameinel) Run setup.py with --root rather than with --prefix. (Jelmer
 Vernooij)

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/test_setup.py
55
55
            raise TestSkipped('You must have distutils installed to run this test.'
56
56
                              ' Usually this can be found by installing "python-dev"')
57
57
        self.log('test_build running in %s' % os.getcwd())
58
 
        install_dir = osutils.mkdtemp()
 
58
        root_dir = osutils.mkdtemp()
59
59
        # setup.py must be run from the root source directory, but the tests
60
60
        # are not necessarily invoked from there
61
61
        self.source_dir = os.path.dirname(os.path.dirname(bzrlib.__file__))
63
63
            self.run_setup(['clean'])
64
64
            # build is implied by install
65
65
            ## self.run_setup(['build'])
66
 
            self.run_setup(['install', '--prefix', install_dir])
 
66
            self.run_setup(['install', '--root', root_dir])
67
67
            self.run_setup(['clean'])
68
68
        finally:
69
 
            osutils.rmtree(install_dir)
 
69
            osutils.rmtree(root_dir)
70
70
 
71
71
    def run_setup(self, args):
72
72
        args = [sys.executable, './setup.py', ] + args