diff options
Diffstat (limited to 'Tools/DumpRenderTree/DumpRenderTreeCommon.cpp')
-rw-r--r-- | Tools/DumpRenderTree/DumpRenderTreeCommon.cpp | 35 |
1 files changed, 32 insertions, 3 deletions
diff --git a/Tools/DumpRenderTree/DumpRenderTreeCommon.cpp b/Tools/DumpRenderTree/DumpRenderTreeCommon.cpp index 3cb97ebfd..3c7aa61e8 100644 --- a/Tools/DumpRenderTree/DumpRenderTreeCommon.cpp +++ b/Tools/DumpRenderTree/DumpRenderTreeCommon.cpp @@ -1,3 +1,28 @@ +/* + * Copyright (C) 2016 Apple Inc. All Rights Reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * 1. Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * 2. Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * + * THIS SOFTWARE IS PROVIDED BY APPLE INC. ``AS IS'' AND ANY + * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE + * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR + * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL APPLE INC. OR + * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, + * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, + * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR + * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY + * OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT + * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE + * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + */ + #include "config.h" #include "DumpRenderTree.h" @@ -70,14 +95,18 @@ TestCommand parseInputLine(const std::string& inputLine) result.pathOrURL = arg; while (tokenizer.hasNext()) { arg = tokenizer.next(); - if (arg == std::string("--timeout")) { + if (arg == "--timeout") { std::string timeoutToken = tokenizer.next(); result.timeout = atoi(timeoutToken.c_str()); - } else if (arg == std::string("-p") || arg == std::string("--pixel-test")) { + } else if (arg == "-p" || arg == "--pixel-test") { result.shouldDumpPixels = true; if (tokenizer.hasNext()) result.expectedPixelHash = tokenizer.next(); - } else + } else if (arg == "--dump-jsconsolelog-in-stderr") + result.dumpJSConsoleLogInStdErr = true; + else if (arg == std::string("--absolutePath")) + result.absolutePath = tokenizer.next(); + else die(inputLine); } |