gitignore: update gitignore files to match the latest cogl tests

Some cogl tests were renamed in c1247066 to have 'cogl' in their names.
It's a good excuse to merge .gitigore and tests/.gitignore.

diff --git a/.gitignore b/.gitignore
index 27000f5..dde662d 100644 (file)
--- a/.gitignore
+++ b/.gitignore
@@ -110,11 +110,13 @@ TAGS
 /tests/interactive/test-cogl-tex-getset
 /tests/interactive/test-cogl-tex-polygon
 /tests/interactive/test-cogl-tex-tile
+/tests/interactive/test-cogl-vertex-buffer
 /tests/interactive/test-pixmap
 /tests/interactive/test-stage-read-pixels
 /tests/interactive/test-clip
 /tests/interactive/test-layout
 /tests/interactive/test-random-text
+/tests/interactive/test-texture-async
 /tests/interactive/test-texture-quality
 /tests/interactive/test-paint-wrapper
 /tests/interactive/test-devices
@@ -137,6 +139,14 @@ TAGS
 /tests/interactive/stamp-test-interactive
 /tests/conform/stamp-test-conformance
 /tests/conform/test-anchors
+/tests/conform/test-cogl-backface-culling
+/tests/conform/test-cogl-blend-strings
+/tests/conform/test-cogl-fixed
+/tests/conform/test-cogl-materials
+/tests/conform/test-cogl-npot-texture
+/tests/conform/test-cogl-offscreen
+/tests/conform/test-cogl-premult
+/tests/conform/test-color-hls-roundtrip
 /tests/conform/test-conformance
 /tests/conform/test-conformance-results.xml
 /tests/conform/test-conformance-results.html
@@ -173,9 +183,7 @@ TAGS
 /tests/conform/test-mesh-interleved
 /tests/conform/test-mesh-mutability
 /tests/conform/test-paint-opacity
-/tests/conform/test-premult
 /tests/conform/test-rectangle-opacity
-/tests/conform/test-backface-culling
 /tests/conform/test-binding-pool
 /tests/conform/test-text-append-some
 /tests/conform/test-text-cache
@@ -191,25 +199,22 @@ TAGS
 /tests/conform/test-text-set-empty
 /tests/conform/test-text-set-text
 /tests/conform/test-text-utf8-validation
-/tests/conform/test-vertex-buffer-contiguous
-/tests/conform/test-vertex-buffer-interleved
-/tests/conform/test-vertex-buffer-mutability
 /tests/conform/test-list-model-iterate
 /tests/conform/test-list-model-populate
 /tests/conform/test-list-model-filter
-/tests/conform/test-npot-texture
 /tests/conform/redhand.png
 /tests/conform/test-map-recursive
 /tests/conform/test-realize-not-recursive
 /tests/conform/test-shown-not-parented
-/tests/conform/test-blend-strings
 /tests/conform/test-color-from-string
 /tests/conform/test-color-to-string
+/tests/conform/test-cogl-vertex-buffer-contiguous
+/tests/conform/test-cogl-vertex-buffer-interleved
+/tests/conform/test-cogl-vertex-buffer-mutability
 /tests/conform/test-units-constructors
 /tests/conform/test-units-string
 /tests/conform/test-premult
 /tests/conform/test-clone-no-map
-/tests/conform/test-materials
 /tests/conform/test-group-depth-sorting
 /tests/conform/test-conformance-result.xml
 /tests/conform/test-fixed-size

diff --git a/tests/.gitignore b/tests/.gitignore
deleted file mode 100644 (file)
index 3810680..0000000
--- a/tests/.gitignore
+++ /dev/null
@@ -1,52 +0,0 @@
-test-actors
-test-behave
-test-clip
-test-cogl-offscreen
-test-cogl-primitives
-test-cogl-tex-convert
-test-cogl-tex-foreign
-test-cogl-tex-getset
-test-cogl-tex-polygon
-test-cogl-tex-tile
-test-cogl-vertex-buffer
-test-color-hls-roundtrip
-test-depth
-test-devices
-test-effects
-test-entry
-test-entry-auto
-test-events
-test-fbo
-test-fullscreen
-test-grab
-test-invariants
-test-label-cache
-test-layout
-test-model
-test-multistage
-test-offscreen
-test-opacity
-test-paint-wrapper
-test-perspective
-test-pick
-test-pixmap
-test-project
-test-random-text
-test-rotate
-test-scale
-test-score
-test-script
-test-shader
-test-stage-read-pixels
-test-text
-test-texture-async
-test-texture-quality
-test-textures
-test-threads
-test-timeline
-test-timeline-dup-frames
-test-timeline-interpolate
-test-timeline-rewind
-test-timeline-smoothness
-test-unproject
-test-viewport