diff options
| author | maruel@chromium.org <maruel@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-07-06 12:02:16 +0000 |
|---|---|---|
| committer | maruel@chromium.org <maruel@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-07-06 12:02:16 +0000 |
| commit | 3919f5403f926c501b6802214340f4f7b7872e56 (patch) | |
| tree | b2989de7fc54062a2c60c964f66d541e2b3bb9e0 /tools | |
| parent | aed7cc50c94d0ff0569b60b13f98583ae04b70d6 (diff) | |
| download | chromium_src-3919f5403f926c501b6802214340f4f7b7872e56.zip chromium_src-3919f5403f926c501b6802214340f4f7b7872e56.tar.gz chromium_src-3919f5403f926c501b6802214340f4f7b7872e56.tar.bz2 | |
Fix isolate_file variable more consistently in isolate.py.
Otherwise using -i foo.ISOLATE would have failed.
TBR=cmp@chromium.org
NOTRY=true
BUG=
TEST=
Review URL: https://chromiumcodereview.appspot.com/10735014
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@145583 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'tools')
| -rwxr-xr-x | tools/isolate/isolate.py | 14 | ||||
| -rwxr-xr-x | tools/isolate/isolate_test.py | 4 |
2 files changed, 13 insertions, 5 deletions
diff --git a/tools/isolate/isolate.py b/tools/isolate/isolate.py index 4da99b4..13e5a6f 100755 --- a/tools/isolate/isolate.py +++ b/tools/isolate/isolate.py @@ -422,9 +422,16 @@ class SavedState(Flattenable): def update(self, isolate_file, variables): """Updates the saved state with new information.""" - self.isolate_file = trace_inputs.get_native_path_case(isolate_file) + self.isolate_file = isolate_file self.variables.update(variables) + @classmethod + def load(cls, data): + out = super(SavedState, cls).load(data) + if out.isolate_file: + out.isolate_file = trace_inputs.get_native_path_case(out.isolate_file) + return out + def __str__(self): out = '%s(\n' % self.__class__.__name__ out += ' isolate_file: %s\n' % self.isolate_file @@ -923,8 +930,9 @@ class OptionParserIsolate(OptionParserWithLogging): options.result = os.path.abspath(options.result.replace('/', os.path.sep)) if options.isolate: - options.isolate = os.path.abspath( - options.isolate.replace('/', os.path.sep)) + options.isolate = trace_inputs.get_native_path_case( + os.path.abspath( + options.isolate.replace('/', os.path.sep))) if options.outdir: options.outdir = os.path.abspath( diff --git a/tools/isolate/isolate_test.py b/tools/isolate/isolate_test.py index 74865b0..fa089a5 100755 --- a/tools/isolate/isolate_test.py +++ b/tools/isolate/isolate_test.py @@ -78,11 +78,11 @@ class Isolate(unittest.TestCase): def test_savedstate_load(self): values = { - 'isolate_file': 'maybe', + 'isolate_file': os.path.join(ROOT_DIR, 'maybe'), 'variables': {'foo': 42}, } expected = { - 'isolate_file': 'maybe', + 'isolate_file': os.path.join(ROOT_DIR, 'maybe'), 'variables': {'foo': 42}, } self.assertEquals(expected, isolate.SavedState.load(values).flatten()) |