tools/bots/functional_testing.py - Issue 423483002: Fix merge problems in r38573, a cleanup of build scripts.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: tools/bots/functional_testing.py

Issue 423483002: Fix merge problems in r38573, a cleanup of build scripts. (Closed) Base URL: https://dart.googlecode.com/svn/branches/bleeding_edge/dart

Patch Set: Created 6 years, 5 months ago

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Jump to:

View side-by-side diff with in-line comments

Download patch

Index: tools/bots/functional_testing.py

diff --git a/tools/bots/functional_testing.py b/tools/bots/functional_testing.py

index 80756f65005ae8c1e153c56fcbb069e932b35a64..327281fe3035099e51fb9f287888a442f3c78816 100644

--- a/tools/bots/functional_testing.py

+++ b/tools/bots/functional_testing.py

@@ -78,7 +78,7 @@ def FTMaster(config):

return

else:

builddir = os.path.join(bot_utils.DART_DIR,

- utils.GetBuildDir(HOST_OS, HOST_OS),

+ utils.GetBuildDir(HOST_OS),

'functional_testing')

shutil.rmtree(builddir, ignore_errors=True)

os.makedirs(builddir)

@@ -90,6 +90,6 @@ def FTSteps(config):

FTMaster(config)

else:

FTSlave(config)

if __name__ == '__main__':

bot.RunBot(SrcConfig, FTSteps, build_step=None)

« no previous file with comments | « no previous file | tools/bots/linux_distribution_support.py » ('j') | no next file with comments »