diff options
| author | mmoss@google.com <mmoss@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2008-11-19 22:26:05 +0000 |
|---|---|---|
| committer | mmoss@google.com <mmoss@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2008-11-19 22:26:05 +0000 |
| commit | 94187203fb2ff873796fa11638d4ebf3957cd3b6 (patch) | |
| tree | ebb2e9ee3b6cbfed20cf14fe7e34ef9ed94e7643 | |
| parent | f52cc1e8722dbf3cccd8caafea6992018cce31e2 (diff) | |
| download | chromium_src-94187203fb2ff873796fa11638d4ebf3957cd3b6.zip chromium_src-94187203fb2ff873796fa11638d4ebf3957cd3b6.tar.gz chromium_src-94187203fb2ff873796fa11638d4ebf3957cd3b6.tar.bz2 | |
Make http_server.sh mutli-platform.
Review URL: http://codereview.chromium.org/11498
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@5718 0039d316-1c4b-4281-b951-d872f2087c98
| -rwxr-xr-x[-rw-r--r--] | webkit/tools/layout_tests/layout_package/http_server.sh | 20 |
1 files changed, 15 insertions, 5 deletions
diff --git a/webkit/tools/layout_tests/layout_package/http_server.sh b/webkit/tools/layout_tests/layout_package/http_server.sh index 5412994..6d7d8f7 100644..100755 --- a/webkit/tools/layout_tests/layout_package/http_server.sh +++ b/webkit/tools/layout_tests/layout_package/http_server.sh @@ -1,9 +1,19 @@ #!/bin/sh -system_root=`cygpath "$SYSTEMROOT"` -export PATH="/usr/bin:$system_root/system32:$system_root:$system_root/system32/WBEM" - exec_dir=$(dirname $0) -"$exec_dir/../../../../third_party/python_24/python.exe" \ - "$exec_dir/http_server.py" "$@" +if [ "$OSTYPE" = "cygwin" ]; then + system_root=`cygpath "$SYSTEMROOT"` + PATH="/usr/bin:$system_root/system32:$system_root:$system_root/system32/WBEM" + export PATH + python_prog="$exec_dir/../../../third_party/python_24/python.exe" +else + python_prog=python + # When not using the included python, we don't get automatic site.py paths. + # Specifically, run_webkit_tests needs the paths in: + # third_party/python_24/Lib/site-packages/google.pth + PYTHONPATH="$(readlink -f ${exec_dir}/../../../../tools/python):$PYTHONPATH" + export PYTHONPATH +fi + +"$python_prog" "$exec_dir/http_server.py" "$@" |