[OSSTEST PATCH] mg-repro-setup: Make ordinary alloc: work again

Ian Jackson posted 1 patch 1 week, 4 days ago
Failed in applying to current master (apply log)
mg-repro-setup | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)

[OSSTEST PATCH] mg-repro-setup: Make ordinary alloc: work again

Posted by Ian Jackson 1 week, 4 days ago
In e7febe5f6edc, we hosted an error earlier in the script.  But in the
old location, OSSTEST_TASK would always be set if statictask was.  In
the new one, that hasn't been done yet.

No release implications since it touches a by-hand utility only.

Fixes: e7febe5f6edc "mg-repro-setup: Promote an error test to before builds (nfc)"
CC: Roger Pau Monné <roger.pau@citrix.com>
Signed-off-by: Ian Jackson <iwj@xenproject.org>
Release-Acked-by: Ian Jackson <iwj@xenproject.org>
---
 mg-repro-setup | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/mg-repro-setup b/mg-repro-setup
index 895f29963..b00e182f3 100755
--- a/mg-repro-setup
+++ b/mg-repro-setup
@@ -254,7 +254,7 @@ while [ $# -ne 0 ]; do
 done
 
 if [ "${alloc_idents[*]}" ]; then
-        if [ x"$OSSTEST_TASK" = x ]; then
+        if [ x"$OSSTEST_TASK" = x ] && ! $statictask; then
                 # We would have to make a dynamic task and hold the
                 #  fd for it in this script.  Would be quite awkward.
                 echo >&2 'cannot hand-allocate in a way that will free'
-- 
2.20.1