diff mbox series

[OSSTEST,2/6] mg-repro-setup: Promote an error test to before builds (nfc)

Message ID 20211004170654.21864-3-iwj@xenproject.org (mailing list archive)
State New, archived
Headers show
Series allocation / test fixes | expand

Commit Message

Ian Jackson Oct. 4, 2021, 5:06 p.m. UTC
Signed-off-by: Ian Jackson <iwj@xenproject.org>
---
 mg-repro-setup | 16 +++++++++-------
 1 file changed, 9 insertions(+), 7 deletions(-)
diff mbox series

Patch

diff --git a/mg-repro-setup b/mg-repro-setup
index 374176f03..56d27d4ef 100755
--- a/mg-repro-setup
+++ b/mg-repro-setup
@@ -253,6 +253,15 @@  while [ $# -ne 0 ]; do
 	esac
 done
 
+if [ "${alloc_idents[*]}" ]; then
+        if [ x"$OSSTEST_TASK" = x ]; 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'
+                exit 1
+        fi
+fi
+
 flight=$(./cs-adjust-flight new:$blessing)
 progress "new flight is $flight"
 
@@ -281,13 +290,6 @@  if $statictask; then
 fi
 
 if [ "${alloc_idents[*]}" ]; then
-        if [ x"$OSSTEST_TASK" = x ]; 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'
-                exit 1
-        fi
-
 	progress "allocating ${alloc_idents[*]} ..."
 	alloc_output=tmp/$flight.allocations
 	./mg-allocate \