MacOS, and likely Windows, doesn't like the fact that we have 2 files each with the following names when the filesystem is case insensitive: glsl-1.10/compiler/literals/invalid-float-suffix-f.vert glsl-1.10/compiler/literals/valid-float-exponent-E.vert glsl-1.20/compiler/literals/valid-float-suffix-F.vert
Symptoms... 1) Working tree only contains 1 file for each name. 2) Unable to pull/rebase/push any commits because git thinks there's outstanding changes. Signed-off-by: Aaron Watry <[email protected]> --- .../glsl-1.10/compiler/literals/invalid-float-suffix-F.vert | 10 ---------- .../compiler/literals/invalid-float-suffix-capital-f.vert | 10 ++++++++++ .../glsl-1.10/compiler/literals/valid-float-exponent-E.vert | 9 --------- .../compiler/literals/valid-float-exponent-capital-e.vert | 9 +++++++++ .../spec/glsl-1.20/compiler/literals/valid-float-suffix-F.vert | 9 --------- .../compiler/literals/valid-float-suffix-capital-f.vert | 9 +++++++++ 6 files changed, 28 insertions(+), 28 deletions(-) delete mode 100644 tests/spec/glsl-1.10/compiler/literals/invalid-float-suffix-F.vert create mode 100644 tests/spec/glsl-1.10/compiler/literals/invalid-float-suffix-capital-f.vert delete mode 100644 tests/spec/glsl-1.10/compiler/literals/valid-float-exponent-E.vert create mode 100644 tests/spec/glsl-1.10/compiler/literals/valid-float-exponent-capital-e.vert delete mode 100644 tests/spec/glsl-1.20/compiler/literals/valid-float-suffix-F.vert create mode 100644 tests/spec/glsl-1.20/compiler/literals/valid-float-suffix-capital-f.vert diff --git a/tests/spec/glsl-1.10/compiler/literals/invalid-float-suffix-F.vert b/tests/spec/glsl-1.10/compiler/literals/invalid-float-suffix-F.vert deleted file mode 100644 index 2022cdb..0000000 --- a/tests/spec/glsl-1.10/compiler/literals/invalid-float-suffix-F.vert +++ /dev/null @@ -1,10 +0,0 @@ -// [config] -// expect_result: fail -// glsl_version: 1.10 -// [end config] - -void main() { - // Float-suffixes are not in GLSL 1.10 - float f = 1.0F; - gl_Position = vec4(1.0); -} diff --git a/tests/spec/glsl-1.10/compiler/literals/invalid-float-suffix-capital-f.vert b/tests/spec/glsl-1.10/compiler/literals/invalid-float-suffix-capital-f.vert new file mode 100644 index 0000000..2022cdb --- /dev/null +++ b/tests/spec/glsl-1.10/compiler/literals/invalid-float-suffix-capital-f.vert @@ -0,0 +1,10 @@ +// [config] +// expect_result: fail +// glsl_version: 1.10 +// [end config] + +void main() { + // Float-suffixes are not in GLSL 1.10 + float f = 1.0F; + gl_Position = vec4(1.0); +} diff --git a/tests/spec/glsl-1.10/compiler/literals/valid-float-exponent-E.vert b/tests/spec/glsl-1.10/compiler/literals/valid-float-exponent-E.vert deleted file mode 100644 index 7678e8e..0000000 --- a/tests/spec/glsl-1.10/compiler/literals/valid-float-exponent-E.vert +++ /dev/null @@ -1,9 +0,0 @@ -// [config] -// expect_result: pass -// glsl_version: 1.10 -// [end config] - -void main() { - vec4 f = vec4(1E5, -1E5, 1E-5, -1E-5); - gl_Position = vec4(1.0); -} diff --git a/tests/spec/glsl-1.10/compiler/literals/valid-float-exponent-capital-e.vert b/tests/spec/glsl-1.10/compiler/literals/valid-float-exponent-capital-e.vert new file mode 100644 index 0000000..7678e8e --- /dev/null +++ b/tests/spec/glsl-1.10/compiler/literals/valid-float-exponent-capital-e.vert @@ -0,0 +1,9 @@ +// [config] +// expect_result: pass +// glsl_version: 1.10 +// [end config] + +void main() { + vec4 f = vec4(1E5, -1E5, 1E-5, -1E-5); + gl_Position = vec4(1.0); +} diff --git a/tests/spec/glsl-1.20/compiler/literals/valid-float-suffix-F.vert b/tests/spec/glsl-1.20/compiler/literals/valid-float-suffix-F.vert deleted file mode 100644 index 1173e3e..0000000 --- a/tests/spec/glsl-1.20/compiler/literals/valid-float-suffix-F.vert +++ /dev/null @@ -1,9 +0,0 @@ -// [config] -// expect_result: pass -// glsl_version: 1.20 -// [end config] - -void main() { - float f = 1.0F; - gl_Position = vec4(1.0); -} diff --git a/tests/spec/glsl-1.20/compiler/literals/valid-float-suffix-capital-f.vert b/tests/spec/glsl-1.20/compiler/literals/valid-float-suffix-capital-f.vert new file mode 100644 index 0000000..1173e3e --- /dev/null +++ b/tests/spec/glsl-1.20/compiler/literals/valid-float-suffix-capital-f.vert @@ -0,0 +1,9 @@ +// [config] +// expect_result: pass +// glsl_version: 1.20 +// [end config] + +void main() { + float f = 1.0F; + gl_Position = vec4(1.0); +} -- 2.0.0 _______________________________________________ Piglit mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/piglit
