Title: [123738] trunk/Tools
- Revision
- 123738
- Author
- kbal...@webkit.org
- Date
- 2012-07-26 05:43:29 -0700 (Thu, 26 Jul 2012)
Log Message
Unreviewed speculative Mac buildfix after r123729 - 2nd attempt.
* WebKitTestRunner/TestController.cpp:
(WTR::TestController::runTest):
Modified Paths
Diff
Modified: trunk/Tools/ChangeLog (123737 => 123738)
--- trunk/Tools/ChangeLog 2012-07-26 12:38:26 UTC (rev 123737)
+++ trunk/Tools/ChangeLog 2012-07-26 12:43:29 UTC (rev 123738)
@@ -1,5 +1,12 @@
2012-07-26 Balazs Kelemen <kbal...@webkit.org>
+ Unreviewed speculative Mac buildfix after r123729 - 2nd attempt.
+
+ * WebKitTestRunner/TestController.cpp:
+ (WTR::TestController::runTest):
+
+2012-07-26 Balazs Kelemen <kbal...@webkit.org>
+
Unreviewed speculative buildfix after r123729.
* WebKitTestRunner/TestController.cpp:
Modified: trunk/Tools/WebKitTestRunner/TestController.cpp (123737 => 123738)
--- trunk/Tools/WebKitTestRunner/TestController.cpp 2012-07-26 12:38:26 UTC (rev 123737)
+++ trunk/Tools/WebKitTestRunner/TestController.cpp 2012-07-26 12:43:29 UTC (rev 123738)
@@ -525,17 +525,17 @@
size_t secondSeparatorPos = command.find_first_of('\'', firstSeparatorPos + 1);
if (firstSeparatorPos != std::string::npos) {
pathOrURL = std::string(command, 0, firstSeparatorPos);
- int pixelHashPos = firstSeparatorPos + 1;
+ size_t pixelHashPos = firstSeparatorPos + 1;
// NRWT passes --pixel-test if we should dump pixels for the test.
const std::string expectedPixelTestArg("--pixel-test");
std::string argTest = std::string(command, firstSeparatorPos + 1, expectedPixelTestArg.size());
if (argTest == expectedPixelTestArg) {
dumpPixelsTest = true;
- pixelHashPos = secondSeparatorPos == std::string::npos ? -1 : static_cast<int>(secondSeparatorPos + 1);
+ pixelHashPos = secondSeparatorPos == std::string::npos ? std::string::npos : secondSeparatorPos + 1;
}
- if (pixelHashPos != -1 && pixelHashPos < command.size())
- expectedPixelHash = std::string(command, static_cast<size_t>(pixelHashPos));
+ if (pixelHashPos != std::string::npos && pixelHashPos < command.size())
+ expectedPixelHash = std::string(command, pixelHashPos);
}
m_state = RunningTest;
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
http://lists.webkit.org/mailman/listinfo/webkit-changes
