Bug 36417 – fix dangling references to chromium directories and baseline paths

• Status: RESOLVED
• Resolution: FIXED
• Component: Tools / Tests

[Dirk Pranke]

There are a few spots in the layout test infrastructure that still refer to downstream directories that are now obsolete. Remove those. 

Note that the overrides path is *not* one of them.

[Dirk Pranke]

Created attachment 51227 [details]
Patch

[Dimitri Glazkov (Google)]

Comment on attachment 51227 [details]
Patch

excellent!

Should we also get rid of _chromium_baseline_path?

[Dirk Pranke]

(In reply to comment #2)
> (From update of attachment 51227 [details])
> excellent!
> 
> Should we also get rid of _chromium_baseline_path?

Eventually, but I don't want to get rid of it just yet.

I also don't want to commit this until we get a chance to discuss 

http://trac.webkit.org/changeset/56307

It looks like you made a similar change to fix the rebaselining tool, but I don't understand why it would've fixed your crash.

[Dirk Pranke]

Created attachment 51355 [details]
Patch

[Dimitri Glazkov (Google)]

Comment on attachment 51355 [details]
Patch

yay!

[Dirk Pranke]

(In reply to comment #3)
> I also don't want to commit this until we get a chance to discuss 
> 
> http://trac.webkit.org/changeset/56307
> 
> It looks like you made a similar change to fix the rebaselining tool, but I
> don't understand why it would've fixed your crash.

Okay, it turns out that when we tried to determine the chrome base directory,
if we didn't find it, the code would return a full file path to chromium.py
instead of erroring out. The revised patch will instead raise
an error in this case.

I've also added some better path handling to rebaseline-chromium-webkit-tests
so it would work if simplejson wasn't in the PYTHONPATH by default.

Ojan, Victor, can you take a look at this and make sure it looks okay?

[Victor Wang]

LGTM

(In reply to comment #6)
> (In reply to comment #3)
> > I also don't want to commit this until we get a chance to discuss 
> > 
> > http://trac.webkit.org/changeset/56307
> > 
> > It looks like you made a similar change to fix the rebaselining tool, but I
> > don't understand why it would've fixed your crash.
> 
> Okay, it turns out that when we tried to determine the chrome base directory,
> if we didn't find it, the code would return a full file path to chromium.py
> instead of erroring out. The revised patch will instead raise
> an error in this case.
> 
> I've also added some better path handling to rebaseline-chromium-webkit-tests
> so it would work if simplejson wasn't in the PYTHONPATH by default.
> 
> Ojan, Victor, can you take a look at this and make sure it looks okay?

[Dirk Pranke]

Comment on attachment 51355 [details]
Patch

Clearing flags on attachment: 51355

Committed r56366: <http://trac.webkit.org/changeset/56366>

[Dirk Pranke]

All reviewed patches have been landed.  Closing bug.