diff options
| author | Rene Rivera <grafikrobot@gmail.com> | 2013-12-29 13:42:00 -0600 |
|---|---|---|
| committer | Rene Rivera <grafikrobot@gmail.com> | 2013-12-29 13:42:00 -0600 |
| commit | 22b77f96c1189675857f2c210a7492c956596aa9 (patch) | |
| tree | 7a84e2b1610737c7b2c4440fc13cd2c3505dd692 | |
| parent | c8b6560f38b71223a63ac3ebefd2407554c5eda7 (diff) | |
| download | boost-22b77f96c1189675857f2c210a7492c956596aa9.tar.gz | |
Full round of bare testing with git working. Support scripts and tools
now come from develop branch only.
| -rw-r--r-- | tools/regression/src/regression.py | 4 | ||||
| -rwxr-xr-x[-rw-r--r--] | tools/regression/src/run.py | 2 |
2 files changed, 4 insertions, 2 deletions
diff --git a/tools/regression/src/regression.py b/tools/regression/src/regression.py index 25543e0276..2b77a6ed7c 100644 --- a/tools/regression/src/regression.py +++ b/tools/regression/src/regression.py @@ -56,6 +56,8 @@ git_info = { git_branch = { 'trunk' : 'develop', 'release' : 'master', + 'develop' : 'develop', + 'master' : 'master', } class runner: @@ -275,7 +277,7 @@ class runner: if self.use_git: self.git_checkout( git_info['build'], - git_branch[self.tag]) + 'develop') elif self.user and self.user != '': os.chdir( os.path.dirname(self.tools_bb_root) ) self.svn_command( 'co %s %s' % ( diff --git a/tools/regression/src/run.py b/tools/regression/src/run.py index fd3f988227..ac32fd4949 100644..100755 --- a/tools/regression/src/run.py +++ b/tools/regression/src/run.py @@ -39,7 +39,7 @@ script_local = os.path.join(root,'tools','regression','src') if use_local: script_remote = 'file://'+os.path.abspath(os.path.dirname(os.path.realpath(__file__))) elif use_git: - script_remote = 'https://raw.github.com/boostorg/boost/master/tools/regression/src' + script_remote = 'https://raw.github.com/boostorg/boost/develop/tools/regression/src' else: script_remote = 'http://svn.boost.org/svn/boost/trunk/tools/regression/src' script_dir = os.path.join(root,'tools_regression_src') |