From 7630e1763d34ffd6df04cdff25800b225f749b50 Mon Sep 17 00:00:00 2001 From: Mike Pennisi Date: Thu, 7 Apr 2016 15:50:10 -0400 Subject: [PATCH] Re-organize tests for eval Limit tests in `language/expressions/call/` and `built-ins/eval/` to only assert details that are directly related to the invocation pattern. Re-organize all other tests within the `language/eval-code/` directory, further categorizing each as `direct` or `indirect` as appropriate. Remove the extraneous "executable" flag from those files which carried it. --- test/built-ins/eval/{S15.1.2.1_A4.1.js => length-enumerable.js} | 0 .../eval/{S15.1.2.1_A4.2.js => length-non-configurable.js} | 0 test/built-ins/eval/{S15.1.2.1_A4.3.js => length-non-writable.js} | 0 test/built-ins/eval/{S15.1.2.1_A4.4.js => length-value.js} | 0 test/built-ins/eval/{S15.1.2.1_A4.7.js => no-construct.js} | 0 test/built-ins/eval/{S15.1.2.1_A4.6.js => no-proto.js} | 0 .../built-ins/eval/{S15.1.2.1_A4.5.js => prop-desc-enumerable.js} | 0 .../eval-code/direct/cptn-nrml-empty-block.js} | 0 .../eval-code/direct/cptn-nrml-empty-do-while.js} | 0 .../eval-code/direct/cptn-nrml-empty-empty.js} | 0 .../eval-code/direct/cptn-nrml-empty-for.js} | 0 .../eval-code/direct/cptn-nrml-empty-if.js} | 0 .../eval-code/direct/cptn-nrml-empty-switch.js} | 0 .../eval-code/direct/cptn-nrml-empty-var.js} | 0 .../eval-code/direct/cptn-nrml-empty-while.js} | 0 .../eval-code/direct/cptn-nrml-expr-obj.js} | 0 .../eval-code/direct/cptn-nrml-expr-prim.js} | 0 .../eval-code/direct/cptn-thrw-prim.js} | 0 test/language/eval-code/{ => direct}/export.js | 0 test/language/eval-code/{ => direct}/import.js | 0 .../{ => direct}/non-definable-function-with-function.js | 0 .../{ => direct}/non-definable-function-with-variable.js | 0 .../eval-code/{ => direct}/non-definable-global-function.js | 0 .../eval-code/{ => direct}/non-definable-global-generator.js | 0 test/language/eval-code/{ => direct}/non-definable-global-var.js | 0 .../eval-code/direct/non-string-object.js} | 0 .../eval-code/direct/non-string-primitive.js} | 0 .../eval-code/direct/parse-failure-1.js} | 0 .../eval-code/direct/parse-failure-2.js} | 0 .../eval-code/direct/parse-failure-3.js} | 0 .../eval-code/direct/parse-failure-4.js} | 0 .../eval-code/direct/parse-failure-5.js} | 0 .../language/eval-code/{ => direct}/this-value-func-non-strict.js | 0 test/language/eval-code/{ => direct}/this-value-func-strict.js | 0 test/language/eval-code/{ => direct}/this-value-global.js | 0 .../{10.4.2.1-2-s.js => direct/var-env-func-strict-caller-2.js} | 0 .../{10.4.2-2-s.js => direct/var-env-func-strict-caller.js} | 0 .../{10.4.2.1-4-s.js => direct/var-env-func-strict-source.js} | 0 .../{10.4.2-2-c-1.js => direct/var-env-var-non-strict.js} | 0 .../{10.4.2.1-1gs.js => direct/var-env-var-strict-caller-2.js} | 0 .../{10.4.2-3-c-3-s.js => direct/var-env-var-strict-caller-3.js} | 0 .../{10.4.2-3-c-2-s.js => direct/var-env-var-strict-caller.js} | 0 .../{10.4.2-3-c-1-s.js => direct/var-env-var-strict-source.js} | 0 .../eval-code/{S10.4.2.1_A1.js => indirect/var-env-var-strict.js} | 0 .../expressions/call/eval-first-arg.js} | 0 45 files changed, 0 insertions(+), 0 deletions(-) rename test/built-ins/eval/{S15.1.2.1_A4.1.js => length-enumerable.js} (100%) rename test/built-ins/eval/{S15.1.2.1_A4.2.js => length-non-configurable.js} (100%) rename test/built-ins/eval/{S15.1.2.1_A4.3.js => length-non-writable.js} (100%) rename test/built-ins/eval/{S15.1.2.1_A4.4.js => length-value.js} (100%) rename test/built-ins/eval/{S15.1.2.1_A4.7.js => no-construct.js} (100%) rename test/built-ins/eval/{S15.1.2.1_A4.6.js => no-proto.js} (100%) rename test/built-ins/eval/{S15.1.2.1_A4.5.js => prop-desc-enumerable.js} (100%) rename test/{built-ins/eval/S15.1.2.1_A3.2_T1.js => language/eval-code/direct/cptn-nrml-empty-block.js} (100%) rename test/{built-ins/eval/S15.1.2.1_A3.2_T6.js => language/eval-code/direct/cptn-nrml-empty-do-while.js} (100%) rename test/{built-ins/eval/S15.1.2.1_A3.2_T3.js => language/eval-code/direct/cptn-nrml-empty-empty.js} (100%) rename test/{built-ins/eval/S15.1.2.1_A3.2_T8.js => language/eval-code/direct/cptn-nrml-empty-for.js} (100%) rename test/{built-ins/eval/S15.1.2.1_A3.2_T4.js => language/eval-code/direct/cptn-nrml-empty-if.js} (100%) rename test/{built-ins/eval/S15.1.2.1_A3.2_T5.js => language/eval-code/direct/cptn-nrml-empty-switch.js} (100%) rename test/{built-ins/eval/S15.1.2.1_A3.2_T2.js => language/eval-code/direct/cptn-nrml-empty-var.js} (100%) rename test/{built-ins/eval/S15.1.2.1_A3.2_T7.js => language/eval-code/direct/cptn-nrml-empty-while.js} (100%) rename test/{built-ins/eval/S15.1.2.1_A3.1_T2.js => language/eval-code/direct/cptn-nrml-expr-obj.js} (100%) rename test/{built-ins/eval/S15.1.2.1_A3.1_T1.js => language/eval-code/direct/cptn-nrml-expr-prim.js} (100%) rename test/{built-ins/eval/S15.1.2.1_A3.3_T4.js => language/eval-code/direct/cptn-thrw-prim.js} (100%) rename test/language/eval-code/{ => direct}/export.js (100%) rename test/language/eval-code/{ => direct}/import.js (100%) rename test/language/eval-code/{ => direct}/non-definable-function-with-function.js (100%) mode change 100755 => 100644 rename test/language/eval-code/{ => direct}/non-definable-function-with-variable.js (100%) mode change 100755 => 100644 rename test/language/eval-code/{ => direct}/non-definable-global-function.js (100%) mode change 100755 => 100644 rename test/language/eval-code/{ => direct}/non-definable-global-generator.js (100%) mode change 100755 => 100644 rename test/language/eval-code/{ => direct}/non-definable-global-var.js (100%) mode change 100755 => 100644 rename test/{built-ins/eval/S15.1.2.1_A1.1_T2.js => language/eval-code/direct/non-string-object.js} (100%) rename test/{built-ins/eval/S15.1.2.1_A1.1_T1.js => language/eval-code/direct/non-string-primitive.js} (100%) rename test/{built-ins/eval/S15.1.2.1_A2_T1.js => language/eval-code/direct/parse-failure-1.js} (100%) rename test/{built-ins/eval/S15.1.2.1_A2_T2.js => language/eval-code/direct/parse-failure-2.js} (100%) rename test/{built-ins/eval/S15.1.2.1_A3.3_T1.js => language/eval-code/direct/parse-failure-3.js} (100%) rename test/{built-ins/eval/S15.1.2.1_A3.3_T2.js => language/eval-code/direct/parse-failure-4.js} (100%) rename test/{built-ins/eval/S15.1.2.1_A3.3_T3.js => language/eval-code/direct/parse-failure-5.js} (100%) rename test/language/eval-code/{ => direct}/this-value-func-non-strict.js (100%) rename test/language/eval-code/{ => direct}/this-value-func-strict.js (100%) rename test/language/eval-code/{ => direct}/this-value-global.js (100%) rename test/language/eval-code/{10.4.2.1-2-s.js => direct/var-env-func-strict-caller-2.js} (100%) rename test/language/eval-code/{10.4.2-2-s.js => direct/var-env-func-strict-caller.js} (100%) rename test/language/eval-code/{10.4.2.1-4-s.js => direct/var-env-func-strict-source.js} (100%) rename test/language/eval-code/{10.4.2-2-c-1.js => direct/var-env-var-non-strict.js} (100%) rename test/language/eval-code/{10.4.2.1-1gs.js => direct/var-env-var-strict-caller-2.js} (100%) rename test/language/eval-code/{10.4.2-3-c-3-s.js => direct/var-env-var-strict-caller-3.js} (100%) rename test/language/eval-code/{10.4.2-3-c-2-s.js => direct/var-env-var-strict-caller.js} (100%) rename test/language/eval-code/{10.4.2-3-c-1-s.js => direct/var-env-var-strict-source.js} (100%) rename test/language/eval-code/{S10.4.2.1_A1.js => indirect/var-env-var-strict.js} (100%) rename test/{built-ins/eval/S15.1.2.1_A1.2_T1.js => language/expressions/call/eval-first-arg.js} (100%) diff --git a/test/built-ins/eval/S15.1.2.1_A4.1.js b/test/built-ins/eval/length-enumerable.js similarity index 100% rename from test/built-ins/eval/S15.1.2.1_A4.1.js rename to test/built-ins/eval/length-enumerable.js diff --git a/test/built-ins/eval/S15.1.2.1_A4.2.js b/test/built-ins/eval/length-non-configurable.js similarity index 100% rename from test/built-ins/eval/S15.1.2.1_A4.2.js rename to test/built-ins/eval/length-non-configurable.js diff --git a/test/built-ins/eval/S15.1.2.1_A4.3.js b/test/built-ins/eval/length-non-writable.js similarity index 100% rename from test/built-ins/eval/S15.1.2.1_A4.3.js rename to test/built-ins/eval/length-non-writable.js diff --git a/test/built-ins/eval/S15.1.2.1_A4.4.js b/test/built-ins/eval/length-value.js similarity index 100% rename from test/built-ins/eval/S15.1.2.1_A4.4.js rename to test/built-ins/eval/length-value.js diff --git a/test/built-ins/eval/S15.1.2.1_A4.7.js b/test/built-ins/eval/no-construct.js similarity index 100% rename from test/built-ins/eval/S15.1.2.1_A4.7.js rename to test/built-ins/eval/no-construct.js diff --git a/test/built-ins/eval/S15.1.2.1_A4.6.js b/test/built-ins/eval/no-proto.js similarity index 100% rename from test/built-ins/eval/S15.1.2.1_A4.6.js rename to test/built-ins/eval/no-proto.js diff --git a/test/built-ins/eval/S15.1.2.1_A4.5.js b/test/built-ins/eval/prop-desc-enumerable.js similarity index 100% rename from test/built-ins/eval/S15.1.2.1_A4.5.js rename to test/built-ins/eval/prop-desc-enumerable.js diff --git a/test/built-ins/eval/S15.1.2.1_A3.2_T1.js b/test/language/eval-code/direct/cptn-nrml-empty-block.js similarity index 100% rename from test/built-ins/eval/S15.1.2.1_A3.2_T1.js rename to test/language/eval-code/direct/cptn-nrml-empty-block.js diff --git a/test/built-ins/eval/S15.1.2.1_A3.2_T6.js b/test/language/eval-code/direct/cptn-nrml-empty-do-while.js similarity index 100% rename from test/built-ins/eval/S15.1.2.1_A3.2_T6.js rename to test/language/eval-code/direct/cptn-nrml-empty-do-while.js diff --git a/test/built-ins/eval/S15.1.2.1_A3.2_T3.js b/test/language/eval-code/direct/cptn-nrml-empty-empty.js similarity index 100% rename from test/built-ins/eval/S15.1.2.1_A3.2_T3.js rename to test/language/eval-code/direct/cptn-nrml-empty-empty.js diff --git a/test/built-ins/eval/S15.1.2.1_A3.2_T8.js b/test/language/eval-code/direct/cptn-nrml-empty-for.js similarity index 100% rename from test/built-ins/eval/S15.1.2.1_A3.2_T8.js rename to test/language/eval-code/direct/cptn-nrml-empty-for.js diff --git a/test/built-ins/eval/S15.1.2.1_A3.2_T4.js b/test/language/eval-code/direct/cptn-nrml-empty-if.js similarity index 100% rename from test/built-ins/eval/S15.1.2.1_A3.2_T4.js rename to test/language/eval-code/direct/cptn-nrml-empty-if.js diff --git a/test/built-ins/eval/S15.1.2.1_A3.2_T5.js b/test/language/eval-code/direct/cptn-nrml-empty-switch.js similarity index 100% rename from test/built-ins/eval/S15.1.2.1_A3.2_T5.js rename to test/language/eval-code/direct/cptn-nrml-empty-switch.js diff --git a/test/built-ins/eval/S15.1.2.1_A3.2_T2.js b/test/language/eval-code/direct/cptn-nrml-empty-var.js similarity index 100% rename from test/built-ins/eval/S15.1.2.1_A3.2_T2.js rename to test/language/eval-code/direct/cptn-nrml-empty-var.js diff --git a/test/built-ins/eval/S15.1.2.1_A3.2_T7.js b/test/language/eval-code/direct/cptn-nrml-empty-while.js similarity index 100% rename from test/built-ins/eval/S15.1.2.1_A3.2_T7.js rename to test/language/eval-code/direct/cptn-nrml-empty-while.js diff --git a/test/built-ins/eval/S15.1.2.1_A3.1_T2.js b/test/language/eval-code/direct/cptn-nrml-expr-obj.js similarity index 100% rename from test/built-ins/eval/S15.1.2.1_A3.1_T2.js rename to test/language/eval-code/direct/cptn-nrml-expr-obj.js diff --git a/test/built-ins/eval/S15.1.2.1_A3.1_T1.js b/test/language/eval-code/direct/cptn-nrml-expr-prim.js similarity index 100% rename from test/built-ins/eval/S15.1.2.1_A3.1_T1.js rename to test/language/eval-code/direct/cptn-nrml-expr-prim.js diff --git a/test/built-ins/eval/S15.1.2.1_A3.3_T4.js b/test/language/eval-code/direct/cptn-thrw-prim.js similarity index 100% rename from test/built-ins/eval/S15.1.2.1_A3.3_T4.js rename to test/language/eval-code/direct/cptn-thrw-prim.js diff --git a/test/language/eval-code/export.js b/test/language/eval-code/direct/export.js similarity index 100% rename from test/language/eval-code/export.js rename to test/language/eval-code/direct/export.js diff --git a/test/language/eval-code/import.js b/test/language/eval-code/direct/import.js similarity index 100% rename from test/language/eval-code/import.js rename to test/language/eval-code/direct/import.js diff --git a/test/language/eval-code/non-definable-function-with-function.js b/test/language/eval-code/direct/non-definable-function-with-function.js old mode 100755 new mode 100644 similarity index 100% rename from test/language/eval-code/non-definable-function-with-function.js rename to test/language/eval-code/direct/non-definable-function-with-function.js diff --git a/test/language/eval-code/non-definable-function-with-variable.js b/test/language/eval-code/direct/non-definable-function-with-variable.js old mode 100755 new mode 100644 similarity index 100% rename from test/language/eval-code/non-definable-function-with-variable.js rename to test/language/eval-code/direct/non-definable-function-with-variable.js diff --git a/test/language/eval-code/non-definable-global-function.js b/test/language/eval-code/direct/non-definable-global-function.js old mode 100755 new mode 100644 similarity index 100% rename from test/language/eval-code/non-definable-global-function.js rename to test/language/eval-code/direct/non-definable-global-function.js diff --git a/test/language/eval-code/non-definable-global-generator.js b/test/language/eval-code/direct/non-definable-global-generator.js old mode 100755 new mode 100644 similarity index 100% rename from test/language/eval-code/non-definable-global-generator.js rename to test/language/eval-code/direct/non-definable-global-generator.js diff --git a/test/language/eval-code/non-definable-global-var.js b/test/language/eval-code/direct/non-definable-global-var.js old mode 100755 new mode 100644 similarity index 100% rename from test/language/eval-code/non-definable-global-var.js rename to test/language/eval-code/direct/non-definable-global-var.js diff --git a/test/built-ins/eval/S15.1.2.1_A1.1_T2.js b/test/language/eval-code/direct/non-string-object.js similarity index 100% rename from test/built-ins/eval/S15.1.2.1_A1.1_T2.js rename to test/language/eval-code/direct/non-string-object.js diff --git a/test/built-ins/eval/S15.1.2.1_A1.1_T1.js b/test/language/eval-code/direct/non-string-primitive.js similarity index 100% rename from test/built-ins/eval/S15.1.2.1_A1.1_T1.js rename to test/language/eval-code/direct/non-string-primitive.js diff --git a/test/built-ins/eval/S15.1.2.1_A2_T1.js b/test/language/eval-code/direct/parse-failure-1.js similarity index 100% rename from test/built-ins/eval/S15.1.2.1_A2_T1.js rename to test/language/eval-code/direct/parse-failure-1.js diff --git a/test/built-ins/eval/S15.1.2.1_A2_T2.js b/test/language/eval-code/direct/parse-failure-2.js similarity index 100% rename from test/built-ins/eval/S15.1.2.1_A2_T2.js rename to test/language/eval-code/direct/parse-failure-2.js diff --git a/test/built-ins/eval/S15.1.2.1_A3.3_T1.js b/test/language/eval-code/direct/parse-failure-3.js similarity index 100% rename from test/built-ins/eval/S15.1.2.1_A3.3_T1.js rename to test/language/eval-code/direct/parse-failure-3.js diff --git a/test/built-ins/eval/S15.1.2.1_A3.3_T2.js b/test/language/eval-code/direct/parse-failure-4.js similarity index 100% rename from test/built-ins/eval/S15.1.2.1_A3.3_T2.js rename to test/language/eval-code/direct/parse-failure-4.js diff --git a/test/built-ins/eval/S15.1.2.1_A3.3_T3.js b/test/language/eval-code/direct/parse-failure-5.js similarity index 100% rename from test/built-ins/eval/S15.1.2.1_A3.3_T3.js rename to test/language/eval-code/direct/parse-failure-5.js diff --git a/test/language/eval-code/this-value-func-non-strict.js b/test/language/eval-code/direct/this-value-func-non-strict.js similarity index 100% rename from test/language/eval-code/this-value-func-non-strict.js rename to test/language/eval-code/direct/this-value-func-non-strict.js diff --git a/test/language/eval-code/this-value-func-strict.js b/test/language/eval-code/direct/this-value-func-strict.js similarity index 100% rename from test/language/eval-code/this-value-func-strict.js rename to test/language/eval-code/direct/this-value-func-strict.js diff --git a/test/language/eval-code/this-value-global.js b/test/language/eval-code/direct/this-value-global.js similarity index 100% rename from test/language/eval-code/this-value-global.js rename to test/language/eval-code/direct/this-value-global.js diff --git a/test/language/eval-code/10.4.2.1-2-s.js b/test/language/eval-code/direct/var-env-func-strict-caller-2.js similarity index 100% rename from test/language/eval-code/10.4.2.1-2-s.js rename to test/language/eval-code/direct/var-env-func-strict-caller-2.js diff --git a/test/language/eval-code/10.4.2-2-s.js b/test/language/eval-code/direct/var-env-func-strict-caller.js similarity index 100% rename from test/language/eval-code/10.4.2-2-s.js rename to test/language/eval-code/direct/var-env-func-strict-caller.js diff --git a/test/language/eval-code/10.4.2.1-4-s.js b/test/language/eval-code/direct/var-env-func-strict-source.js similarity index 100% rename from test/language/eval-code/10.4.2.1-4-s.js rename to test/language/eval-code/direct/var-env-func-strict-source.js diff --git a/test/language/eval-code/10.4.2-2-c-1.js b/test/language/eval-code/direct/var-env-var-non-strict.js similarity index 100% rename from test/language/eval-code/10.4.2-2-c-1.js rename to test/language/eval-code/direct/var-env-var-non-strict.js diff --git a/test/language/eval-code/10.4.2.1-1gs.js b/test/language/eval-code/direct/var-env-var-strict-caller-2.js similarity index 100% rename from test/language/eval-code/10.4.2.1-1gs.js rename to test/language/eval-code/direct/var-env-var-strict-caller-2.js diff --git a/test/language/eval-code/10.4.2-3-c-3-s.js b/test/language/eval-code/direct/var-env-var-strict-caller-3.js similarity index 100% rename from test/language/eval-code/10.4.2-3-c-3-s.js rename to test/language/eval-code/direct/var-env-var-strict-caller-3.js diff --git a/test/language/eval-code/10.4.2-3-c-2-s.js b/test/language/eval-code/direct/var-env-var-strict-caller.js similarity index 100% rename from test/language/eval-code/10.4.2-3-c-2-s.js rename to test/language/eval-code/direct/var-env-var-strict-caller.js diff --git a/test/language/eval-code/10.4.2-3-c-1-s.js b/test/language/eval-code/direct/var-env-var-strict-source.js similarity index 100% rename from test/language/eval-code/10.4.2-3-c-1-s.js rename to test/language/eval-code/direct/var-env-var-strict-source.js diff --git a/test/language/eval-code/S10.4.2.1_A1.js b/test/language/eval-code/indirect/var-env-var-strict.js similarity index 100% rename from test/language/eval-code/S10.4.2.1_A1.js rename to test/language/eval-code/indirect/var-env-var-strict.js diff --git a/test/built-ins/eval/S15.1.2.1_A1.2_T1.js b/test/language/expressions/call/eval-first-arg.js similarity index 100% rename from test/built-ins/eval/S15.1.2.1_A1.2_T1.js rename to test/language/expressions/call/eval-first-arg.js