summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndrew Tridgell <tridge@samba.org>2010-11-18 15:27:45 +1100
committerAndrew Tridgell <tridge@samba.org>2010-11-18 23:12:26 +0100
commit27c3bc8c013a75f6b437a2e47b10ec4fb6a2920b (patch)
tree313ec90f64e337f715e8c4a1fce740194b3a917e
parent498f3c8e5fb64e566ee783893c9e0663add3b25f (diff)
downloadsamba-27c3bc8c013a75f6b437a2e47b10ec4fb6a2920b.tar.gz
samba-27c3bc8c013a75f6b437a2e47b10ec4fb6a2920b.tar.bz2
samba-27c3bc8c013a75f6b437a2e47b10ec4fb6a2920b.zip
s4-test: added --rebase and --clean options
-rwxr-xr-xsource4/scripting/devel/wintest/test-howto.py14
1 files changed, 13 insertions, 1 deletions
diff --git a/source4/scripting/devel/wintest/test-howto.py b/source4/scripting/devel/wintest/test-howto.py
index d587529ea0..ad93ef642b 100755
--- a/source4/scripting/devel/wintest/test-howto.py
+++ b/source4/scripting/devel/wintest/test-howto.py
@@ -560,6 +560,8 @@ if __name__ == '__main__':
parser.add_option("--conf", type='string', default='', help='config file')
parser.add_option("--skip", type='string', default='', help='list of steps to skip (comma separated)')
parser.add_option("--list", action='store_true', default=False, help='list the available steps')
+ parser.add_option("--rebase", action='store_true', default=False, help='do a git pull --rebase')
+ parser.add_option("--clean", action='store_true', default=False, help='clean the tree')
opts, args = parser.parse_args()
@@ -572,5 +574,15 @@ if __name__ == '__main__':
t.set_skip(opts.skip)
if opts.list:
t.list_steps_mode()
- test_howto(t)
+ if opts.rebase:
+ t.info('rebasing')
+ t.chdir('${SOURCETREE}')
+ t.run_cmd('git pull --rebase')
+
+ if opts.clean:
+ t.info('rebasing')
+ t.chdir('${SOURCETREE}/source4')
+ t.run_cmd('rm -rf bin')
+
+ test_howto(t)