summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJon TURNEY <jon.turney@dronecode.org.uk>2010-10-12 00:41:30 +0100
committerJon TURNEY <jon.turney@dronecode.org.uk>2014-05-02 14:41:31 +0100
commit189060b2e76c229f9d60c805eb676919ed8868a9 (patch)
treecd3b24ddb9659798ae3fa452494290560b79238c
parentff861928d0fe8b8e1781521484557b8d0fc9aa18 (diff)
Cosmetic fixes for -compare mode
MultiTest::compareOne neglects to report the name of the test which it is comparing the results for Some tests report just "New: FAIL Old: FAIL", omitting the test name and without a trailing '\n', so they run into the next test's results (which is irritating). On further examination, they are using comparePassFail() which would report this information in any case if it was interesting (because the result had changed). GetStringTest::compareOne doesn't emit a newline after reporting the differing strings, and so runs into the output of the next test
-rw-r--r--src/glean/tdepthstencil.cpp6
-rw-r--r--src/glean/tgetstr.cpp12
-rw-r--r--src/glean/tmultitest.cpp6
-rw-r--r--src/glean/treadpixperf.cpp7
-rw-r--r--src/glean/ttexture_srgb.cpp10
5 files changed, 12 insertions, 29 deletions
diff --git a/src/glean/tdepthstencil.cpp b/src/glean/tdepthstencil.cpp
index ad672ef..7ca83f5 100644
--- a/src/glean/tdepthstencil.cpp
+++ b/src/glean/tdepthstencil.cpp
@@ -366,12 +366,6 @@ DepthStencilTest::compareOne(DepthStencilResult &oldR,
env->log << "\t\t\tnew: " << newR.readDepthUshortRate;
}
}
- else {
- env->log << "\tNew: ";
- env->log << (newR.pass ? "PASS" : "FAIL");
- env->log << "\tOld: ";
- env->log << (oldR.pass ? "PASS" : "FAIL");
- }
}
diff --git a/src/glean/tgetstr.cpp b/src/glean/tgetstr.cpp
index 48d6634..5d15ac3 100644
--- a/src/glean/tgetstr.cpp
+++ b/src/glean/tgetstr.cpp
@@ -77,21 +77,21 @@ GetStringTest::compareOne(GetStringResult& oldR, GetStringResult& newR) {
<< newR.config->conciseDescription() << '\n';
if (oldR.vendor != newR.vendor) {
env->log << '\t' << env->options.db1Name
- << " vendor: " << oldR.vendor;
+ << " vendor: " << oldR.vendor << '\n';
env->log << '\t' << env->options.db2Name
- << " vendor: " << newR.vendor;
+ << " vendor: " << newR.vendor << '\n';
}
if (oldR.renderer != newR.renderer) {
env->log << '\t' << env->options.db1Name
- << " renderer: " << oldR.renderer;
+ << " renderer: " << oldR.renderer << '\n';
env->log << '\t' << env->options.db2Name
- << " renderer: " << newR.renderer;
+ << " renderer: " << newR.renderer << '\n';
}
if (oldR.version != newR.version) {
env->log << '\t' << env->options.db1Name
- << " version: " << oldR.version;
+ << " version: " << oldR.version << '\n';
env->log << '\t' << env->options.db2Name
- << " version: " << newR.version;
+ << " version: " << newR.version << '\n';
}
if (oldR.extensions != newR.extensions) {
vector<string> oldExts;
diff --git a/src/glean/tmultitest.cpp b/src/glean/tmultitest.cpp
index a95bd17..a0bbd78 100644
--- a/src/glean/tmultitest.cpp
+++ b/src/glean/tmultitest.cpp
@@ -106,6 +106,12 @@ MultiTest::compareOne(MultiTestResult &oldR,
{
if (oldR.numPassed != newR.numPassed ||
oldR.numFailed != newR.numFailed) {
+ env->log << name
+ << ": DIFF "
+ << newR.config->conciseDescription()
+ << '\n'
+ << '\t';
+
env->log << "Different results: passed: "
<< oldR.numPassed
<< " vs. "
diff --git a/src/glean/treadpixperf.cpp b/src/glean/treadpixperf.cpp
index 813dfdb..836056c 100644
--- a/src/glean/treadpixperf.cpp
+++ b/src/glean/treadpixperf.cpp
@@ -476,13 +476,6 @@ ReadpixPerfTest::compareOne(ReadpixPerfResult &oldR,
}
}
}
- else {
- // one test or the other failed
- env->log << "\tNew: ";
- env->log << (newR.pass ? "PASS" : "FAIL");
- env->log << "\tOld: ";
- env->log << (oldR.pass ? "PASS" : "FAIL");
- }
}
diff --git a/src/glean/ttexture_srgb.cpp b/src/glean/ttexture_srgb.cpp
index a79019c..63ca46b 100644
--- a/src/glean/ttexture_srgb.cpp
+++ b/src/glean/ttexture_srgb.cpp
@@ -322,16 +322,6 @@ TextureSRGBTest::compareOne(TextureSRGBResult &oldR,
TextureSRGBResult &newR)
{
comparePassFail(oldR, newR);
-
- if (newR.pass && oldR.pass == newR.pass) {
- // XXX
- }
- else {
- env->log << "\tNew: ";
- env->log << (newR.pass ? "PASS" : "FAIL");
- env->log << "\tOld: ";
- env->log << (oldR.pass ? "PASS" : "FAIL");
- }
}