cli: Don't rely on image generation for diff-image tests.

Use static images instead.

diff --git a/cli/cli-diff-images-mismatch.script b/cli/cli-diff-images-mismatch.script
index 995b7e515235d7dabcd4217a6742cc5bc1f6166c..15446ad7818717c5787519c096f0495757023cbf 100644 (file)
--- a/cli/cli-diff-images-mismatch.script
+++ b/cli/cli-diff-images-mismatch.script
@@ -1,18 +1,7 @@
-# The first two steps are just as in cli-diff-images. Dump images from
-# a trace into an empty directory.
-
-rm_and_mkdir ./tri-out
-apitrace dump-images --call-nos=no -o ./tri-out/tri tri.trace
-
-# Compare the dumped image with a doctored image to provoke a failure.
-# The EXPECT_FAILURE attribute causes the test driver to look for a
-# non-zero return value from apitrace and fail the test if it is not
-# seen.
-
-EXPECT_FAILURE: apitrace diff-images -v ./tri-ref-mismatch ./tri-out
+EXPECT_FAILURE: apitrace diff-images --verbose images/white-1x1/ images/black-1x1/
 
 # In addition to getting the return value indicating an error, let's
 # also require that "apitrace diff-images" gave us the output we
 # expect.
 
-expect "Comparing ./tri-ref-mismatch/tri0000000000.png and ./tri-out/tri0000000000.png ... MISMATCH\n"
+expect "Comparing images/white-1x1/0.png and images/black-1x1/0.png ... MISMATCH\n"

diff --git a/cli/cli-diff-images.script b/cli/cli-diff-images.script
index 90d27cc198f9126e6c5aee00ce681fc0a48ad973..27327d4340b7f081aa053743099a358a43de5d0a 100644 (file)
--- a/cli/cli-diff-images.script
+++ b/cli/cli-diff-images.script
@@ -1,18 +1,8 @@
-# Make a directory for the output images
-
-rm_and_mkdir ./tri-out
-
-# Generate images for every frame (only 1) of a trace
-
-apitrace dump-images --call-nos=no -o ./tri-out/tri tri.trace
-
-# Compare the result of "apitrace dump-images" with our reference
-
-apitrace diff-images -v ./tri-ref ./tri-out
+apitrace diff-images --verbose images/white-1x1/ images/white-1x1/
 
 # Ensure that the "apitrace diff-images" actually did something.  This
 # is important since if it couldn't find images in one directory or
 # the other then it would just silently return 0 and this test would
 # incorrectly pass.
 
-expect "Comparing ./tri-ref/tri0000000000.png and ./tri-out/tri0000000000.png ... MATCH\n"
+expect "Comparing images/white-1x1/0.png and images/white-1x1/0.png ... MATCH\n"

diff --git a/cli/images/black-1x1/0.png b/cli/images/black-1x1/0.png
new file mode 100644 (file)
index 0000000..12b0fd3
Binary files /dev/null and b/cli/images/black-1x1/0.png differ

diff --git a/cli/images/white-1x1/0.png b/cli/images/white-1x1/0.png
new file mode 100644 (file)
index 0000000..9c2dfc7
Binary files /dev/null and b/cli/images/white-1x1/0.png differ