Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix py errors #7620

Closed
wants to merge 2 commits into from
Closed

Fix py errors #7620

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
6572199
tools: cleanup no-build and build-only options
thefourtheye Jul 8, 2016
6060be1
tools: fix broken format string
thefourtheye Jul 8, 2016
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion tools/icu/shrink-icu-src.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@
shutil.rmtree(options.icusmall)

if not os.path.isdir(options.icusrc):
print 'Missing source ICU dir --icusrc=%' % (options.icusrc)
print 'Missing source ICU dir --icusrc=%s' % (options.icusrc)
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

oops - missed this. thanks! +1

sys.exit(1)


Expand Down
38 changes: 0 additions & 38 deletions tools/test.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -696,15 +696,6 @@ def Execute(args, context, timeout=None, env={}, faketty=False):
return CommandOutput(exit_code, timed_out, output, errors)


def ExecuteNoCapture(args, context, timeout=None):
(process, exit_code, timed_out) = RunProcess(
context,
timeout,
args = args,
)
return CommandOutput(exit_code, False, "", "")


def CarCdr(path):
if len(path) == 0:
return (None, [ ])
Expand Down Expand Up @@ -878,14 +869,6 @@ def RunTestCases(cases_to_run, progress, tasks, flaky_tests_mode):
return progress.Run(tasks)


def BuildRequirements(context, requirements, mode, scons_flags):
command_line = (['scons', '-Y', context.workspace, 'mode=' + ",".join(mode)]
+ requirements
+ scons_flags)
output = ExecuteNoCapture(command_line, context)
return output.exit_code == 0


# -------------------------------------------
# --- T e s t C o n f i g u r a t i o n ---
# -------------------------------------------
Expand Down Expand Up @@ -1323,15 +1306,9 @@ def BuildOptions():
default=False, action="store_true")
result.add_option('--logfile', dest='logfile',
help='write test output to file. NOTE: this only applies the tap progress indicator')
result.add_option("-S", dest="scons_flags", help="Flag to pass through to scons",
default=[], action="append")
result.add_option("-p", "--progress",
help="The style of progress indicator (verbose, dots, color, mono, tap)",
choices=PROGRESS_INDICATORS.keys(), default="mono")
result.add_option("--no-build", help="Don't build requirements",
default=True, action="store_true")
result.add_option("--build-only", help="Only build requirements, don't run the tests",
default=False, action="store_true")
result.add_option("--report", help="Print a summary of the tests to be run",
default=False, action="store_true")
result.add_option("-s", "--suite", help="A test suite",
Expand Down Expand Up @@ -1548,21 +1525,6 @@ def Main():
options.suppress_dialogs,
options.store_unexpected_output,
options.repeat)
# First build the required targets
if not options.no_build:
reqs = [ ]
for path in paths:
reqs += root.GetBuildRequirements(path, context)
reqs = list(set(reqs))
if len(reqs) > 0:
if options.j != 1:
options.scons_flags += ['-j', str(options.j)]
if not BuildRequirements(context, reqs, options.mode, options.scons_flags):
return 1

# Just return if we are only building the targets for running the tests.
if options.build_only:
return 0

# Get status for tests
sections = [ ]
Expand Down