| Message ID | 1360949750-30995-1-git-send-email-tom.gall@linaro.org |
|---|---|
| State | Accepted |
| Headers | show |
On 15 February 2013 09:35, Tom Gall <tom.gall@linaro.org> wrote: > Move contents of glsl-1.00 to the glsl-es-1.00 directory. > > Remove a few blank lines at the end of 4 tests so that git is happy. > > Last fix up all.tests so that all shader and glslparser tests for > glsl-es-1.00 are listed and referenced in the new directory. > > V2: patch squashed and generated with --find-renames > > Signed-off-by: Tom Gall <tom.gall@linaro.org> > --- > tests/all.tests | 11 > +++++++---- > .../compiler/arithmetic-operators/division-by-zero-01.frag | 1 - > .../compiler/arithmetic-operators/division-by-zero-02.frag | 1 - > .../compiler/arithmetic-operators/modulus-00.frag | 1 - > .../assignment-operators/assign-array-prohibited.frag | 0 > .../assignment-operators/assign-array-prohibited.vert | 0 > .../compiler/assignment-operators/modulus-assign-00.frag | 1 - > .../precision-qualifiers/default-precision-bool-01.frag | 0 > .../precision-qualifiers/default-precision-float-01.frag | 0 > .../precision-qualifiers/default-precision-int-01.frag | 0 > .../precision-qualifiers/default-precision-sampler.frag | 0 > .../precision-qualifiers/default-precision-sampler.vert | 0 > .../precision-qualifiers/default-precision-vec-01.frag | 0 > .../compiler/precision-qualifiers/precision-bool-01.frag | 0 > .../compiler/precision-qualifiers/precision-bool-02.frag | 0 > .../compiler/precision-qualifiers/precision-float-01.frag | 0 > .../compiler/precision-qualifiers/precision-float-02.frag | 0 > .../compiler/precision-qualifiers/precision-float-03.frag | 0 > .../compiler/precision-qualifiers/precision-float-04.frag | 0 > .../precision-qualifiers/precision-fs-highp-01.frag | 0 > .../precision-qualifiers/precision-fs-highp-02.frag | 0 > .../precision-qualifiers/precision-function-param-01.frag | 0 > .../compiler/precision-qualifiers/precision-global-01.frag | 0 > .../compiler/precision-qualifiers/precision-int-01.frag | 0 > .../compiler/precision-qualifiers/precision-int-02.frag | 0 > .../compiler/precision-qualifiers/precision-int-03.frag | 0 > .../precision-qualifiers/precision-literal-const-01.frag | 0 > .../precision-qualifiers/precision-literal-const-02.frag | 0 > .../compiler/precision-qualifiers/precision-local-01.frag | 0 > .../compiler/precision-qualifiers/precision-struct-01.frag | 0 > .../compiler/precision-qualifiers/precision-struct-02.frag | 0 > .../precision-qualifiers/precision-vs-highp-01.vert | 0 > .../compiler/qualifiers/fn-inout-array-allowed-cstyle.frag | 0 > .../compiler/qualifiers/fn-inout-array-allowed-cstyle.vert | 0 > .../compiler/qualifiers/fn-out-array-allowed-cstyle.frag | 0 > .../compiler/qualifiers/fn-out-array-allowed-cstyle.vert | 0 > .../storage-qualfiers/static-write-attribute-01.vert | 0 > .../storage-qualfiers/static-write-attribute-02.vert | 0 > .../compiler/storage-qualfiers/static-write-varying-01.frag | 0 > .../compiler/storage-qualfiers/static-write-varying-02.frag | 0 > 40 files changed, 7 insertions(+), 8 deletions(-) > rename tests/spec/{glsl-1.00 => > glsl-es-1.00}/compiler/arithmetic-operators/division-by-zero-01.frag (99%) > rename tests/spec/{glsl-1.00 => > glsl-es-1.00}/compiler/arithmetic-operators/division-by-zero-02.frag (99%) > rename tests/spec/{glsl-1.00 => > glsl-es-1.00}/compiler/arithmetic-operators/modulus-00.frag (99%) > rename tests/spec/{glsl-1.00 => > glsl-es-1.00}/compiler/assignment-operators/assign-array-prohibited.frag > (100%) > rename tests/spec/{glsl-1.00 => > glsl-es-1.00}/compiler/assignment-operators/assign-array-prohibited.vert > (100%) > rename tests/spec/{glsl-1.00 => > glsl-es-1.00}/compiler/assignment-operators/modulus-assign-00.frag (99%) > rename tests/spec/{glsl-1.00 => > glsl-es-1.00}/compiler/precision-qualifiers/default-precision-bool-01.frag > (100%) > rename tests/spec/{glsl-1.00 => > glsl-es-1.00}/compiler/precision-qualifiers/default-precision-float-01.frag > (100%) > rename tests/spec/{glsl-1.00 => > glsl-es-1.00}/compiler/precision-qualifiers/default-precision-int-01.frag > (100%) > rename tests/spec/{glsl-1.00 => > glsl-es-1.00}/compiler/precision-qualifiers/default-precision-sampler.frag > (100%) > rename tests/spec/{glsl-1.00 => > glsl-es-1.00}/compiler/precision-qualifiers/default-precision-sampler.vert > (100%) > rename tests/spec/{glsl-1.00 => > glsl-es-1.00}/compiler/precision-qualifiers/default-precision-vec-01.frag > (100%) > rename tests/spec/{glsl-1.00 => > glsl-es-1.00}/compiler/precision-qualifiers/precision-bool-01.frag (100%) > rename tests/spec/{glsl-1.00 => > glsl-es-1.00}/compiler/precision-qualifiers/precision-bool-02.frag (100%) > rename tests/spec/{glsl-1.00 => > glsl-es-1.00}/compiler/precision-qualifiers/precision-float-01.frag (100%) > rename tests/spec/{glsl-1.00 => > glsl-es-1.00}/compiler/precision-qualifiers/precision-float-02.frag (100%) > rename tests/spec/{glsl-1.00 => > glsl-es-1.00}/compiler/precision-qualifiers/precision-float-03.frag (100%) > rename tests/spec/{glsl-1.00 => > glsl-es-1.00}/compiler/precision-qualifiers/precision-float-04.frag (100%) > rename tests/spec/{glsl-1.00 => > glsl-es-1.00}/compiler/precision-qualifiers/precision-fs-highp-01.frag > (100%) > rename tests/spec/{glsl-1.00 => > glsl-es-1.00}/compiler/precision-qualifiers/precision-fs-highp-02.frag > (100%) > rename tests/spec/{glsl-1.00 => > glsl-es-1.00}/compiler/precision-qualifiers/precision-function-param-01.frag > (100%) > rename tests/spec/{glsl-1.00 => > glsl-es-1.00}/compiler/precision-qualifiers/precision-global-01.frag (100%) > rename tests/spec/{glsl-1.00 => > glsl-es-1.00}/compiler/precision-qualifiers/precision-int-01.frag (100%) > rename tests/spec/{glsl-1.00 => > glsl-es-1.00}/compiler/precision-qualifiers/precision-int-02.frag (100%) > rename tests/spec/{glsl-1.00 => > glsl-es-1.00}/compiler/precision-qualifiers/precision-int-03.frag (100%) > rename tests/spec/{glsl-1.00 => > glsl-es-1.00}/compiler/precision-qualifiers/precision-literal-const-01.frag > (100%) > rename tests/spec/{glsl-1.00 => > glsl-es-1.00}/compiler/precision-qualifiers/precision-literal-const-02.frag > (100%) > rename tests/spec/{glsl-1.00 => > glsl-es-1.00}/compiler/precision-qualifiers/precision-local-01.frag (100%) > rename tests/spec/{glsl-1.00 => > glsl-es-1.00}/compiler/precision-qualifiers/precision-struct-01.frag (100%) > rename tests/spec/{glsl-1.00 => > glsl-es-1.00}/compiler/precision-qualifiers/precision-struct-02.frag (100%) > rename tests/spec/{glsl-1.00 => > glsl-es-1.00}/compiler/precision-qualifiers/precision-vs-highp-01.vert > (100%) > rename tests/spec/{glsl-1.00 => > glsl-es-1.00}/compiler/qualifiers/fn-inout-array-allowed-cstyle.frag (100%) > rename tests/spec/{glsl-1.00 => > glsl-es-1.00}/compiler/qualifiers/fn-inout-array-allowed-cstyle.vert (100%) > rename tests/spec/{glsl-1.00 => > glsl-es-1.00}/compiler/qualifiers/fn-out-array-allowed-cstyle.frag (100%) > rename tests/spec/{glsl-1.00 => > glsl-es-1.00}/compiler/qualifiers/fn-out-array-allowed-cstyle.vert (100%) > rename tests/spec/{glsl-1.00 => > glsl-es-1.00}/compiler/storage-qualfiers/static-write-attribute-01.vert > (100%) > rename tests/spec/{glsl-1.00 => > glsl-es-1.00}/compiler/storage-qualfiers/static-write-attribute-02.vert > (100%) > rename tests/spec/{glsl-1.00 => > glsl-es-1.00}/compiler/storage-qualfiers/static-write-varying-01.frag (100%) > rename tests/spec/{glsl-1.00 => > glsl-es-1.00}/compiler/storage-qualfiers/static-write-varying-02.frag (100%) > > diff --git a/tests/all.tests b/tests/all.tests > index 4ce315f..3b8b83a 100644 > --- a/tests/all.tests > +++ b/tests/all.tests > @@ -684,11 +684,14 @@ spec['!OpenGL 3.1'] = gl31 > gl31['genned-names'] = concurrent_test('gl-3.1-genned-names') > gl31['minmax'] = concurrent_test('gl-3.1-minmax') > > -# Group spec/glsl-1.00 > -spec['glsl-1.00'] = Group() > -import_glsl_parser_tests(spec['glsl-1.00'], > - os.path.join(testsDir, 'spec', 'glsl-1.00'), > +# Group spec/glsl-es-1.00 > +spec['glsl-es-1.00'] = Group() > +import_glsl_parser_tests(spec['glsl-es-1.00'], > + os.path.join(testsDir, 'spec', 'glsl-es-1.00'), > ['compiler']) > I had to add the line "spec['glsl-es-1.00']['execution'] = Group()" to get this to work. Other than that the patch looks good. Pushed. > +add_shader_test_dir(spec['glsl-es-1.00']['execution'], > + os.path.join(testsDir, 'spec', 'glsl-es-1.00', > 'execution'), > + recursive=True) > > # Group spec/glsl-1.10 > spec['glsl-1.10'] = Group() > diff --git > a/tests/spec/glsl-1.00/compiler/arithmetic-operators/division-by-zero-01.frag > b/tests/spec/glsl-es-1.00/compiler/arithmetic-operators/division-by-zero-01.frag > similarity index 99% > rename from > tests/spec/glsl-1.00/compiler/arithmetic-operators/division-by-zero-01.frag > rename to > tests/spec/glsl-es-1.00/compiler/arithmetic-operators/division-by-zero-01.frag > index a3dda0e..33094f7 100644 > --- > a/tests/spec/glsl-1.00/compiler/arithmetic-operators/division-by-zero-01.frag > +++ > b/tests/spec/glsl-es-1.00/compiler/arithmetic-operators/division-by-zero-01.frag > @@ -16,4 +16,3 @@ f() { > float x = 1.0 / 0.0; > return x; > } > - > diff --git > a/tests/spec/glsl-1.00/compiler/arithmetic-operators/division-by-zero-02.frag > b/tests/spec/glsl-es-1.00/compiler/arithmetic-operators/division-by-zero-02.frag > similarity index 99% > rename from > tests/spec/glsl-1.00/compiler/arithmetic-operators/division-by-zero-02.frag > rename to > tests/spec/glsl-es-1.00/compiler/arithmetic-operators/division-by-zero-02.frag > index a93ed7f..f195214 100644 > --- > a/tests/spec/glsl-1.00/compiler/arithmetic-operators/division-by-zero-02.frag > +++ > b/tests/spec/glsl-es-1.00/compiler/arithmetic-operators/division-by-zero-02.frag > @@ -16,4 +16,3 @@ f() { > int x = 1 / 0; > return x; > } > - > diff --git > a/tests/spec/glsl-1.00/compiler/arithmetic-operators/modulus-00.frag > b/tests/spec/glsl-es-1.00/compiler/arithmetic-operators/modulus-00.frag > similarity index 99% > rename from > tests/spec/glsl-1.00/compiler/arithmetic-operators/modulus-00.frag > rename to > tests/spec/glsl-es-1.00/compiler/arithmetic-operators/modulus-00.frag > index 8032e7a..1204c6f 100644 > --- a/tests/spec/glsl-1.00/compiler/arithmetic-operators/modulus-00.frag > +++ b/tests/spec/glsl-es-1.00/compiler/arithmetic-operators/modulus-00.frag > @@ -15,4 +15,3 @@ f() { > int tea_time = 15 % 24; > return tea_time; > } > - > diff --git > a/tests/spec/glsl-1.00/compiler/assignment-operators/assign-array-prohibited.frag > b/tests/spec/glsl-es-1.00/compiler/assignment-operators/assign-array-prohibited.frag > similarity index 100% > rename from > tests/spec/glsl-1.00/compiler/assignment-operators/assign-array-prohibited.frag > rename to > tests/spec/glsl-es-1.00/compiler/assignment-operators/assign-array-prohibited.frag > diff --git > a/tests/spec/glsl-1.00/compiler/assignment-operators/assign-array-prohibited.vert > b/tests/spec/glsl-es-1.00/compiler/assignment-operators/assign-array-prohibited.vert > similarity index 100% > rename from > tests/spec/glsl-1.00/compiler/assignment-operators/assign-array-prohibited.vert > rename to > tests/spec/glsl-es-1.00/compiler/assignment-operators/assign-array-prohibited.vert > diff --git > a/tests/spec/glsl-1.00/compiler/assignment-operators/modulus-assign-00.frag > b/tests/spec/glsl-es-1.00/compiler/assignment-operators/modulus-assign-00.frag > similarity index 99% > rename from > tests/spec/glsl-1.00/compiler/assignment-operators/modulus-assign-00.frag > rename to > tests/spec/glsl-es-1.00/compiler/assignment-operators/modulus-assign-00.frag > index c89e218..7b35a9a 100644 > --- > a/tests/spec/glsl-1.00/compiler/assignment-operators/modulus-assign-00.frag > +++ > b/tests/spec/glsl-es-1.00/compiler/assignment-operators/modulus-assign-00.frag > @@ -18,4 +18,3 @@ f() { > x %= 4; > return x; > } > - > diff --git > a/tests/spec/glsl-1.00/compiler/precision-qualifiers/default-precision-bool-01.frag > b/tests/spec/glsl-es-1.00/compiler/precision-qualifiers/default-precision-bool-01.frag > similarity index 100% > rename from > tests/spec/glsl-1.00/compiler/precision-qualifiers/default-precision-bool-01.frag > rename to > tests/spec/glsl-es-1.00/compiler/precision-qualifiers/default-precision-bool-01.frag > diff --git > a/tests/spec/glsl-1.00/compiler/precision-qualifiers/default-precision-float-01.frag > b/tests/spec/glsl-es-1.00/compiler/precision-qualifiers/default-precision-float-01.frag > similarity index 100% > rename from > tests/spec/glsl-1.00/compiler/precision-qualifiers/default-precision-float-01.frag > rename to > tests/spec/glsl-es-1.00/compiler/precision-qualifiers/default-precision-float-01.frag > diff --git > a/tests/spec/glsl-1.00/compiler/precision-qualifiers/default-precision-int-01.frag > b/tests/spec/glsl-es-1.00/compiler/precision-qualifiers/default-precision-int-01.frag > similarity index 100% > rename from > tests/spec/glsl-1.00/compiler/precision-qualifiers/default-precision-int-01.frag > rename to > tests/spec/glsl-es-1.00/compiler/precision-qualifiers/default-precision-int-01.frag > diff --git > a/tests/spec/glsl-1.00/compiler/precision-qualifiers/default-precision-sampler.frag > b/tests/spec/glsl-es-1.00/compiler/precision-qualifiers/default-precision-sampler.frag > similarity index 100% > rename from > tests/spec/glsl-1.00/compiler/precision-qualifiers/default-precision-sampler.frag > rename to > tests/spec/glsl-es-1.00/compiler/precision-qualifiers/default-precision-sampler.frag > diff --git > a/tests/spec/glsl-1.00/compiler/precision-qualifiers/default-precision-sampler.vert > b/tests/spec/glsl-es-1.00/compiler/precision-qualifiers/default-precision-sampler.vert > similarity index 100% > rename from > tests/spec/glsl-1.00/compiler/precision-qualifiers/default-precision-sampler.vert > rename to > tests/spec/glsl-es-1.00/compiler/precision-qualifiers/default-precision-sampler.vert > diff --git > a/tests/spec/glsl-1.00/compiler/precision-qualifiers/default-precision-vec-01.frag > b/tests/spec/glsl-es-1.00/compiler/precision-qualifiers/default-precision-vec-01.frag > similarity index 100% > rename from > tests/spec/glsl-1.00/compiler/precision-qualifiers/default-precision-vec-01.frag > rename to > tests/spec/glsl-es-1.00/compiler/precision-qualifiers/default-precision-vec-01.frag > diff --git > a/tests/spec/glsl-1.00/compiler/precision-qualifiers/precision-bool-01.frag > b/tests/spec/glsl-es-1.00/compiler/precision-qualifiers/precision-bool-01.frag > similarity index 100% > rename from > tests/spec/glsl-1.00/compiler/precision-qualifiers/precision-bool-01.frag > rename to > tests/spec/glsl-es-1.00/compiler/precision-qualifiers/precision-bool-01.frag > diff --git > a/tests/spec/glsl-1.00/compiler/precision-qualifiers/precision-bool-02.frag > b/tests/spec/glsl-es-1.00/compiler/precision-qualifiers/precision-bool-02.frag > similarity index 100% > rename from > tests/spec/glsl-1.00/compiler/precision-qualifiers/precision-bool-02.frag > rename to > tests/spec/glsl-es-1.00/compiler/precision-qualifiers/precision-bool-02.frag > diff --git > a/tests/spec/glsl-1.00/compiler/precision-qualifiers/precision-float-01.frag > b/tests/spec/glsl-es-1.00/compiler/precision-qualifiers/precision-float-01.frag > similarity index 100% > rename from > tests/spec/glsl-1.00/compiler/precision-qualifiers/precision-float-01.frag > rename to > tests/spec/glsl-es-1.00/compiler/precision-qualifiers/precision-float-01.frag > diff --git > a/tests/spec/glsl-1.00/compiler/precision-qualifiers/precision-float-02.frag > b/tests/spec/glsl-es-1.00/compiler/precision-qualifiers/precision-float-02.frag > similarity index 100% > rename from > tests/spec/glsl-1.00/compiler/precision-qualifiers/precision-float-02.frag > rename to > tests/spec/glsl-es-1.00/compiler/precision-qualifiers/precision-float-02.frag > diff --git > a/tests/spec/glsl-1.00/compiler/precision-qualifiers/precision-float-03.frag > b/tests/spec/glsl-es-1.00/compiler/precision-qualifiers/precision-float-03.frag > similarity index 100% > rename from > tests/spec/glsl-1.00/compiler/precision-qualifiers/precision-float-03.frag > rename to > tests/spec/glsl-es-1.00/compiler/precision-qualifiers/precision-float-03.frag > diff --git > a/tests/spec/glsl-1.00/compiler/precision-qualifiers/precision-float-04.frag > b/tests/spec/glsl-es-1.00/compiler/precision-qualifiers/precision-float-04.frag > similarity index 100% > rename from > tests/spec/glsl-1.00/compiler/precision-qualifiers/precision-float-04.frag > rename to > tests/spec/glsl-es-1.00/compiler/precision-qualifiers/precision-float-04.frag > diff --git > a/tests/spec/glsl-1.00/compiler/precision-qualifiers/precision-fs-highp-01.frag > b/tests/spec/glsl-es-1.00/compiler/precision-qualifiers/precision-fs-highp-01.frag > similarity index 100% > rename from > tests/spec/glsl-1.00/compiler/precision-qualifiers/precision-fs-highp-01.frag > rename to > tests/spec/glsl-es-1.00/compiler/precision-qualifiers/precision-fs-highp-01.frag > diff --git > a/tests/spec/glsl-1.00/compiler/precision-qualifiers/precision-fs-highp-02.frag > b/tests/spec/glsl-es-1.00/compiler/precision-qualifiers/precision-fs-highp-02.frag > similarity index 100% > rename from > tests/spec/glsl-1.00/compiler/precision-qualifiers/precision-fs-highp-02.frag > rename to > tests/spec/glsl-es-1.00/compiler/precision-qualifiers/precision-fs-highp-02.frag > diff --git > a/tests/spec/glsl-1.00/compiler/precision-qualifiers/precision-function-param-01.frag > b/tests/spec/glsl-es-1.00/compiler/precision-qualifiers/precision-function-param-01.frag > similarity index 100% > rename from > tests/spec/glsl-1.00/compiler/precision-qualifiers/precision-function-param-01.frag > rename to > tests/spec/glsl-es-1.00/compiler/precision-qualifiers/precision-function-param-01.frag > diff --git > a/tests/spec/glsl-1.00/compiler/precision-qualifiers/precision-global-01.frag > b/tests/spec/glsl-es-1.00/compiler/precision-qualifiers/precision-global-01.frag > similarity index 100% > rename from > tests/spec/glsl-1.00/compiler/precision-qualifiers/precision-global-01.frag > rename to > tests/spec/glsl-es-1.00/compiler/precision-qualifiers/precision-global-01.frag > diff --git > a/tests/spec/glsl-1.00/compiler/precision-qualifiers/precision-int-01.frag > b/tests/spec/glsl-es-1.00/compiler/precision-qualifiers/precision-int-01.frag > similarity index 100% > rename from > tests/spec/glsl-1.00/compiler/precision-qualifiers/precision-int-01.frag > rename to > tests/spec/glsl-es-1.00/compiler/precision-qualifiers/precision-int-01.frag > diff --git > a/tests/spec/glsl-1.00/compiler/precision-qualifiers/precision-int-02.frag > b/tests/spec/glsl-es-1.00/compiler/precision-qualifiers/precision-int-02.frag > similarity index 100% > rename from > tests/spec/glsl-1.00/compiler/precision-qualifiers/precision-int-02.frag > rename to > tests/spec/glsl-es-1.00/compiler/precision-qualifiers/precision-int-02.frag > diff --git > a/tests/spec/glsl-1.00/compiler/precision-qualifiers/precision-int-03.frag > b/tests/spec/glsl-es-1.00/compiler/precision-qualifiers/precision-int-03.frag > similarity index 100% > rename from > tests/spec/glsl-1.00/compiler/precision-qualifiers/precision-int-03.frag > rename to > tests/spec/glsl-es-1.00/compiler/precision-qualifiers/precision-int-03.frag > diff --git > a/tests/spec/glsl-1.00/compiler/precision-qualifiers/precision-literal-const-01.frag > b/tests/spec/glsl-es-1.00/compiler/precision-qualifiers/precision-literal-const-01.frag > similarity index 100% > rename from > tests/spec/glsl-1.00/compiler/precision-qualifiers/precision-literal-const-01.frag > rename to > tests/spec/glsl-es-1.00/compiler/precision-qualifiers/precision-literal-const-01.frag > diff --git > a/tests/spec/glsl-1.00/compiler/precision-qualifiers/precision-literal-const-02.frag > b/tests/spec/glsl-es-1.00/compiler/precision-qualifiers/precision-literal-const-02.frag > similarity index 100% > rename from > tests/spec/glsl-1.00/compiler/precision-qualifiers/precision-literal-const-02.frag > rename to > tests/spec/glsl-es-1.00/compiler/precision-qualifiers/precision-literal-const-02.frag > diff --git > a/tests/spec/glsl-1.00/compiler/precision-qualifiers/precision-local-01.frag > b/tests/spec/glsl-es-1.00/compiler/precision-qualifiers/precision-local-01.frag > similarity index 100% > rename from > tests/spec/glsl-1.00/compiler/precision-qualifiers/precision-local-01.frag > rename to > tests/spec/glsl-es-1.00/compiler/precision-qualifiers/precision-local-01.frag > diff --git > a/tests/spec/glsl-1.00/compiler/precision-qualifiers/precision-struct-01.frag > b/tests/spec/glsl-es-1.00/compiler/precision-qualifiers/precision-struct-01.frag > similarity index 100% > rename from > tests/spec/glsl-1.00/compiler/precision-qualifiers/precision-struct-01.frag > rename to > tests/spec/glsl-es-1.00/compiler/precision-qualifiers/precision-struct-01.frag > diff --git > a/tests/spec/glsl-1.00/compiler/precision-qualifiers/precision-struct-02.frag > b/tests/spec/glsl-es-1.00/compiler/precision-qualifiers/precision-struct-02.frag > similarity index 100% > rename from > tests/spec/glsl-1.00/compiler/precision-qualifiers/precision-struct-02.frag > rename to > tests/spec/glsl-es-1.00/compiler/precision-qualifiers/precision-struct-02.frag > diff --git > a/tests/spec/glsl-1.00/compiler/precision-qualifiers/precision-vs-highp-01.vert > b/tests/spec/glsl-es-1.00/compiler/precision-qualifiers/precision-vs-highp-01.vert > similarity index 100% > rename from > tests/spec/glsl-1.00/compiler/precision-qualifiers/precision-vs-highp-01.vert > rename to > tests/spec/glsl-es-1.00/compiler/precision-qualifiers/precision-vs-highp-01.vert > diff --git > a/tests/spec/glsl-1.00/compiler/qualifiers/fn-inout-array-allowed-cstyle.frag > b/tests/spec/glsl-es-1.00/compiler/qualifiers/fn-inout-array-allowed-cstyle.frag > similarity index 100% > rename from > tests/spec/glsl-1.00/compiler/qualifiers/fn-inout-array-allowed-cstyle.frag > rename to > tests/spec/glsl-es-1.00/compiler/qualifiers/fn-inout-array-allowed-cstyle.frag > diff --git > a/tests/spec/glsl-1.00/compiler/qualifiers/fn-inout-array-allowed-cstyle.vert > b/tests/spec/glsl-es-1.00/compiler/qualifiers/fn-inout-array-allowed-cstyle.vert > similarity index 100% > rename from > tests/spec/glsl-1.00/compiler/qualifiers/fn-inout-array-allowed-cstyle.vert > rename to > tests/spec/glsl-es-1.00/compiler/qualifiers/fn-inout-array-allowed-cstyle.vert > diff --git > a/tests/spec/glsl-1.00/compiler/qualifiers/fn-out-array-allowed-cstyle.frag > b/tests/spec/glsl-es-1.00/compiler/qualifiers/fn-out-array-allowed-cstyle.frag > similarity index 100% > rename from > tests/spec/glsl-1.00/compiler/qualifiers/fn-out-array-allowed-cstyle.frag > rename to > tests/spec/glsl-es-1.00/compiler/qualifiers/fn-out-array-allowed-cstyle.frag > diff --git > a/tests/spec/glsl-1.00/compiler/qualifiers/fn-out-array-allowed-cstyle.vert > b/tests/spec/glsl-es-1.00/compiler/qualifiers/fn-out-array-allowed-cstyle.vert > similarity index 100% > rename from > tests/spec/glsl-1.00/compiler/qualifiers/fn-out-array-allowed-cstyle.vert > rename to > tests/spec/glsl-es-1.00/compiler/qualifiers/fn-out-array-allowed-cstyle.vert > diff --git > a/tests/spec/glsl-1.00/compiler/storage-qualfiers/static-write-attribute-01.vert > b/tests/spec/glsl-es-1.00/compiler/storage-qualfiers/static-write-attribute-01.vert > similarity index 100% > rename from > tests/spec/glsl-1.00/compiler/storage-qualfiers/static-write-attribute-01.vert > rename to > tests/spec/glsl-es-1.00/compiler/storage-qualfiers/static-write-attribute-01.vert > diff --git > a/tests/spec/glsl-1.00/compiler/storage-qualfiers/static-write-attribute-02.vert > b/tests/spec/glsl-es-1.00/compiler/storage-qualfiers/static-write-attribute-02.vert > similarity index 100% > rename from > tests/spec/glsl-1.00/compiler/storage-qualfiers/static-write-attribute-02.vert > rename to > tests/spec/glsl-es-1.00/compiler/storage-qualfiers/static-write-attribute-02.vert > diff --git > a/tests/spec/glsl-1.00/compiler/storage-qualfiers/static-write-varying-01.frag > b/tests/spec/glsl-es-1.00/compiler/storage-qualfiers/static-write-varying-01.frag > similarity index 100% > rename from > tests/spec/glsl-1.00/compiler/storage-qualfiers/static-write-varying-01.frag > rename to > tests/spec/glsl-es-1.00/compiler/storage-qualfiers/static-write-varying-01.frag > diff --git > a/tests/spec/glsl-1.00/compiler/storage-qualfiers/static-write-varying-02.frag > b/tests/spec/glsl-es-1.00/compiler/storage-qualfiers/static-write-varying-02.frag > similarity index 100% > rename from > tests/spec/glsl-1.00/compiler/storage-qualfiers/static-write-varying-02.frag > rename to > tests/spec/glsl-es-1.00/compiler/storage-qualfiers/static-write-varying-02.frag > -- > 1.7.10.4 > > _______________________________________________ > Piglit mailing list > Piglit@lists.freedesktop.org > http://lists.freedesktop.org/mailman/listinfo/piglit >
diff --git a/tests/all.tests b/tests/all.tests index 4ce315f..3b8b83a 100644 --- a/tests/all.tests +++ b/tests/all.tests @@ -684,11 +684,14 @@ spec['!OpenGL 3.1'] = gl31 gl31['genned-names'] = concurrent_test('gl-3.1-genned-names') gl31['minmax'] = concurrent_test('gl-3.1-minmax') -# Group spec/glsl-1.00 -spec['glsl-1.00'] = Group() -import_glsl_parser_tests(spec['glsl-1.00'], - os.path.join(testsDir, 'spec', 'glsl-1.00'), +# Group spec/glsl-es-1.00 +spec['glsl-es-1.00'] = Group() +import_glsl_parser_tests(spec['glsl-es-1.00'], + os.path.join(testsDir, 'spec', 'glsl-es-1.00'), ['compiler']) +add_shader_test_dir(spec['glsl-es-1.00']['execution'], + os.path.join(testsDir, 'spec', 'glsl-es-1.00', 'execution'), + recursive=True) # Group spec/glsl-1.10 spec['glsl-1.10'] = Group() diff --git a/tests/spec/glsl-1.00/compiler/arithmetic-operators/division-by-zero-01.frag b/tests/spec/glsl-es-1.00/compiler/arithmetic-operators/division-by-zero-01.frag similarity index 99% rename from tests/spec/glsl-1.00/compiler/arithmetic-operators/division-by-zero-01.frag rename to tests/spec/glsl-es-1.00/compiler/arithmetic-operators/division-by-zero-01.frag index a3dda0e..33094f7 100644 --- a/tests/spec/glsl-1.00/compiler/arithmetic-operators/division-by-zero-01.frag +++ b/tests/spec/glsl-es-1.00/compiler/arithmetic-operators/division-by-zero-01.frag @@ -16,4 +16,3 @@ f() { float x = 1.0 / 0.0; return x; } - diff --git a/tests/spec/glsl-1.00/compiler/arithmetic-operators/division-by-zero-02.frag b/tests/spec/glsl-es-1.00/compiler/arithmetic-operators/division-by-zero-02.frag similarity index 99% rename from tests/spec/glsl-1.00/compiler/arithmetic-operators/division-by-zero-02.frag rename to tests/spec/glsl-es-1.00/compiler/arithmetic-operators/division-by-zero-02.frag index a93ed7f..f195214 100644 --- a/tests/spec/glsl-1.00/compiler/arithmetic-operators/division-by-zero-02.frag +++ b/tests/spec/glsl-es-1.00/compiler/arithmetic-operators/division-by-zero-02.frag @@ -16,4 +16,3 @@ f() { int x = 1 / 0; return x; } - diff --git a/tests/spec/glsl-1.00/compiler/arithmetic-operators/modulus-00.frag b/tests/spec/glsl-es-1.00/compiler/arithmetic-operators/modulus-00.frag similarity index 99% rename from tests/spec/glsl-1.00/compiler/arithmetic-operators/modulus-00.frag rename to tests/spec/glsl-es-1.00/compiler/arithmetic-operators/modulus-00.frag index 8032e7a..1204c6f 100644 --- a/tests/spec/glsl-1.00/compiler/arithmetic-operators/modulus-00.frag +++ b/tests/spec/glsl-es-1.00/compiler/arithmetic-operators/modulus-00.frag @@ -15,4 +15,3 @@ f() { int tea_time = 15 % 24; return tea_time; } - diff --git a/tests/spec/glsl-1.00/compiler/assignment-operators/assign-array-prohibited.frag b/tests/spec/glsl-es-1.00/compiler/assignment-operators/assign-array-prohibited.frag similarity index 100% rename from tests/spec/glsl-1.00/compiler/assignment-operators/assign-array-prohibited.frag rename to tests/spec/glsl-es-1.00/compiler/assignment-operators/assign-array-prohibited.frag diff --git a/tests/spec/glsl-1.00/compiler/assignment-operators/assign-array-prohibited.vert b/tests/spec/glsl-es-1.00/compiler/assignment-operators/assign-array-prohibited.vert similarity index 100% rename from tests/spec/glsl-1.00/compiler/assignment-operators/assign-array-prohibited.vert rename to tests/spec/glsl-es-1.00/compiler/assignment-operators/assign-array-prohibited.vert diff --git a/tests/spec/glsl-1.00/compiler/assignment-operators/modulus-assign-00.frag b/tests/spec/glsl-es-1.00/compiler/assignment-operators/modulus-assign-00.frag similarity index 99% rename from tests/spec/glsl-1.00/compiler/assignment-operators/modulus-assign-00.frag rename to tests/spec/glsl-es-1.00/compiler/assignment-operators/modulus-assign-00.frag index c89e218..7b35a9a 100644 --- a/tests/spec/glsl-1.00/compiler/assignment-operators/modulus-assign-00.frag +++ b/tests/spec/glsl-es-1.00/compiler/assignment-operators/modulus-assign-00.frag @@ -18,4 +18,3 @@ f() { x %= 4; return x; } -
Move contents of glsl-1.00 to the glsl-es-1.00 directory. Remove a few blank lines at the end of 4 tests so that git is happy. Last fix up all.tests so that all shader and glslparser tests for glsl-es-1.00 are listed and referenced in the new directory. V2: patch squashed and generated with --find-renames Signed-off-by: Tom Gall <tom.gall@linaro.org> --- tests/all.tests | 11 +++++++---- .../compiler/arithmetic-operators/division-by-zero-01.frag | 1 - .../compiler/arithmetic-operators/division-by-zero-02.frag | 1 - .../compiler/arithmetic-operators/modulus-00.frag | 1 - .../assignment-operators/assign-array-prohibited.frag | 0 .../assignment-operators/assign-array-prohibited.vert | 0 .../compiler/assignment-operators/modulus-assign-00.frag | 1 - .../precision-qualifiers/default-precision-bool-01.frag | 0 .../precision-qualifiers/default-precision-float-01.frag | 0 .../precision-qualifiers/default-precision-int-01.frag | 0 .../precision-qualifiers/default-precision-sampler.frag | 0 .../precision-qualifiers/default-precision-sampler.vert | 0 .../precision-qualifiers/default-precision-vec-01.frag | 0 .../compiler/precision-qualifiers/precision-bool-01.frag | 0 .../compiler/precision-qualifiers/precision-bool-02.frag | 0 .../compiler/precision-qualifiers/precision-float-01.frag | 0 .../compiler/precision-qualifiers/precision-float-02.frag | 0 .../compiler/precision-qualifiers/precision-float-03.frag | 0 .../compiler/precision-qualifiers/precision-float-04.frag | 0 .../precision-qualifiers/precision-fs-highp-01.frag | 0 .../precision-qualifiers/precision-fs-highp-02.frag | 0 .../precision-qualifiers/precision-function-param-01.frag | 0 .../compiler/precision-qualifiers/precision-global-01.frag | 0 .../compiler/precision-qualifiers/precision-int-01.frag | 0 .../compiler/precision-qualifiers/precision-int-02.frag | 0 .../compiler/precision-qualifiers/precision-int-03.frag | 0 .../precision-qualifiers/precision-literal-const-01.frag | 0 .../precision-qualifiers/precision-literal-const-02.frag | 0 .../compiler/precision-qualifiers/precision-local-01.frag | 0 .../compiler/precision-qualifiers/precision-struct-01.frag | 0 .../compiler/precision-qualifiers/precision-struct-02.frag | 0 .../precision-qualifiers/precision-vs-highp-01.vert | 0 .../compiler/qualifiers/fn-inout-array-allowed-cstyle.frag | 0 .../compiler/qualifiers/fn-inout-array-allowed-cstyle.vert | 0 .../compiler/qualifiers/fn-out-array-allowed-cstyle.frag | 0 .../compiler/qualifiers/fn-out-array-allowed-cstyle.vert | 0 .../storage-qualfiers/static-write-attribute-01.vert | 0 .../storage-qualfiers/static-write-attribute-02.vert | 0 .../compiler/storage-qualfiers/static-write-varying-01.frag | 0 .../compiler/storage-qualfiers/static-write-varying-02.frag | 0 40 files changed, 7 insertions(+), 8 deletions(-) rename tests/spec/{glsl-1.00 => glsl-es-1.00}/compiler/arithmetic-operators/division-by-zero-01.frag (99%) rename tests/spec/{glsl-1.00 => glsl-es-1.00}/compiler/arithmetic-operators/division-by-zero-02.frag (99%) rename tests/spec/{glsl-1.00 => glsl-es-1.00}/compiler/arithmetic-operators/modulus-00.frag (99%) rename tests/spec/{glsl-1.00 => glsl-es-1.00}/compiler/assignment-operators/assign-array-prohibited.frag (100%) rename tests/spec/{glsl-1.00 => glsl-es-1.00}/compiler/assignment-operators/assign-array-prohibited.vert (100%) rename tests/spec/{glsl-1.00 => glsl-es-1.00}/compiler/assignment-operators/modulus-assign-00.frag (99%) rename tests/spec/{glsl-1.00 => glsl-es-1.00}/compiler/precision-qualifiers/default-precision-bool-01.frag (100%) rename tests/spec/{glsl-1.00 => glsl-es-1.00}/compiler/precision-qualifiers/default-precision-float-01.frag (100%) rename tests/spec/{glsl-1.00 => glsl-es-1.00}/compiler/precision-qualifiers/default-precision-int-01.frag (100%) rename tests/spec/{glsl-1.00 => glsl-es-1.00}/compiler/precision-qualifiers/default-precision-sampler.frag (100%) rename tests/spec/{glsl-1.00 => glsl-es-1.00}/compiler/precision-qualifiers/default-precision-sampler.vert (100%) rename tests/spec/{glsl-1.00 => glsl-es-1.00}/compiler/precision-qualifiers/default-precision-vec-01.frag (100%) rename tests/spec/{glsl-1.00 => glsl-es-1.00}/compiler/precision-qualifiers/precision-bool-01.frag (100%) rename tests/spec/{glsl-1.00 => glsl-es-1.00}/compiler/precision-qualifiers/precision-bool-02.frag (100%) rename tests/spec/{glsl-1.00 => glsl-es-1.00}/compiler/precision-qualifiers/precision-float-01.frag (100%) rename tests/spec/{glsl-1.00 => glsl-es-1.00}/compiler/precision-qualifiers/precision-float-02.frag (100%) rename tests/spec/{glsl-1.00 => glsl-es-1.00}/compiler/precision-qualifiers/precision-float-03.frag (100%) rename tests/spec/{glsl-1.00 => glsl-es-1.00}/compiler/precision-qualifiers/precision-float-04.frag (100%) rename tests/spec/{glsl-1.00 => glsl-es-1.00}/compiler/precision-qualifiers/precision-fs-highp-01.frag (100%) rename tests/spec/{glsl-1.00 => glsl-es-1.00}/compiler/precision-qualifiers/precision-fs-highp-02.frag (100%) rename tests/spec/{glsl-1.00 => glsl-es-1.00}/compiler/precision-qualifiers/precision-function-param-01.frag (100%) rename tests/spec/{glsl-1.00 => glsl-es-1.00}/compiler/precision-qualifiers/precision-global-01.frag (100%) rename tests/spec/{glsl-1.00 => glsl-es-1.00}/compiler/precision-qualifiers/precision-int-01.frag (100%) rename tests/spec/{glsl-1.00 => glsl-es-1.00}/compiler/precision-qualifiers/precision-int-02.frag (100%) rename tests/spec/{glsl-1.00 => glsl-es-1.00}/compiler/precision-qualifiers/precision-int-03.frag (100%) rename tests/spec/{glsl-1.00 => glsl-es-1.00}/compiler/precision-qualifiers/precision-literal-const-01.frag (100%) rename tests/spec/{glsl-1.00 => glsl-es-1.00}/compiler/precision-qualifiers/precision-literal-const-02.frag (100%) rename tests/spec/{glsl-1.00 => glsl-es-1.00}/compiler/precision-qualifiers/precision-local-01.frag (100%) rename tests/spec/{glsl-1.00 => glsl-es-1.00}/compiler/precision-qualifiers/precision-struct-01.frag (100%) rename tests/spec/{glsl-1.00 => glsl-es-1.00}/compiler/precision-qualifiers/precision-struct-02.frag (100%) rename tests/spec/{glsl-1.00 => glsl-es-1.00}/compiler/precision-qualifiers/precision-vs-highp-01.vert (100%) rename tests/spec/{glsl-1.00 => glsl-es-1.00}/compiler/qualifiers/fn-inout-array-allowed-cstyle.frag (100%) rename tests/spec/{glsl-1.00 => glsl-es-1.00}/compiler/qualifiers/fn-inout-array-allowed-cstyle.vert (100%) rename tests/spec/{glsl-1.00 => glsl-es-1.00}/compiler/qualifiers/fn-out-array-allowed-cstyle.frag (100%) rename tests/spec/{glsl-1.00 => glsl-es-1.00}/compiler/qualifiers/fn-out-array-allowed-cstyle.vert (100%) rename tests/spec/{glsl-1.00 => glsl-es-1.00}/compiler/storage-qualfiers/static-write-attribute-01.vert (100%) rename tests/spec/{glsl-1.00 => glsl-es-1.00}/compiler/storage-qualfiers/static-write-attribute-02.vert (100%) rename tests/spec/{glsl-1.00 => glsl-es-1.00}/compiler/storage-qualfiers/static-write-varying-01.frag (100%) rename tests/spec/{glsl-1.00 => glsl-es-1.00}/compiler/storage-qualfiers/static-write-varying-02.frag (100%) diff --git a/tests/spec/glsl-1.00/compiler/precision-qualifiers/default-precision-bool-01.frag b/tests/spec/glsl-es-1.00/compiler/precision-qualifiers/default-precision-bool-01.frag similarity index 100% rename from tests/spec/glsl-1.00/compiler/precision-qualifiers/default-precision-bool-01.frag rename to tests/spec/glsl-es-1.00/compiler/precision-qualifiers/default-precision-bool-01.frag diff --git a/tests/spec/glsl-1.00/compiler/precision-qualifiers/default-precision-float-01.frag b/tests/spec/glsl-es-1.00/compiler/precision-qualifiers/default-precision-float-01.frag similarity index 100% rename from tests/spec/glsl-1.00/compiler/precision-qualifiers/default-precision-float-01.frag rename to tests/spec/glsl-es-1.00/compiler/precision-qualifiers/default-precision-float-01.frag diff --git a/tests/spec/glsl-1.00/compiler/precision-qualifiers/default-precision-int-01.frag b/tests/spec/glsl-es-1.00/compiler/precision-qualifiers/default-precision-int-01.frag similarity index 100% rename from tests/spec/glsl-1.00/compiler/precision-qualifiers/default-precision-int-01.frag rename to tests/spec/glsl-es-1.00/compiler/precision-qualifiers/default-precision-int-01.frag diff --git a/tests/spec/glsl-1.00/compiler/precision-qualifiers/default-precision-sampler.frag b/tests/spec/glsl-es-1.00/compiler/precision-qualifiers/default-precision-sampler.frag similarity index 100% rename from tests/spec/glsl-1.00/compiler/precision-qualifiers/default-precision-sampler.frag rename to tests/spec/glsl-es-1.00/compiler/precision-qualifiers/default-precision-sampler.frag diff --git a/tests/spec/glsl-1.00/compiler/precision-qualifiers/default-precision-sampler.vert b/tests/spec/glsl-es-1.00/compiler/precision-qualifiers/default-precision-sampler.vert similarity index 100% rename from tests/spec/glsl-1.00/compiler/precision-qualifiers/default-precision-sampler.vert rename to tests/spec/glsl-es-1.00/compiler/precision-qualifiers/default-precision-sampler.vert diff --git a/tests/spec/glsl-1.00/compiler/precision-qualifiers/default-precision-vec-01.frag b/tests/spec/glsl-es-1.00/compiler/precision-qualifiers/default-precision-vec-01.frag similarity index 100% rename from tests/spec/glsl-1.00/compiler/precision-qualifiers/default-precision-vec-01.frag rename to tests/spec/glsl-es-1.00/compiler/precision-qualifiers/default-precision-vec-01.frag diff --git a/tests/spec/glsl-1.00/compiler/precision-qualifiers/precision-bool-01.frag b/tests/spec/glsl-es-1.00/compiler/precision-qualifiers/precision-bool-01.frag similarity index 100% rename from tests/spec/glsl-1.00/compiler/precision-qualifiers/precision-bool-01.frag rename to tests/spec/glsl-es-1.00/compiler/precision-qualifiers/precision-bool-01.frag diff --git a/tests/spec/glsl-1.00/compiler/precision-qualifiers/precision-bool-02.frag b/tests/spec/glsl-es-1.00/compiler/precision-qualifiers/precision-bool-02.frag similarity index 100% rename from tests/spec/glsl-1.00/compiler/precision-qualifiers/precision-bool-02.frag rename to tests/spec/glsl-es-1.00/compiler/precision-qualifiers/precision-bool-02.frag diff --git a/tests/spec/glsl-1.00/compiler/precision-qualifiers/precision-float-01.frag b/tests/spec/glsl-es-1.00/compiler/precision-qualifiers/precision-float-01.frag similarity index 100% rename from tests/spec/glsl-1.00/compiler/precision-qualifiers/precision-float-01.frag rename to tests/spec/glsl-es-1.00/compiler/precision-qualifiers/precision-float-01.frag diff --git a/tests/spec/glsl-1.00/compiler/precision-qualifiers/precision-float-02.frag b/tests/spec/glsl-es-1.00/compiler/precision-qualifiers/precision-float-02.frag similarity index 100% rename from tests/spec/glsl-1.00/compiler/precision-qualifiers/precision-float-02.frag rename to tests/spec/glsl-es-1.00/compiler/precision-qualifiers/precision-float-02.frag diff --git a/tests/spec/glsl-1.00/compiler/precision-qualifiers/precision-float-03.frag b/tests/spec/glsl-es-1.00/compiler/precision-qualifiers/precision-float-03.frag similarity index 100% rename from tests/spec/glsl-1.00/compiler/precision-qualifiers/precision-float-03.frag rename to tests/spec/glsl-es-1.00/compiler/precision-qualifiers/precision-float-03.frag diff --git a/tests/spec/glsl-1.00/compiler/precision-qualifiers/precision-float-04.frag b/tests/spec/glsl-es-1.00/compiler/precision-qualifiers/precision-float-04.frag similarity index 100% rename from tests/spec/glsl-1.00/compiler/precision-qualifiers/precision-float-04.frag rename to tests/spec/glsl-es-1.00/compiler/precision-qualifiers/precision-float-04.frag diff --git a/tests/spec/glsl-1.00/compiler/precision-qualifiers/precision-fs-highp-01.frag b/tests/spec/glsl-es-1.00/compiler/precision-qualifiers/precision-fs-highp-01.frag similarity index 100% rename from tests/spec/glsl-1.00/compiler/precision-qualifiers/precision-fs-highp-01.frag rename to tests/spec/glsl-es-1.00/compiler/precision-qualifiers/precision-fs-highp-01.frag diff --git a/tests/spec/glsl-1.00/compiler/precision-qualifiers/precision-fs-highp-02.frag b/tests/spec/glsl-es-1.00/compiler/precision-qualifiers/precision-fs-highp-02.frag similarity index 100% rename from tests/spec/glsl-1.00/compiler/precision-qualifiers/precision-fs-highp-02.frag rename to tests/spec/glsl-es-1.00/compiler/precision-qualifiers/precision-fs-highp-02.frag diff --git a/tests/spec/glsl-1.00/compiler/precision-qualifiers/precision-function-param-01.frag b/tests/spec/glsl-es-1.00/compiler/precision-qualifiers/precision-function-param-01.frag similarity index 100% rename from tests/spec/glsl-1.00/compiler/precision-qualifiers/precision-function-param-01.frag rename to tests/spec/glsl-es-1.00/compiler/precision-qualifiers/precision-function-param-01.frag diff --git a/tests/spec/glsl-1.00/compiler/precision-qualifiers/precision-global-01.frag b/tests/spec/glsl-es-1.00/compiler/precision-qualifiers/precision-global-01.frag similarity index 100% rename from tests/spec/glsl-1.00/compiler/precision-qualifiers/precision-global-01.frag rename to tests/spec/glsl-es-1.00/compiler/precision-qualifiers/precision-global-01.frag diff --git a/tests/spec/glsl-1.00/compiler/precision-qualifiers/precision-int-01.frag b/tests/spec/glsl-es-1.00/compiler/precision-qualifiers/precision-int-01.frag similarity index 100% rename from tests/spec/glsl-1.00/compiler/precision-qualifiers/precision-int-01.frag rename to tests/spec/glsl-es-1.00/compiler/precision-qualifiers/precision-int-01.frag diff --git a/tests/spec/glsl-1.00/compiler/precision-qualifiers/precision-int-02.frag b/tests/spec/glsl-es-1.00/compiler/precision-qualifiers/precision-int-02.frag similarity index 100% rename from tests/spec/glsl-1.00/compiler/precision-qualifiers/precision-int-02.frag rename to tests/spec/glsl-es-1.00/compiler/precision-qualifiers/precision-int-02.frag diff --git a/tests/spec/glsl-1.00/compiler/precision-qualifiers/precision-int-03.frag b/tests/spec/glsl-es-1.00/compiler/precision-qualifiers/precision-int-03.frag similarity index 100% rename from tests/spec/glsl-1.00/compiler/precision-qualifiers/precision-int-03.frag rename to tests/spec/glsl-es-1.00/compiler/precision-qualifiers/precision-int-03.frag diff --git a/tests/spec/glsl-1.00/compiler/precision-qualifiers/precision-literal-const-01.frag b/tests/spec/glsl-es-1.00/compiler/precision-qualifiers/precision-literal-const-01.frag similarity index 100% rename from tests/spec/glsl-1.00/compiler/precision-qualifiers/precision-literal-const-01.frag rename to tests/spec/glsl-es-1.00/compiler/precision-qualifiers/precision-literal-const-01.frag diff --git a/tests/spec/glsl-1.00/compiler/precision-qualifiers/precision-literal-const-02.frag b/tests/spec/glsl-es-1.00/compiler/precision-qualifiers/precision-literal-const-02.frag similarity index 100% rename from tests/spec/glsl-1.00/compiler/precision-qualifiers/precision-literal-const-02.frag rename to tests/spec/glsl-es-1.00/compiler/precision-qualifiers/precision-literal-const-02.frag diff --git a/tests/spec/glsl-1.00/compiler/precision-qualifiers/precision-local-01.frag b/tests/spec/glsl-es-1.00/compiler/precision-qualifiers/precision-local-01.frag similarity index 100% rename from tests/spec/glsl-1.00/compiler/precision-qualifiers/precision-local-01.frag rename to tests/spec/glsl-es-1.00/compiler/precision-qualifiers/precision-local-01.frag diff --git a/tests/spec/glsl-1.00/compiler/precision-qualifiers/precision-struct-01.frag b/tests/spec/glsl-es-1.00/compiler/precision-qualifiers/precision-struct-01.frag similarity index 100% rename from tests/spec/glsl-1.00/compiler/precision-qualifiers/precision-struct-01.frag rename to tests/spec/glsl-es-1.00/compiler/precision-qualifiers/precision-struct-01.frag diff --git a/tests/spec/glsl-1.00/compiler/precision-qualifiers/precision-struct-02.frag b/tests/spec/glsl-es-1.00/compiler/precision-qualifiers/precision-struct-02.frag similarity index 100% rename from tests/spec/glsl-1.00/compiler/precision-qualifiers/precision-struct-02.frag rename to tests/spec/glsl-es-1.00/compiler/precision-qualifiers/precision-struct-02.frag diff --git a/tests/spec/glsl-1.00/compiler/precision-qualifiers/precision-vs-highp-01.vert b/tests/spec/glsl-es-1.00/compiler/precision-qualifiers/precision-vs-highp-01.vert similarity index 100% rename from tests/spec/glsl-1.00/compiler/precision-qualifiers/precision-vs-highp-01.vert rename to tests/spec/glsl-es-1.00/compiler/precision-qualifiers/precision-vs-highp-01.vert diff --git a/tests/spec/glsl-1.00/compiler/qualifiers/fn-inout-array-allowed-cstyle.frag b/tests/spec/glsl-es-1.00/compiler/qualifiers/fn-inout-array-allowed-cstyle.frag similarity index 100% rename from tests/spec/glsl-1.00/compiler/qualifiers/fn-inout-array-allowed-cstyle.frag rename to tests/spec/glsl-es-1.00/compiler/qualifiers/fn-inout-array-allowed-cstyle.frag diff --git a/tests/spec/glsl-1.00/compiler/qualifiers/fn-inout-array-allowed-cstyle.vert b/tests/spec/glsl-es-1.00/compiler/qualifiers/fn-inout-array-allowed-cstyle.vert similarity index 100% rename from tests/spec/glsl-1.00/compiler/qualifiers/fn-inout-array-allowed-cstyle.vert rename to tests/spec/glsl-es-1.00/compiler/qualifiers/fn-inout-array-allowed-cstyle.vert diff --git a/tests/spec/glsl-1.00/compiler/qualifiers/fn-out-array-allowed-cstyle.frag b/tests/spec/glsl-es-1.00/compiler/qualifiers/fn-out-array-allowed-cstyle.frag similarity index 100% rename from tests/spec/glsl-1.00/compiler/qualifiers/fn-out-array-allowed-cstyle.frag rename to tests/spec/glsl-es-1.00/compiler/qualifiers/fn-out-array-allowed-cstyle.frag diff --git a/tests/spec/glsl-1.00/compiler/qualifiers/fn-out-array-allowed-cstyle.vert b/tests/spec/glsl-es-1.00/compiler/qualifiers/fn-out-array-allowed-cstyle.vert similarity index 100% rename from tests/spec/glsl-1.00/compiler/qualifiers/fn-out-array-allowed-cstyle.vert rename to tests/spec/glsl-es-1.00/compiler/qualifiers/fn-out-array-allowed-cstyle.vert diff --git a/tests/spec/glsl-1.00/compiler/storage-qualfiers/static-write-attribute-01.vert b/tests/spec/glsl-es-1.00/compiler/storage-qualfiers/static-write-attribute-01.vert similarity index 100% rename from tests/spec/glsl-1.00/compiler/storage-qualfiers/static-write-attribute-01.vert rename to tests/spec/glsl-es-1.00/compiler/storage-qualfiers/static-write-attribute-01.vert diff --git a/tests/spec/glsl-1.00/compiler/storage-qualfiers/static-write-attribute-02.vert b/tests/spec/glsl-es-1.00/compiler/storage-qualfiers/static-write-attribute-02.vert similarity index 100% rename from tests/spec/glsl-1.00/compiler/storage-qualfiers/static-write-attribute-02.vert rename to tests/spec/glsl-es-1.00/compiler/storage-qualfiers/static-write-attribute-02.vert diff --git a/tests/spec/glsl-1.00/compiler/storage-qualfiers/static-write-varying-01.frag b/tests/spec/glsl-es-1.00/compiler/storage-qualfiers/static-write-varying-01.frag similarity index 100% rename from tests/spec/glsl-1.00/compiler/storage-qualfiers/static-write-varying-01.frag rename to tests/spec/glsl-es-1.00/compiler/storage-qualfiers/static-write-varying-01.frag diff --git a/tests/spec/glsl-1.00/compiler/storage-qualfiers/static-write-varying-02.frag b/tests/spec/glsl-es-1.00/compiler/storage-qualfiers/static-write-varying-02.frag similarity index 100% rename from tests/spec/glsl-1.00/compiler/storage-qualfiers/static-write-varying-02.frag rename to tests/spec/glsl-es-1.00/compiler/storage-qualfiers/static-write-varying-02.frag