Upgrade Squeak VMs to OSVM 202003021730

and no longer use itimer VMs on Linux
hpi-swa · Mar 26, 2020 · e057947 · e057947
1 parent 13fd88b
commit e057947
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 11 deletions.
diff --git a/squeak/run.sh b/squeak/run.sh
@@ -4,8 +4,8 @@
 ################################################################################
 
 readonly BASE_DOWNLOAD="${GITHUB_REPO_URL}/releases/download"
-readonly BASE_DOWNLOAD_VM="${BASE_DOWNLOAD}/v2.8.4"
-readonly OSVM_VERSION="201810190412"
+readonly BASE_DOWNLOAD_VM="${BASE_DOWNLOAD}/v2.9.1"
+readonly OSVM_VERSION="202003021730"
 
 ################################################################################
 # Download Squeak image.
@@ -151,19 +151,19 @@ squeak::get_vm_details() {
   case "${os_name}" in
     "Linux")
       if is_64bit; then
-        vm_arch="linux64x64_itimer"
+        vm_arch="linux64x64"
       else
-        vm_arch="linux32x86_itimer"
+        vm_arch="linux32x86"
       fi
       vm_file_ext="tar.gz"
       if [[ "${require_spur}" -eq 1 ]]; then
         if is_64bit; then
-          vm_path="${config_vm_dir}/sqcogspur64linux/squeak"
+          vm_path="${config_vm_dir}/sqcogspur64linuxht/squeak"
         else
-          vm_path="${config_vm_dir}/sqcogspurlinux/squeak"
+          vm_path="${config_vm_dir}/sqcogspurlinuxht/squeak"
         fi
       else
-        vm_path="${config_vm_dir}/sqcoglinux/squeak"
+        vm_path="${config_vm_dir}/sqcoglinuxht/squeak"
       fi
       ;;
     "Darwin")

diff --git a/tests/squeak_tests.sh b/tests/squeak_tests.sh
@@ -16,13 +16,13 @@ test_get_vm_details() {
 
   vm_details="$(squeak::get_vm_details "Linux" 1)"
   set_vars vm_filename vm_path "${vm_details}"
-  assertEquals "squeak.cog.spur_linux32x86_itimer_${OSVM_VERSION}.tar.gz" "${vm_filename}"
-  assertEquals "${config_vm_dir}/sqcogspurlinux/squeak" "${vm_path}"
+  assertEquals "squeak.cog.spur_linux32x86_${OSVM_VERSION}.tar.gz" "${vm_filename}"
+  assertEquals "${config_vm_dir}/sqcogspurlinuxht/squeak" "${vm_path}"
 
   vm_details="$(squeak::get_vm_details "Linux" 0)"
   set_vars vm_filename vm_path "${vm_details}"
-  assertEquals "squeak.cog.v3_linux32x86_itimer_${OSVM_VERSION}.tar.gz" "${vm_filename}"
-  assertEquals "${config_vm_dir}/sqcoglinux/squeak" "${vm_path}"
+  assertEquals "squeak.cog.v3_linux32x86_${OSVM_VERSION}.tar.gz" "${vm_filename}"
+  assertEquals "${config_vm_dir}/sqcoglinuxht/squeak" "${vm_path}"
 
   vm_details="$(squeak::get_vm_details "Darwin" 1)"
   set_vars vm_filename vm_path "${vm_details}"