diff options
| author | Jose <jose@zeroc.com> | 2014-09-29 17:43:55 +0200 |
|---|---|---|
| committer | Jose <jose@zeroc.com> | 2014-09-29 17:43:55 +0200 |
| commit | 80b37d64940b42d8edc17ec7ce63542085540924 (patch) | |
| tree | 0cd17f82952e8ff0caae0a51d59c154276ad80f0 /scripts/TestUtil.py | |
| parent | Renamed Ice.BackgroundIO to Ice.ThreadInterruptSafe (diff) | |
| download | ice-80b37d64940b42d8edc17ec7ce63542085540924.tar.bz2 ice-80b37d64940b42d8edc17ec7ce63542085540924.tar.xz ice-80b37d64940b42d8edc17ec7ce63542085540924.zip | |
Ubuntu package updates
Diffstat (limited to 'scripts/TestUtil.py')
| -rwxr-xr-x | scripts/TestUtil.py | 14 |
1 files changed, 14 insertions, 0 deletions
diff --git a/scripts/TestUtil.py b/scripts/TestUtil.py index 8a5283ddb1a..cde967e2470 100755 --- a/scripts/TestUtil.py +++ b/scripts/TestUtil.py @@ -154,6 +154,20 @@ for path in os.environ["PATH"].split(os.pathsep): elif os.path.exists(os.path.join(path, "php5")): phpCmd = "php5" break +# +# The NodeJS interpreter is called "nodejs" on some platforms +# (e.g., Ubuntu) +# +nodeCmd = "node" +for path in os.environ["PATH"].split(os.pathsep): + # + # Stop if we find "php" in the PATH first. + # + if os.path.exists(os.path.join(path, "node")): + break + elif os.path.exists(os.path.join(path, "nodejs")): + phpCmd = "nodejs" + break # # This is set by the choice of init method. If not set, before it is |