summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Steve Block <steveblock@google.com> 2010-08-18 09:52:35 -0700
committer Android (Google) Code Review <android-gerrit@google.com> 2010-08-18 09:52:35 -0700
commit3374dce303713154b44e06d7034f98c7142fa64d (patch)
treef834f44c8a10a1c221c3e6b2aa3ece0cc43bb5b9
parent0dde5157776c24d37eff566e37b5f70cbc47ed26 (diff)
parent0e4d86fddf2c9664f2fd44247e5688f077b95d5e (diff)
Merge "Fix naming and executable bits on DumpRenderTree2 scripts"
-rwxr-xr-x[-rw-r--r--]tests/DumpRenderTree2/assets/run_apache2.py (renamed from tests/DumpRenderTree2/assets/run-apache2.py)4
-rwxr-xr-x[-rw-r--r--]tests/DumpRenderTree2/assets/run_layout_tests.py0
2 files changed, 2 insertions, 2 deletions
diff --git a/tests/DumpRenderTree2/assets/run-apache2.py b/tests/DumpRenderTree2/assets/run_apache2.py
index cffbe3717184..f40409020a64 100644..100755
--- a/tests/DumpRenderTree2/assets/run-apache2.py
+++ b/tests/DumpRenderTree2/assets/run_apache2.py
@@ -19,7 +19,7 @@
Apache2 must be installed with mod_php!
Usage:
- run-apache2.py start|stop|restart
+ run_apache2.py start|stop|restart
"""
import sys
@@ -38,7 +38,7 @@ def main():
if not run_cmd in ("start", "stop", "restart"):
logging.info("illegal argument: " + run_cmd)
- logging.info("Usage: python run-apache2.py start|stop|restart")
+ logging.info("Usage: python run_apache2.py start|stop|restart")
return
#Create /tmp/WebKit if it doesn't exist. This is needed for various files used by apache2
diff --git a/tests/DumpRenderTree2/assets/run_layout_tests.py b/tests/DumpRenderTree2/assets/run_layout_tests.py
index b13d8c9f3d38..b13d8c9f3d38 100644..100755
--- a/tests/DumpRenderTree2/assets/run_layout_tests.py
+++ b/tests/DumpRenderTree2/assets/run_layout_tests.py