]> xenbits.xensource.com Git - osstest.git/commitdiff
mg-repro-setup: Promote an error test to before builds (nfc)
authorIan Jackson <iwj@xenproject.org>
Mon, 4 Oct 2021 16:38:59 +0000 (17:38 +0100)
committerIan Jackson <iwj@xenproject.org>
Mon, 4 Oct 2021 16:44:33 +0000 (17:44 +0100)
Signed-off-by: Ian Jackson <iwj@xenproject.org>
mg-repro-setup

index 374176f036e5ef7cfe0a149b37916aeed39ead1d..56d27d4efae7c29519397043e4d00e470d8c628a 100755 (executable)
@@ -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 \