From 3f2dbb4b7be17cf121d4a825de756cd5a1d610e8 Mon Sep 17 00:00:00 2001
From: Andy Chu <andy@oilshell.org>
Date: Wed, 17 Nov 2021 13:37:14 -0500
Subject: [PATCH] [devtools] Release script workaround for spec test flakiness.

Still need a real fix for #330.
---
 devtools/release.sh | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

diff --git a/devtools/release.sh b/devtools/release.sh
index 08c7a1c885..75641406e8 100755
--- a/devtools/release.sh
+++ b/devtools/release.sh
@@ -92,9 +92,14 @@ make-release-branch() {
 # For redoing a release.  This is everything until you have to 'git pull' the
 # benchmark-data repo to make reports.
 auto-machine1() {
+  local resume=${1:-}  # workaround for spec test flakiness bug
+
   sudo -k; sudo true  # clear and re-cache credentials
 
-  $0 build-and-test
+  if test -z "$resume"; then
+    $0 build-and-test  # Note: spec tests run here
+  fi 
+
   $0 metrics  # this can catch bugs
   test/wild.sh all
   $0 test-opy
@@ -357,9 +362,7 @@ build-and-test() {
 
   # App bundle
   _release-build
-  _test-release-build
-
-  # We're now ready to run 'benchmarks/auto.sh all'.
+  _test-release-build  # Note: spec tests run here
 }
 
 _install() {