Index: test/mjsunit/harmony/block-conflicts.js |
diff --git a/test/mjsunit/harmony/block-conflicts.js b/test/mjsunit/harmony/block-conflicts.js |
index 1eedb682aa5b2509237e7aa57a067986bdcd4025..d19a34a2c38a873375b37e92a26bdd551d8c144f 100644 |
--- a/test/mjsunit/harmony/block-conflicts.js |
+++ b/test/mjsunit/harmony/block-conflicts.js |
@@ -1,30 +1,7 @@ |
// Copyright 2011 the V8 project authors. All rights reserved. |
-// Redistribution and use in source and binary forms, with or without |
-// modification, are permitted provided that the following conditions are |
-// met: |
+// Use of this source code is governed by a BSD-style license that can be |
+// found in the LICENSE file. |
// |
-// * Redistributions of source code must retain the above copyright |
-// notice, this list of conditions and the following disclaimer. |
-// * Redistributions in binary form must reproduce the above |
-// copyright notice, this list of conditions and the following |
-// disclaimer in the documentation and/or other materials provided |
-// with the distribution. |
-// * Neither the name of Google Inc. nor the names of its |
-// contributors may be used to endorse or promote products derived |
-// from this software without specific prior written permission. |
-// |
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS |
-// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT |
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR |
-// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT |
-// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, |
-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT |
-// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, |
-// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY |
-// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT |
-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE |
-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. |
- |
// Flags: --harmony-scoping |
// Test for conflicting variable bindings. |
@@ -175,7 +152,7 @@ for (var v = 0; v < varbinds.length; ++v) { |
// Test conflicting catch/var bindings. |
for (var v = 0; v < varbinds.length; ++v) { |
- TestConflict('try {} catch(x) {' + varbinds[v] + '}'); |
+ TestNoConflict('try {} catch(x) {' + varbinds[v] + '}'); |
} |
// Test conflicting parameter/var bindings. |