Merge e87ec0c0132a74932f469816979137fe40fe3323 into 762f9ef9d17623b45095e8ca1a996c8928f3f424

[Tests] only install python 2.7 if not already installed
See ee6f7667 / #3067
2025-08-16 18:43:43 +00:00 · 2024-07-07 21:02:18 +09:00 · 2024-07-06 10:29:55 -05:00 · 2023-12-04 21:17:07 -08:00
2 changed files with 6 additions and 3 deletions
--- a/.travis.yml
+++ b/.travis.yml
@ -32,7 +32,7 @@ before_install:
  - zsh  --version
  - dpkg -s dash | grep ^Version | awk '{print $2}'
  # install python
-  - pyenv install 2.7.18
+  - pyenv local 2.7.18 || pyenv install 2.7.18
  - pyenv local 2.7.18 || echo 'pyenv failed'
  - python -V
 install:
--- a/test/installation_node/install
+++ b/test/installation_node/install
@ -25,8 +25,11 @@ nvm run $NVM_TEST_VERSION --version | grep $NVM_TEST_VERSION || "'nvm run $NVM_T
 # Remove the stuff we're clobbering.
 [ -e ../../$NVM_TEST_VERSION ] && rm -R ../../$NVM_TEST_VERSION
-# Install from source with 2 make jobs (and swapped arg order)
+# Speed up test for non-CI environment which may have more CPU threads
-nvm install -j 2 -s $NVM_TEST_VERSION || die "'nvm install -s $NVM_TEST_VERSION' failed"
+[ -z "${CI-}"] && nvm_get_make_jobs
 # Install from source with multiple make jobs (and swapped arg order)
 nvm install -j ${NVM_MAKE_JOBS-:2} -s $NVM_TEST_VERSION || die "'nvm install -s $NVM_TEST_VERSION' failed"
 # Check
 [ -d ../../$NVM_TEST_VERSION ]
Author	SHA1	Message	Date
Peter Dave Hello	b5789e7bc1	Merge e87ec0c0132a74932f469816979137fe40fe3323 into 762f9ef9d17623b45095e8ca1a996c8928f3f424	2024-07-07 21:02:18 +09:00
Jordan Harband	762f9ef9d1	[Tests] only install python 2.7 if not already installed See ee6f7667 / #3067	2024-07-06 10:29:55 -05:00
Peter Dave Hello	e87ec0c013	[Tests] Try to detect & use more threads in local	2023-12-04 21:17:07 -08:00