[lvm-devel] master - tests: add extra keyword for timing control

Zdenek Kabelac zkabelac at fedoraproject.org
Mon Apr 20 17:22:01 UTC 2015


Gitweb:        http://git.fedorahosted.org/git/?p=lvm2.git;a=commitdiff;h=85e833c172a0a0403c1de5e6f480a67629e51e36
Commit:        85e833c172a0a0403c1de5e6f480a67629e51e36
Parent:        2b4f10ac668f01e63528ccea71545c06120fa9aa
Author:        Zdenek Kabelac <zkabelac at redhat.com>
AuthorDate:    Mon Apr 20 19:09:02 2015 +0200
Committer:     Zdenek Kabelac <zkabelac at redhat.com>
CommitterDate: Mon Apr 20 19:18:56 2015 +0200

tests: add extra keyword for timing control

Control logging of timer with
"## timing off"  and "## timing on"
---
 test/lib/brick-shelltest.h |    6 ++++--
 1 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/test/lib/brick-shelltest.h b/test/lib/brick-shelltest.h
index 54114db..af8051e 100644
--- a/test/lib/brick-shelltest.h
+++ b/test/lib/brick-shelltest.h
@@ -326,10 +326,12 @@ struct TimedBuffer {
                 data.push_back( incomplete );
                 if (incomplete.second[0] == '#') {
                     /* Disable timing between '## 0 STACKTRACE' & '## teardown' keywords */
-                    if (incomplete.second.find("# 0 STACKTRACE", 1) != std::string::npos) {
+                    if (incomplete.second.find("# 0 STACKTRACE", 1) != std::string::npos ||
+                        incomplete.second.find("# timing off", 1) != std::string::npos) {
                         stamp = false;
                         now = 0;
-                    } else if (incomplete.second.find("# teardown", 1) != std::string::npos) {
+                    } else if (incomplete.second.find("# teardown", 1) != std::string::npos ||
+                               incomplete.second.find("# timing on", 1) != std::string::npos) {
                         stamp = true;
                         now = time( 0 );
                     }




More information about the lvm-devel mailing list