Title: [104999] trunk/Tools
- Revision
- 104999
- Author
- [email protected]
- Date
- 2012-01-13 15:31:40 -0800 (Fri, 13 Jan 2012)
Log Message
test-webkitpy does not run
https://bugs.webkit.org/show_bug.cgi?id=76318
Unreviewed.
Looks like some conflict markers got left in the file.
* Scripts/webkitpy/test/main.py:
(Tester.run):
Modified Paths
Diff
Modified: trunk/Tools/ChangeLog (104998 => 104999)
--- trunk/Tools/ChangeLog 2012-01-13 23:28:17 UTC (rev 104998)
+++ trunk/Tools/ChangeLog 2012-01-13 23:31:40 UTC (rev 104999)
@@ -1,5 +1,17 @@
2012-01-13 Adam Barth <[email protected]>
+ test-webkitpy does not run
+ https://bugs.webkit.org/show_bug.cgi?id=76318
+
+ Unreviewed.
+
+ Looks like some conflict markers got left in the file.
+
+ * Scripts/webkitpy/test/main.py:
+ (Tester.run):
+
+2012-01-13 Adam Barth <[email protected]>
+
Remove --dry-run support from webkit-patch
https://bugs.webkit.org/show_bug.cgi?id=76300
Modified: trunk/Tools/Scripts/webkitpy/test/main.py (104998 => 104999)
--- trunk/Tools/Scripts/webkitpy/test/main.py 2012-01-13 23:28:17 UTC (rev 104998)
+++ trunk/Tools/Scripts/webkitpy/test/main.py 2012-01-13 23:31:40 UTC (rev 104999)
@@ -144,20 +144,8 @@
handler.addFilter(testing_filter)
def run(self, dirs, args):
-<<<<<<< HEAD
- return not self._run_tests(dirs, self._find_modules(dirs, args))
-
- def _find_modules(self, dirs, modules):
- # FIXME: We should consider moving webkitpy off of using "webkitpy." to prefix
- # all includes. If we did that, then this would use path instead of dirname(path).
- # QueueStatusServer.__init__ has a sys.path import hack due to this code.
- sys.path.extend(set(os.path.dirname(path) for path in dirs))
- if modules:
- return modules
-=======
args = args or self._find_modules(dirs)
return self._run_tests(dirs, args)
->>>>>>> test-webkitpy: clean up handling of test directories, QueueStatusServer
def _find_modules(self, dirs):
modules = []
_______________________________________________
webkit-changes mailing list
[email protected]
http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes
