[test] Remove module pragma in favor of .mjs

d8 treats files with the .mjs extension as modules instead of
classic scripts. Thus, the `// MODULE` pragma and its corresponding
logic in test runners can be removed in favor of explicitly adding
the extension.

Bug: v8:7950, v8:9395, v8:9406
Also-By: tmrts@chromium.org
Change-Id: Ic74328dc5c5f176bb4bdf6d74bdd4d3966279ba5
Reviewed-on: https://chromium-review.googlesource.com/c/v8/v8/+/1675958
Commit-Queue: Mathias Bynens <mathias@chromium.org>
Reviewed-by: Tamer Tas <tmrts@chromium.org>
Auto-Submit: Mathias Bynens <mathias@chromium.org>
Cr-Commit-Position: refs/heads/master@{#62421}

test/debugger/debug/debug-modules-set-variable-value.js → test/debugger/debug/debug-modules-set-variable-value.mjs

 // Copyright 2016 the V8 project authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
-
-// MODULE
 // Flags: --no-always-opt --no-opt
 
 // The first part of this file is copied over from debug-set-variable-value.js
@@ -328,7 +326,7 @@ export let ham = 1;
 
 
 // Imported variable. Setting is currently not supported.
-import { salami as wurst } from "./debug-modules-set-variable-value.js";
+import { salami as wurst } from "./debug-modules-set-variable-value.mjs";
 {
   let exception;
   function listener(event, exec_state) {
@@ -350,7 +348,7 @@ import { salami as wurst } from "./debug-modules-set-variable-value.js";
 
 
 // Imported variable, nested access. Setting is currently not supported.
-import { salami as wurstl } from "./debug-modules-set-variable-value.js";
+import { salami as wurstl } from "./debug-modules-set-variable-value.mjs";
 {
   let exception;
   function listener(event, exec_state) {

test/debugger/debug/harmony/modules-debug-scopes1.js → test/debugger/debug/harmony/modules-debug-scopes1.mjs

 // Copyright 2016 the V8 project authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
-
-// MODULE
 // Flags: --allow-natives-syntax --noanalyze-environment-liveness
 
 // These tests are copied from mjsunit/debug-scopes.js and adapted for modules.

test/debugger/debug/harmony/modules-debug-scopes2.js → test/debugger/debug/harmony/modules-debug-scopes2.mjs

@@ -2,9 +2,6 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-// MODULE
-
-
 var Debug = debug.Debug;
 
 var test_name;
@@ -152,8 +149,8 @@ let local_let = 1;
 var local_var = 2;
 export let exported_let = 3;
 export var exported_var = 4;
-import {exported_let as imported_let} from "modules-debug-scopes2.js";
-import {exported_var as imported_var} from "modules-debug-scopes2.js";
+import {exported_let as imported_let} from "modules-debug-scopes2.mjs";
+import {exported_var as imported_var} from "modules-debug-scopes2.mjs";
 
 BeginTest();
 listener_delegate = function(exec_state) {

test/debugger/testcfg.py

@@ -9,7 +9,6 @@ from testrunner.local import testsuite
 from testrunner.objects import testcase
 
 FILES_PATTERN = re.compile(r"//\s+Files:(.*)")
-MODULE_PATTERN = re.compile(r"^// MODULE$", flags=re.MULTILINE)
 
 
 class TestLoader(testsuite.JSTestLoader):
@@ -51,9 +50,7 @@ class TestCase(testcase.D8TestCase):
     files.append(os.path.join(self.suite.root, "test-api.js"))
     files.extend([os.path.normpath(os.path.join(self.suite.root, '..', '..', f))
                   for f in files_list])
-    if MODULE_PATTERN.search(source):
-      files.append("--module")
-    files.append(os.path.join(self.suite.root, self.path + self._get_suffix()))
+    files.append(self._get_source_path())
     return files
 
   def _get_files_params(self):
@@ -69,7 +66,13 @@ class TestCase(testcase.D8TestCase):
     return ['--enable-inspector', '--allow-natives-syntax']
 
   def _get_source_path(self):
-    return os.path.join(self.suite.root, self.path + self._get_suffix())
+    base_path = os.path.join(self.suite.root, self.path)
+    # Try .js first, and fall back to .mjs.
+    # TODO(v8:9406): clean this up by never separating the path from
+    # the extension in the first place.
+    if os.path.exists(base_path + self._get_suffix()):
+      return base_path + self._get_suffix()
+    return base_path + '.mjs'
 
 
 def GetSuite(*args, **kwargs):

test/message/fail/class-fields-private-throw-in-module.js → test/message/fail/class-fields-private-throw-in-module.mjs

 // Copyright 2019 the V8 project authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
-//
-// MODULE
 
 class X {
   constructor() {

test/message/fail/class-fields-private-throw-in-module.out

-*%(basename)s:9: SyntaxError: Private field '#x' must be declared in an enclosing class
+*%(basename)s:7: SyntaxError: Private field '#x' must be declared in an enclosing class
     this.#x = 1;
         ^
 SyntaxError: Private field '#x' must be declared in an enclosing class
\ No newline at end of file

test/message/fail/export-duplicate-as.js → test/message/fail/export-duplicate-as.mjs

 // Copyright 2015 the V8 project authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
-//
-// MODULE
 
 var a, b, c;
 export { a as c };

test/message/fail/export-duplicate-as.out

 # Copyright 2015 the V8 project authors. All rights reserved.
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
-*%(basename)s:9: SyntaxError: Duplicate export of 'c'
+*%(basename)s:7: SyntaxError: Duplicate export of 'c'
 export { a, b as c, c, b };
                     ^
 SyntaxError: Duplicate export of 'c'

test/message/fail/export-duplicate-default.js → test/message/fail/export-duplicate-default.mjs

 // Copyright 2015 the V8 project authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
-//
-// MODULE
 
 export default function f() {};
 export default 42;

test/message/fail/export-duplicate-default.out

 # Copyright 2015 the V8 project authors. All rights reserved.
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
-*%(basename)s:9: SyntaxError: Duplicate export of 'default'
+*%(basename)s:7: SyntaxError: Duplicate export of 'default'
 export default class C {};
        ^^^^^^^
 SyntaxError: Duplicate export of 'default'

test/message/fail/export-duplicate.js → test/message/fail/export-duplicate.mjs

 // Copyright 2015 the V8 project authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
-//
-// MODULE
 
 var a, b, c;
 export { a };

test/message/fail/export-duplicate.out

 # Copyright 2015 the V8 project authors. All rights reserved.
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
-*%(basename)s:10: SyntaxError: Duplicate export of 'b'
+*%(basename)s:8: SyntaxError: Duplicate export of 'b'
 export { b, c };
          ^
 SyntaxError: Duplicate export of 'b'

test/message/fail/import-as-eval.js → test/message/fail/import-as-eval.mjs

 // Copyright 2015 the V8 project authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
-//
-// MODULE
 
 import { foo as eval } from "mod";

test/message/fail/import-as-eval.out

-# Copyright 2015 the V8 project authors. All rights reserved.
-# Use of this source code is governed by a BSD-style license that can be
-# found in the LICENSE file.
-*%(basename)s:7: SyntaxError: Unexpected eval or arguments in strict mode
+*%(basename)s:5: SyntaxError: Unexpected eval or arguments in strict mode
 import { foo as eval } from "mod";
                 ^^^^
 SyntaxError: Unexpected eval or arguments in strict mode

test/message/fail/import-as-redeclaration.js → test/message/fail/import-as-redeclaration.mjs

 // Copyright 2015 the V8 project authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
-//
-// MODULE
 
 let foo = 42;
 import { bar as foo } from "mod";

test/message/fail/import-as-redeclaration.out

-# Copyright 2015 the V8 project authors. All rights reserved.
-# Use of this source code is governed by a BSD-style license that can be
-# found in the LICENSE file.
-*%(basename)s:8: SyntaxError: Identifier 'foo' has already been declared
+*%(basename)s:6: SyntaxError: Identifier 'foo' has already been declared
 import { bar as foo } from "mod";
                 ^^^
 SyntaxError: Identifier 'foo' has already been declared

test/message/fail/import-as-reserved-word.js → test/message/fail/import-as-reserved-word.mjs

 // Copyright 2015 the V8 project authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
-//
-// MODULE
 
 import { foo as import } from "mod";

test/message/fail/import-as-reserved-word.out

-# Copyright 2015 the V8 project authors. All rights reserved.
-# Use of this source code is governed by a BSD-style license that can be
-# found in the LICENSE file.
-*%(basename)s:7: SyntaxError: Unexpected reserved word
+*%(basename)s:5: SyntaxError: Unexpected reserved word
 import { foo as import } from "mod";
                 ^^^^^^
 SyntaxError: Unexpected reserved word

test/message/fail/import-blah-module.js → test/message/fail/import-blah-module.mjs

 // Copyright 2019 the V8 project authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
-//
-// MODULE
 
 (import{blah})

test/message/fail/import-blah-module.out

-# Copyright 2019 the V8 project authors. All rights reserved.
-# Use of this source code is governed by a BSD-style license that can be
-# found in the LICENSE file.
-*%(basename)s:7: SyntaxError: Unexpected token '{'
+*%(basename)s:5: SyntaxError: Unexpected token '{'
 (import{blah})
        ^
 SyntaxError: Unexpected token '{'

test/message/fail/import-eval.js → test/message/fail/import-eval.mjs

 // Copyright 2015 the V8 project authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
-//
-// MODULE
 
 import { eval } from "mod";

test/message/fail/import-eval.out

-# Copyright 2015 the V8 project authors. All rights reserved.
-# Use of this source code is governed by a BSD-style license that can be
-# found in the LICENSE file.
-*%(basename)s:7: SyntaxError: Unexpected eval or arguments in strict mode
+*%(basename)s:5: SyntaxError: Unexpected eval or arguments in strict mode
 import { eval } from "mod";
          ^^^^
 SyntaxError: Unexpected eval or arguments in strict mode

test/message/fail/import-redeclaration.js → test/message/fail/import-redeclaration.mjs

 // Copyright 2015 the V8 project authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
-//
-// MODULE
 
 let foo = 42;
 import { foo } from "mod";

test/message/fail/import-redeclaration.out

-# Copyright 2015 the V8 project authors. All rights reserved.
-# Use of this source code is governed by a BSD-style license that can be
-# found in the LICENSE file.
-*%(basename)s:8: SyntaxError: Identifier 'foo' has already been declared
+*%(basename)s:6: SyntaxError: Identifier 'foo' has already been declared
 import { foo } from "mod";
          ^^^
 SyntaxError: Identifier 'foo' has already been declared

test/message/fail/import-reserved-word.js → test/message/fail/import-reserved-word.mjs

 // Copyright 2015 the V8 project authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
-//
-// MODULE
 
 import { import } from "mod";

test/message/fail/import-reserved-word.out

-# Copyright 2015 the V8 project authors. All rights reserved.
-# Use of this source code is governed by a BSD-style license that can be
-# found in the LICENSE file.
-*%(basename)s:7: SyntaxError: Unexpected reserved word
+*%(basename)s:5: SyntaxError: Unexpected reserved word
 import { import } from "mod";
          ^^^^^^
 SyntaxError: Unexpected reserved word

test/message/fail/modules-cycle1.js → test/message/fail/modules-cycle1.mjs

 // Copyright 2016 the V8 project authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
-//
-// MODULE
 
-import {a} from "modules-cycle1.js";
+import {a} from "modules-cycle1.mjs";
 export {a};

test/message/fail/modules-cycle1.out

-*%(basename)s:7: SyntaxError: Detected cycle while resolving name 'a' in 'modules-cycle1.js'
-import {a} from "modules-cycle1.js";
+*%(basename)s:5: SyntaxError: Detected cycle while resolving name 'a' in 'modules-cycle1.mjs'
+import {a} from "modules-cycle1.mjs";
         ^
-SyntaxError: Detected cycle while resolving name 'a' in 'modules-cycle1.js'
+SyntaxError: Detected cycle while resolving name 'a' in 'modules-cycle1.mjs'
 

test/message/fail/modules-cycle2.js → test/message/fail/modules-cycle2.mjs

 // Copyright 2016 the V8 project authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
-//
-// MODULE
 
-import {a} from "modules-skip-cycle2.js";
+import {a} from "modules-skip-cycle2.mjs";
 export {a as b};

test/message/fail/modules-cycle2.out

-*%(basename)s:7: SyntaxError: Detected cycle while resolving name 'a' in 'modules-skip-cycle2.js'
-import {a} from "modules-skip-cycle2.js";
+*%(basename)s:5: SyntaxError: Detected cycle while resolving name 'a' in 'modules-skip-cycle2.mjs'
+import {a} from "modules-skip-cycle2.mjs";
         ^
-SyntaxError: Detected cycle while resolving name 'a' in 'modules-skip-cycle2.js'
+SyntaxError: Detected cycle while resolving name 'a' in 'modules-skip-cycle2.mjs'
 

test/message/fail/modules-cycle3.mjs

+// Copyright 2016 the V8 project authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+export {a as x} from "modules-skip-cycle3.mjs";
+export {b as y} from "modules-skip-cycle3.mjs";

test/message/fail/modules-cycle3.out

-*%(basename)s:7: SyntaxError: Detected cycle while resolving name 'a' in 'modules-skip-cycle3.js'
-export {a as x} from "modules-skip-cycle3.js";
+*%(basename)s:5: SyntaxError: Detected cycle while resolving name 'a' in 'modules-skip-cycle3.mjs'
+export {a as x} from "modules-skip-cycle3.mjs";
         ^^^^^^
-SyntaxError: Detected cycle while resolving name 'a' in 'modules-skip-cycle3.js'
+SyntaxError: Detected cycle while resolving name 'a' in 'modules-skip-cycle3.mjs'
 

test/message/fail/modules-cycle4.mjs

+// Copyright 2016 the V8 project authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+import {x} from "modules-cycle3.mjs";

test/message/fail/modules-cycle4.out

-*modules-cycle3.js:7: SyntaxError: Detected cycle while resolving name 'a' in 'modules-skip-cycle3.js'
-export {a as x} from "modules-skip-cycle3.js";
+*modules-cycle3.mjs:5: SyntaxError: Detected cycle while resolving name 'a' in 'modules-skip-cycle3.mjs'
+export {a as x} from "modules-skip-cycle3.mjs";
         ^^^^^^
-SyntaxError: Detected cycle while resolving name 'a' in 'modules-skip-cycle3.js'
-
+SyntaxError: Detected cycle while resolving name 'a' in 'modules-skip-cycle3.mjs'

test/message/fail/modules-cycle5.mjs

+// Copyright 2017 the V8 project authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+import "modules-skip-cycle5.mjs";
+export {foo} from "modules-cycle5.mjs";

test/message/fail/modules-cycle5.out

-*%(basename)s:8: SyntaxError: Detected cycle while resolving name 'foo' in 'modules-cycle5.js'
-export {foo} from "modules-cycle5.js";
+*%(basename)s:6: SyntaxError: Detected cycle while resolving name 'foo' in 'modules-cycle5.mjs'
+export {foo} from "modules-cycle5.mjs";
         ^^^
-SyntaxError: Detected cycle while resolving name 'foo' in 'modules-cycle5.js'
+SyntaxError: Detected cycle while resolving name 'foo' in 'modules-cycle5.mjs'
 

test/message/fail/modules-cycle6.js

-// Copyright 2017 the V8 project authors. All rights reserved.
-// Use of this source code is governed by a BSD-style license that can be
-// found in the LICENSE file.
-//
-// MODULE
-
-import "modules-skip-cycle6.js";
-export * from "modules-cycle6.js";

test/message/fail/modules-cycle6.mjs

+// Copyright 2017 the V8 project authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+import "modules-skip-cycle6.mjs";
+export * from "modules-cycle6.mjs";

test/message/fail/modules-cycle6.out

-*modules-skip-cycle6.js:5: SyntaxError: The requested module 'modules-cycle6.js' does not provide an export named 'foo'
-export {foo} from "modules-cycle6.js";
+*modules-skip-cycle6.mjs:5: SyntaxError: The requested module 'modules-cycle6.mjs' does not provide an export named 'foo'
+export {foo} from "modules-cycle6.mjs";
         ^^^
-SyntaxError: The requested module 'modules-cycle6.js' does not provide an export named 'foo'
-
+SyntaxError: The requested module 'modules-cycle6.mjs' does not provide an export named 'foo'

test/message/fail/modules-duplicate-export2.js → test/message/fail/modules-duplicate-export1.mjs

 // Copyright 2016 the V8 project authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
-//
-// MODULE
 
-export let x = 42;
 export {x};
+export let x = 42;

test/message/fail/modules-duplicate-export1.out

-*%(basename)s:8: SyntaxError: Duplicate export of 'x'
+*%(basename)s:6: SyntaxError: Duplicate export of 'x'
 export let x = 42;
        ^^^^^^^^^^^
 SyntaxError: Duplicate export of 'x'

test/message/fail/modules-duplicate-export1.js → test/message/fail/modules-duplicate-export2.mjs

 // Copyright 2016 the V8 project authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
-//
-// MODULE
 
-export {x};
 export let x = 42;
+export {x};

test/message/fail/modules-duplicate-export2.out

-*%(basename)s:8: SyntaxError: Duplicate export of 'x'
+*%(basename)s:6: SyntaxError: Duplicate export of 'x'
 export {x};
         ^
 SyntaxError: Duplicate export of 'x'

test/message/fail/modules-duplicate-export3.js → test/message/fail/modules-duplicate-export3.mjs

 // Copyright 2016 the V8 project authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
-//
-// MODULE
 
 export let x = 42;
 let y;

test/message/fail/modules-duplicate-export3.out

-*%(basename)s:9: SyntaxError: Duplicate export of 'x'
+*%(basename)s:7: SyntaxError: Duplicate export of 'x'
 export {y as x};
         ^^^^^^
 SyntaxError: Duplicate export of 'x'

test/message/fail/modules-duplicate-export4.js → test/message/fail/modules-duplicate-export4.mjs

 // Copyright 2016 the V8 project authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
-//
-// MODULE
 
 export let x = 42;
 let y;

test/message/fail/modules-duplicate-export4.out

-*%(basename)s:9: SyntaxError: Duplicate export of 'x'
+*%(basename)s:7: SyntaxError: Duplicate export of 'x'
 export {y as z, y as x, y};
                 ^^^^^^
 SyntaxError: Duplicate export of 'x'

test/message/fail/modules-duplicate-export5.js → test/message/fail/modules-duplicate-export5.mjs

 // Copyright 2018 the V8 project authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
-//
-// MODULE
+
 // Flags: --harmony-namespace-exports
 
 export let foo = 42;
-export * as foo from "./doesnt-even-matter.js";
+export * as foo from "./doesnt-even-matter.mjs";

test/message/fail/modules-duplicate-export5.out

-*%(basename)s:9: SyntaxError: Duplicate export of 'foo'
-export * as foo from "./doesnt-even-matter.js";
+*%(basename)s:8: SyntaxError: Duplicate export of 'foo'
+export * as foo from "./doesnt-even-matter.mjs";
             ^^^
 SyntaxError: Duplicate export of 'foo'
-

test/message/fail/modules-export-illformed-class.js → test/message/fail/modules-export-illformed-class.mjs

@@ -2,6 +2,4 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-// MODULE
-
 export class foo {[]};

test/message/fail/modules-export-illformed-class.out

-*%(basename)s:7: SyntaxError: Unexpected token ']'
+*%(basename)s:5: SyntaxError: Unexpected token ']'
 export class foo {[]};
                    ^
 SyntaxError: Unexpected token ']'

test/message/fail/modules-import-redeclare1.js

-// Copyright 2016 the V8 project authors. All rights reserved.
-// Use of this source code is governed by a BSD-style license that can be
-// found in the LICENSE file.
-//
-// MODULE
-
-export let x = 42;
-import {x} from "modules-import-redeclare1.js";

test/message/fail/modules-import-redeclare1.mjs

+// Copyright 2016 the V8 project authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+export let x = 42;
+import {x} from "modules-import-redeclare1.mjs";

test/message/fail/modules-import-redeclare1.out

-*%(basename)s:8: SyntaxError: Identifier 'x' has already been declared
-import {x} from "modules-import-redeclare1.js";
+*%(basename)s:6: SyntaxError: Identifier 'x' has already been declared
+import {x} from "modules-import-redeclare1.mjs";
         ^
 SyntaxError: Identifier 'x' has already been declared
 

test/message/fail/modules-import-redeclare2.js

-// Copyright 2016 the V8 project authors. All rights reserved.
-// Use of this source code is governed by a BSD-style license that can be
-// found in the LICENSE file.
-//
-// MODULE
-
-export let x = 42;
-import {y, x, z} from "modules-import-redeclare1.js";

test/message/fail/modules-import-redeclare2.mjs

+// Copyright 2016 the V8 project authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+export let x = 42;
+import {y, x, z} from "modules-import-redeclare1.mjs";

test/message/fail/modules-import-redeclare2.out

-*%(basename)s:8: SyntaxError: Identifier 'x' has already been declared
-import {y, x, z} from "modules-import-redeclare1.js";
+*%(basename)s:6: SyntaxError: Identifier 'x' has already been declared
+import {y, x, z} from "modules-import-redeclare1.mjs";
            ^
 SyntaxError: Identifier 'x' has already been declared
 

test/message/fail/modules-import-redeclare3.js

-// Copyright 2016 the V8 project authors. All rights reserved.
-// Use of this source code is governed by a BSD-style license that can be
-// found in the LICENSE file.
-//
-// MODULE
-
-import {y, x, z} from "modules-import-redeclare1.js";
-export let x = 42;

test/message/fail/modules-import-redeclare3.mjs

+// Copyright 2016 the V8 project authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+import {y, x, z} from "modules-import-redeclare1.mjs";
+export let x = 42;

test/message/fail/modules-import-redeclare3.out

-*%(basename)s:8: SyntaxError: Identifier 'x' has already been declared
+*%(basename)s:6: SyntaxError: Identifier 'x' has already been declared
 export let x = 42;
            ^
 SyntaxError: Identifier 'x' has already been declared

test/message/fail/modules-import1.mjs

+// Copyright 2016 the V8 project authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+import {a} from "modules-import1.mjs";

test/message/fail/modules-import1.out

-*%(basename)s:7: SyntaxError: The requested module 'modules-import1.js' does not provide an export named 'a'
-import {a} from "modules-import1.js";
+*%(basename)s:5: SyntaxError: The requested module 'modules-import1.mjs' does not provide an export named 'a'
+import {a} from "modules-import1.mjs";
         ^
-SyntaxError: The requested module 'modules-import1.js' does not provide an export named 'a'
+SyntaxError: The requested module 'modules-import1.mjs' does not provide an export named 'a'
 

test/message/fail/modules-import2.js

-// Copyright 2016 the V8 project authors. All rights reserved.
-// Use of this source code is governed by a BSD-style license that can be
-// found in the LICENSE file.
-//
-// MODULE
-
-import {a as b} from "modules-import2.js";

test/message/fail/modules-import2.mjs

+// Copyright 2016 the V8 project authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+import {a as b} from "modules-import2.mjs";

test/message/fail/modules-import2.out

-*%(basename)s:7: SyntaxError: The requested module 'modules-import2.js' does not provide an export named 'a'
-import {a as b} from "modules-import2.js";
+*%(basename)s:5: SyntaxError: The requested module 'modules-import2.mjs' does not provide an export named 'a'
+import {a as b} from "modules-import2.mjs";
         ^
-SyntaxError: The requested module 'modules-import2.js' does not provide an export named 'a'
+SyntaxError: The requested module 'modules-import2.mjs' does not provide an export named 'a'
 

test/message/fail/modules-import3.js

-// Copyright 2016 the V8 project authors. All rights reserved.
-// Use of this source code is governed by a BSD-style license that can be
-// found in the LICENSE file.
-//
-// MODULE
-
-import foo from "modules-import3.js";

test/message/fail/modules-import3.mjs

+// Copyright 2016 the V8 project authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+import foo from "modules-import3.mjs";

test/message/fail/modules-import3.out

-*%(basename)s:7: SyntaxError: The requested module 'modules-import3.js' does not provide an export named 'default'
-import foo from "modules-import3.js";
+*%(basename)s:5: SyntaxError: The requested module 'modules-import3.mjs' does not provide an export named 'default'
+import foo from "modules-import3.mjs";
        ^^^
-SyntaxError: The requested module 'modules-import3.js' does not provide an export named 'default'
+SyntaxError: The requested module 'modules-import3.mjs' does not provide an export named 'default'
 

test/message/fail/modules-import4.js

-// Copyright 2016 the V8 project authors. All rights reserved.
-// Use of this source code is governed by a BSD-style license that can be
-// found in the LICENSE file.
-//
-// MODULE
-
-import {a as b} from "modules-import4.js";
-export {c as a} from "modules-import4.js";

test/message/fail/modules-import4.mjs

+// Copyright 2016 the V8 project authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+import {a as b} from "modules-import4.mjs";
+export {c as a} from "modules-import4.mjs";

test/message/fail/modules-import4.out

-*%(basename)s:8: SyntaxError: The requested module 'modules-import4.js' does not provide an export named 'c'
-export {c as a} from "modules-import4.js";
+*%(basename)s:6: SyntaxError: The requested module 'modules-import4.mjs' does not provide an export named 'c'
+export {c as a} from "modules-import4.mjs";
         ^^^^^^
-SyntaxError: The requested module 'modules-import4.js' does not provide an export named 'c'
+SyntaxError: The requested module 'modules-import4.mjs' does not provide an export named 'c'
 

test/message/fail/modules-import5.js

-// Copyright 2016 the V8 project authors. All rights reserved.
-// Use of this source code is governed by a BSD-style license that can be
-// found in the LICENSE file.
-//
-// MODULE
-
-import {a as b} from "modules-import5.js";
-export {c as a} from "modules-import5.js";
-import {c} from "modules-import5.js";

test/message/fail/modules-cycle3.js → test/message/fail/modules-import5.mjs

 // Copyright 2016 the V8 project authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
-//
-// MODULE
 
-export {a as x} from "modules-skip-cycle3.js";
-export {b as y} from "modules-skip-cycle3.js";
+import {a as b} from "modules-import5.mjs";
+export {c as a} from "modules-import5.mjs";
+import {c} from "modules-import5.mjs";

test/message/fail/modules-import5.out

-*%(basename)s:8: SyntaxError: The requested module 'modules-import5.js' does not provide an export named 'c'
-export {c as a} from "modules-import5.js";
+*%(basename)s:6: SyntaxError: The requested module 'modules-import5.mjs' does not provide an export named 'c'
+export {c as a} from "modules-import5.mjs";
         ^^^^^^
-SyntaxError: The requested module 'modules-import5.js' does not provide an export named 'c'
+SyntaxError: The requested module 'modules-import5.mjs' does not provide an export named 'c'
 

test/message/fail/modules-import6.js → test/message/fail/modules-import6.mjs

 // Copyright 2016 the V8 project authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
-//
-// MODULE
 
-import {a as b} from "modules-import6.js";
+import {a as b} from "modules-import6.mjs";
 export {c as a};
-import {c} from "modules-import6.js";
+import {c} from "modules-import6.mjs";

test/message/fail/modules-import6.out

-*%(basename)s:9: SyntaxError: The requested module 'modules-import6.js' does not provide an export named 'c'
-import {c} from "modules-import6.js";
+*%(basename)s:7: SyntaxError: The requested module 'modules-import6.mjs' does not provide an export named 'c'
+import {c} from "modules-import6.mjs";
         ^
-SyntaxError: The requested module 'modules-import6.js' does not provide an export named 'c'
+SyntaxError: The requested module 'modules-import6.mjs' does not provide an export named 'c'
 

test/message/fail/modules-skip-cycle2.js → test/message/fail/modules-skip-cycle2.mjs

@@ -2,4 +2,4 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-export {b as a} from "modules-cycle2.js";
+export {b as a} from "modules-cycle2.mjs";

test/message/fail/modules-skip-cycle3.js

-// Copyright 2016 the V8 project authors. All rights reserved.
-// Use of this source code is governed by a BSD-style license that can be
-// found in the LICENSE file.
-
-export {y as a} from "modules-cycle3.js";
-export {x as b} from "modules-cycle3.js";

test/message/fail/modules-skip-cycle3.mjs

+// Copyright 2016 the V8 project authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+export {y as a} from "modules-cycle3.mjs";
+export {x as b} from "modules-cycle3.mjs";

test/message/fail/modules-skip-cycle5.js → test/message/fail/modules-skip-cycle5.mjs

@@ -2,4 +2,4 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-export {foo} from "modules-cycle5.js";
+export {foo} from "modules-cycle5.mjs";

test/message/fail/modules-skip-cycle6.js → test/message/fail/modules-skip-cycle6.mjs

@@ -2,4 +2,4 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-export {foo} from "modules-cycle6.js";
+export {foo} from "modules-cycle6.mjs";

test/message/fail/modules-star-conflict1.js

-// Copyright 2016 the V8 project authors. All rights reserved.
-// Use of this source code is governed by a BSD-style license that can be
-// found in the LICENSE file.
-//
-// MODULE
-
-import {a} from "../../mjsunit/modules-skip-7.js";

test/message/fail/modules-import1.js → test/message/fail/modules-star-conflict1.mjs

 // Copyright 2016 the V8 project authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
-//
-// MODULE
 
-import {a} from "modules-import1.js";
+import {a} from "../../mjsunit/modules-skip-7.mjs";

test/message/fail/modules-star-conflict1.out

-*%(basename)s:7: SyntaxError: The requested module '../../mjsunit/modules-skip-7.js' contains conflicting star exports for name 'a'
-import {a} from "../../mjsunit/modules-skip-7.js";
+*%(basename)s:5: SyntaxError: The requested module '../../mjsunit/modules-skip-7.mjs' contains conflicting star exports for name 'a'
+import {a} from "../../mjsunit/modules-skip-7.mjs";
         ^
-SyntaxError: The requested module '../../mjsunit/modules-skip-7.js' contains conflicting star exports for name 'a'
+SyntaxError: The requested module '../../mjsunit/modules-skip-7.mjs' contains conflicting star exports for name 'a'
 

test/message/fail/modules-star-conflict2.js → test/message/fail/modules-star-conflict2.mjs

 // Copyright 2016 the V8 project authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
-//
-// MODULE
 
-export * from "../../mjsunit/modules-skip-star-exports-conflict.js";
-export * from "../../mjsunit/modules-skip-6.js";
+export * from "../../mjsunit/modules-skip-star-exports-conflict.mjs";
+export * from "../../mjsunit/modules-skip-6.mjs";
 
-import {a} from "modules-star-conflict2.js";
+import {a} from "modules-star-conflict2.mjs";

test/message/fail/modules-star-conflict2.out

-*%(basename)s:7: SyntaxError: The requested module '../../mjsunit/modules-skip-star-exports-conflict.js' contains conflicting star exports for name 'a'
-export * from "../../mjsunit/modules-skip-star-exports-conflict.js";
+*%(basename)s:5: SyntaxError: The requested module '../../mjsunit/modules-skip-star-exports-conflict.mjs' contains conflicting star exports for name 'a'
+export * from "../../mjsunit/modules-skip-star-exports-conflict.mjs";
        ^
-SyntaxError: The requested module '../../mjsunit/modules-skip-star-exports-conflict.js' contains conflicting star exports for name 'a'
+SyntaxError: The requested module '../../mjsunit/modules-skip-star-exports-conflict.mjs' contains conflicting star exports for name 'a'
 

test/message/fail/modules-star-default.js → test/message/fail/modules-star-default.mjs

 // Copyright 2016 the V8 project authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
-//
-// MODULE
 
 // Star exports do not propagate a default export.
-import a from "modules-import4.js";
+import a from "modules-import4.mjs";

test/message/fail/modules-star-default.out

-*modules-import4.js:8: SyntaxError: The requested module 'modules-import4.js' does not provide an export named 'c'
-export {c as a} from "modules-import4.js";
+*modules-import4.mjs:6: SyntaxError: The requested module 'modules-import4.mjs' does not provide an export named 'c'
+export {c as a} from "modules-import4.mjs";
         ^^^^^^
-SyntaxError: The requested module 'modules-import4.js' does not provide an export named 'c'
+SyntaxError: The requested module 'modules-import4.mjs' does not provide an export named 'c'
 

test/message/fail/modules-undefined-export1.js → test/message/fail/modules-undefined-export1.mjs

 // Copyright 2016 the V8 project authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
-//
-// MODULE
 
 export {x};

test/message/fail/modules-undefined-export1.out

-*%(basename)s:7: SyntaxError: Export 'x' is not defined in module
+*%(basename)s:5: SyntaxError: Export 'x' is not defined in module
 export {x};
         ^
 SyntaxError: Export 'x' is not defined in module

test/message/fail/modules-undefined-export2.js → test/message/fail/modules-undefined-export2.mjs

 // Copyright 2016 the V8 project authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
-//
-// MODULE
 
 export {x as y};

test/message/fail/modules-undefined-export2.out

-*%(basename)s:7: SyntaxError: Export 'x' is not defined in module
+*%(basename)s:5: SyntaxError: Export 'x' is not defined in module
 export {x as y};
         ^^^^^^
 SyntaxError: Export 'x' is not defined in module

test/message/fail/redeclaration5.js → test/message/fail/redeclaration5.mjs

@@ -2,7 +2,5 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-// MODULE
-
 function foo() {}
 function foo() {}

test/message/fail/redeclaration5.out

-*%(basename)s:8: SyntaxError: Identifier 'foo' has already been declared
+*%(basename)s:6: SyntaxError: Identifier 'foo' has already been declared
 function foo() {}
 ^
 SyntaxError: Identifier 'foo' has already been declared

test/message/regress/fail/regress-900383.js → test/message/regress/fail/regress-900383.mjs

 // Copyright 2018 the V8 project authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
-//
-// MODULE
 
 export default x = 1;
 export default x = 1;

test/message/regress/fail/regress-900383.out

-*%(basename)s:8: SyntaxError: Identifier '*default*' has already been declared
+*%(basename)s:6: SyntaxError: Identifier '*default*' has already been declared
 export default x = 1;
        ^^^^^^^^^^^^^
 SyntaxError: Identifier '*default*' has already been declared

test/message/testcfg.py

@@ -35,7 +35,6 @@ from testrunner.outproc import message
 
 
 INVALID_FLAGS = ["--enable-slow-asserts"]
-MODULE_PATTERN = re.compile(r"^// MODULE$", flags=re.MULTILINE)
 
 
 class TestSuite(testsuite.TestSuite):
@@ -56,9 +55,7 @@ class TestCase(testcase.D8TestCase):
 
   def _parse_source_files(self, source):
     files = []
-    if MODULE_PATTERN.search(source):
-      files.append("--module")
-    files.append(os.path.join(self.suite.root, self.path + ".js"))
+    files.append(self._get_source_path())
     return files
 
   def _expected_fail(self):
@@ -81,7 +78,13 @@ class TestCase(testcase.D8TestCase):
     return self._source_flags
 
   def _get_source_path(self):
-    return os.path.join(self.suite.root, self.path + self._get_suffix())
+    base_path = os.path.join(self.suite.root, self.path)
+    # Try .js first, and fall back to .mjs.
+    # TODO(v8:9406): clean this up by never separating the path from
+    # the extension in the first place.
+    if os.path.exists(base_path + self._get_suffix()):
+      return base_path + self._get_suffix()
+    return base_path + '.mjs'
 
   def skip_predictable(self):
     # Message tests expected to fail don't print allocation output for

test/mjsunit/harmony/import-from-compilation-errored.js

@@ -5,8 +5,8 @@
 // Flags: --allow-natives-syntax --harmony-dynamic-import
 
 var error1, error2;
-import('modules-skip-12.js').catch(e => error1 = e);
-import('modules-skip-12.js').catch(e => error2 = e);
+import('modules-skip-12.mjs').catch(e => error1 = e);
+import('modules-skip-12.mjs').catch(e => error2 = e);
 %PerformMicrotaskCheckpoint();
 
 assertEquals(error1, error2);

test/mjsunit/harmony/import-from-evaluation-errored.js

@@ -5,8 +5,8 @@
 // Flags: --allow-natives-syntax --harmony-dynamic-import
 
 var error1, error2;
-import('modules-skip-11.js').catch(e => error1 = e);
-import('modules-skip-11.js').catch(e => error2 = e);
+import('modules-skip-11.mjs').catch(e => error1 = e);
+import('modules-skip-11.mjs').catch(e => error2 = e);
 %PerformMicrotaskCheckpoint();
 
 assertEquals(error1, error2);

test/mjsunit/harmony/import-from-instantiation-errored.js

@@ -5,8 +5,8 @@
 // Flags: --allow-natives-syntax --harmony-dynamic-import
 
 var error1, error2;
-import('modules-skip-10.js').catch(e => error1 = e);
-import('modules-skip-10.js').catch(e => error2 = e);
+import('modules-skip-10.mjs').catch(e => error1 = e);
+import('modules-skip-10.mjs').catch(e => error2 = e);
 %PerformMicrotaskCheckpoint();
 
 assertEquals(error1, error2);