From: Carl Worth <cworth@cworth.org>
Date: Mon, 13 Aug 2012 00:00:38 +0000 (-0700)
Subject: cli: Use new --call-nos=no call to "apitrace dump-images" for consistent results
X-Git-Url: https://git.cworth.org/git?p=apitrace-tests;a=commitdiff_plain;h=cd62fd452d0690d9b9eab2ac51cd8c79fa447ae8

cli: Use new --call-nos=no call to "apitrace dump-images" for consistent results

Recent "apitrace trim" is now dropping uninteresting calls by
default. This means that the call numbers of rendering operations are
changing. Consequently, image comparisons were failing not due to
image-content differences, but simply because the filenames (with
embedded call numbers in them) no longer matched.

We can avoid this problem by using the --call-nos=no option which was
added to "apitrace dump-images" in very recent versions.
---

diff --git a/cli/cli-diff-images-mismatch.script b/cli/cli-diff-images-mismatch.script
index a325479..995b7e5 100644
--- a/cli/cli-diff-images-mismatch.script
+++ b/cli/cli-diff-images-mismatch.script
@@ -2,7 +2,7 @@
 # a trace into an empty directory.
 
 rm_and_mkdir ./tri-out
-apitrace dump-images -o ./tri-out/tri tri.trace
+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
@@ -15,4 +15,4 @@ EXPECT_FAILURE: apitrace diff-images -v ./tri-ref-mismatch ./tri-out
 # also require that "apitrace diff-images" gave us the output we
 # expect.
 
-expect "Comparing ./tri-ref-mismatch/tri0000000027.png and ./tri-out/tri0000000027.png ... MISMATCH\n"
+expect "Comparing ./tri-ref-mismatch/tri0000000000.png and ./tri-out/tri0000000000.png ... MISMATCH\n"
diff --git a/cli/cli-diff-images.script b/cli/cli-diff-images.script
index e575f1a..90d27cc 100644
--- a/cli/cli-diff-images.script
+++ b/cli/cli-diff-images.script
@@ -4,7 +4,7 @@ rm_and_mkdir ./tri-out
 
 # Generate images for every frame (only 1) of a trace
 
-apitrace dump-images -o ./tri-out/tri tri.trace
+apitrace dump-images --call-nos=no -o ./tri-out/tri tri.trace
 
 # Compare the result of "apitrace dump-images" with our reference
 
@@ -15,4 +15,4 @@ apitrace diff-images -v ./tri-ref ./tri-out
 # the other then it would just silently return 0 and this test would
 # incorrectly pass.
 
-expect "Comparing ./tri-ref/tri0000000027.png and ./tri-out/tri0000000027.png ... MATCH\n"
+expect "Comparing ./tri-ref/tri0000000000.png and ./tri-out/tri0000000000.png ... MATCH\n"
diff --git a/cli/cli-trim-single-swapbuffers.script b/cli/cli-trim-single-swapbuffers.script
index 19e10a8..a04ad0e 100644
--- a/cli/cli-trim-single-swapbuffers.script
+++ b/cli/cli-trim-single-swapbuffers.script
@@ -5,11 +5,11 @@ apitrace trim --calls=27 tri.trace
 # Then dump the image and compare to our reference
 
 rm_and_mkdir ./tri-out
-apitrace dump-images -o ./tri-out/tri tri-trim.trace
+apitrace dump-images --call-nos=no -o ./tri-out/tri tri-trim.trace
 apitrace diff-images -v ./tri-ref ./tri-out
 
 # In addition to getting the return value indicating no error, let's
 # also require that "apitrace diff-images" gave us the output we
 # expect.
 
-expect "Comparing ./tri-ref/tri0000000027.png and ./tri-out/tri0000000027.png ... MATCH\n"
+expect "Comparing ./tri-ref/tri0000000000.png and ./tri-out/tri0000000000.png ... MATCH\n"
diff --git a/cli/tri-ref-mismatch/tri0000000000.png b/cli/tri-ref-mismatch/tri0000000000.png
new file mode 100644
index 0000000..e682610
Binary files /dev/null and b/cli/tri-ref-mismatch/tri0000000000.png differ
diff --git a/cli/tri-ref-mismatch/tri0000000027.png b/cli/tri-ref-mismatch/tri0000000027.png
deleted file mode 100644
index e682610..0000000
Binary files a/cli/tri-ref-mismatch/tri0000000027.png and /dev/null differ
diff --git a/cli/tri-ref/tri0000000000.png b/cli/tri-ref/tri0000000000.png
new file mode 100644
index 0000000..b7840bd
Binary files /dev/null and b/cli/tri-ref/tri0000000000.png differ
diff --git a/cli/tri-ref/tri0000000027.png b/cli/tri-ref/tri0000000027.png
deleted file mode 100644
index b7840bd..0000000
Binary files a/cli/tri-ref/tri0000000027.png and /dev/null differ