gold, osh2oil, and wild tests all use $OSH instead of bin/osh.

oilshell · Mar 2, 2018 · 15e767149f7bc831e602aab75e31c299c35297bc · 15e7671
1 parent 96c0bc0
commit 15e767149f7bc831e602aab75e31c299c35297bc
Unified Split

Showing with 9 additions and 4 deletions.

+4 −1 test/common.sh

+3 −1 test/gold.sh

+1 −1 test/osh2oil.sh

+1 −1 test/wild-runner.sh
diff --git a/test/common.sh b/test/common.sh
@@ -7,8 +7,11 @@ set -o nounset
 set -o pipefail
 set -o errexit

-# For xargs -P in spec-runner.sh, wild-runner.sh.
+# TODO: Release process can use the release binary.  This is like $OSH_OVM
+# in benchmarks/common.sh.
+readonly OSH=${OSH:-bin/osh}

+# For xargs -P in spec-runner.sh, wild-runner.sh.
 readonly JOBS=$(( $(nproc) - 1 ))

 log() {
diff --git a/test/gold.sh b/test/gold.sh
@@ -12,13 +12,15 @@ set -o nounset
 set -o pipefail
 set -o errexit

+source test/common.sh  # for $OSH
+
 _compare() {
  set +o errexit

  "$@" >_tmp/shebang.txt
  local expected_status=$?

-  bin/osh "$@" >_tmp/osh.txt
+  $OSH "$@" >_tmp/osh.txt
  local osh_status=$?

  set -o errexit
diff --git a/test/osh2oil.sh b/test/osh2oil.sh
@@ -10,7 +10,7 @@ set -o errexit
 source test/common.sh

 osh-to-oil() {
-  bin/osh --fix "$@"
+  $OSH --fix "$@"
 }

 # Compare osh code on stdin (fd 0) and expected oil code on fd 3.
diff --git a/test/wild-runner.sh b/test/wild-runner.sh
@@ -43,7 +43,7 @@ process-file() {
  out_file=${www_base}__oil.txt

  run-task-with-status $task_file \
-    bin/osh -n --fix $abs_path \
+    $OSH -n --fix $abs_path \
    > $out_file 2> $stderr_file
 }