1346063 - Re-checkout test262/local when updating test262

Status: RESOLVED FIXED

(Core :: JavaScript Engine, enhancement)

Description

[Shu-yu Guo [:shu]]

We're going to work with Bocoup to improve the keeping local + upstreaming of test262 tests. Until then, I'm sticking things into test262/local. The update script recreates the entire directory from scratch. Make it re-checkout local/ after recreating.

Comment 1

[Shu-yu Guo [:shu]]

Attachment: Re-checkout test262/local after updating test262.

Comment 2

[André Bargull [:anba]]

I haven't actually merged the patch locally to test this, but it seems like this approach only works when git is used for the local mozilla tree. I think you need to move the "local" directory to a temp-location and move it back after the test262 update. Or alternatively detect when mercurial is used to work with the mozilla tree.

Comment 3

[Shu-yu Guo [:shu]]

(In reply to André Bargull from comment #2)
> I haven't actually merged the patch locally to test this, but it seems like
> this approach only works when git is used for the local mozilla tree. I
> think you need to move the "local" directory to a temp-location and move it
> back after the test262 update. Or alternatively detect when mercurial is
> used to work with the mozilla tree.

Oh derp, that probably the majority of people do not use git for m-c escaped me.

Comment 4

[Shu-yu Guo [:shu]]

Attachment: Don't remove test262/local when updating test262.

Also snuck in a SAB feature test skip-if in there, was too lazy to open a new bug.

Comment 5

[André Bargull [:anba]]

Comment on attachment 8846128 [details] [diff] [review]
Don't remove test262/local when updating test262.

Review of attachment 8846128 [details] [diff] [review]:
-----------------------------------------------------------------

::: js/src/tests/test262-update.py
@@ +388,5 @@
>          # Copy the test files.
>          process_test262(inDir, outDir, strictTests)
>  
> +        # Move test262/local back.
> +        shutil.move(os.path.join(inDir, "local"), outDir)

If |os.path.isdir(localTestsOutDir)| is false, "local" doesn't get moved to |inDir|. Does shutil.move ignore non-existent files or will this line throw an exception in that case?

Comment 6

[Shu-yu Guo [:shu]]

(In reply to André Bargull from comment #5)
> Comment on attachment 8846128 [details] [diff] [review]
> Don't remove test262/local when updating test262.
> 
> Review of attachment 8846128 [details] [diff] [review]:
> -----------------------------------------------------------------
> 
> ::: js/src/tests/test262-update.py
> @@ +388,5 @@
> >          # Copy the test files.
> >          process_test262(inDir, outDir, strictTests)
> >  
> > +        # Move test262/local back.
> > +        shutil.move(os.path.join(inDir, "local"), outDir)
> 
> If |os.path.isdir(localTestsOutDir)| is false, "local" doesn't get moved to
> |inDir|. Does shutil.move ignore non-existent files or will this line throw
> an exception in that case?

Good catch, I'll make it only move back if the script moved it in the first place.

Comment 7

[Pulsebot]

Pushed by [e-mail]:
https://hg.mozilla.org/integration/mozilla-inbound/rev/8043a5044362
Don't remove test262/local when updating test262. (r=anba)

Comment 8

[Carsten Book [:Tomcat]]

https://hg.mozilla.org/mozilla-central/rev/8043a5044362